Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nad: adjust return consistency #835

Merged
merged 1 commit into from
Dec 20, 2024
Merged

nad: adjust return consistency #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions pkg/nad/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func NewBuilder(apiClient *clients.Settings, name, nsname string) *Builder {
return nil
}

builder := Builder{
builder := &Builder{
apiClient: apiClient,
Definition: &nadV1.NetworkAttachmentDefinition{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -64,15 +64,19 @@ func NewBuilder(apiClient *clients.Settings, name, nsname string) *Builder {
glog.V(100).Infof("The name of the NetworkAttachmentDefinition is empty")

builder.errorMsg = "NAD name is empty"

return builder
}

if builder.Definition.Namespace == "" {
glog.V(100).Infof("The namespace of the NetworkAttachmentDefinition is empty")

builder.errorMsg = "NAD namespace is empty"

return builder
}

return &builder
return builder
}

// Pull pulls existing networkattachmentdefinition from cluster.
Expand All @@ -93,7 +97,7 @@ func Pull(apiClient *clients.Settings, name, nsname string) (*Builder, error) {
return nil, fmt.Errorf("failed to add nad v1 scheme to client schemes")
}

builder := Builder{
builder := &Builder{
apiClient: apiClient,
Definition: &nadV1.NetworkAttachmentDefinition{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -121,7 +125,7 @@ func Pull(apiClient *clients.Settings, name, nsname string) (*Builder, error) {

builder.Definition = builder.Object

return &builder, nil
return builder, nil
}

// Get returns CatalogSource object if found.
Expand Down Expand Up @@ -324,12 +328,16 @@ func (builder *Builder) WithMasterPlugin(masterPlugin *MasterPlugin) *Builder {

if builder.Definition.Spec != emptyNadConfig {
builder.errorMsg = "error to redefine predefine NAD"

return builder
}

masterPluginSting, err := json.Marshal(masterPlugin)

if err != nil {
builder.errorMsg = err.Error()

return builder
}

builder.Definition.Spec.Config = string(masterPluginSting)
Expand All @@ -355,6 +363,8 @@ func (builder *Builder) WithPlugins(name string, plugins *[]Plugin) *Builder {

if err != nil {
builder.errorMsg = err.Error()

return builder
}

builder.Definition.Spec.Config = string(pluginsConfigString)
Expand Down Expand Up @@ -383,13 +393,13 @@ func (builder *Builder) validate() (bool, error) {
if builder.Definition == nil {
glog.V(100).Infof("The %s is undefined", resourceCRD)

builder.errorMsg = msg.UndefinedCrdObjectErrString(resourceCRD)
return false, fmt.Errorf(msg.UndefinedCrdObjectErrString(resourceCRD))
}

if builder.apiClient == nil {
glog.V(100).Infof("The %s builder apiclient is nil", resourceCRD)

builder.errorMsg = fmt.Sprintf("%s builder cannot have nil apiClient", resourceCRD)
return false, fmt.Errorf("%s builder cannot have nil apiClient", resourceCRD)
}

if builder.errorMsg != "" {
Expand Down
Loading
Loading