Skip to content

Commit

Permalink
validatingwebhook: adjust return consistency (#880)
Browse files Browse the repository at this point in the history
  • Loading branch information
sebrandon1 authored Jan 21, 2025
1 parent 3234969 commit 85c0e6c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions pkg/webhook/validatingwebhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func PullValidatingConfiguration(apiClient *clients.Settings, name string) (
*ValidatingConfigurationBuilder, error) {
glog.V(100).Infof("Pulling existing ValidatingWebhookConfiguration name %s from cluster", name)

builder := ValidatingConfigurationBuilder{
builder := &ValidatingConfigurationBuilder{
apiClient: apiClient,
Definition: &admregv1.ValidatingWebhookConfiguration{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -44,7 +44,7 @@ func PullValidatingConfiguration(apiClient *clients.Settings, name string) (
if name == "" {
glog.V(100).Infof("The name of the ValidatingWebhookConfiguration is empty")

builder.errorMsg = "ValidatingWebhookConfiguration 'name' cannot be empty"
return nil, fmt.Errorf("ValidatingWebhookConfiguration 'name' cannot be empty")
}

if !builder.Exists() {
Expand All @@ -53,7 +53,7 @@ func PullValidatingConfiguration(apiClient *clients.Settings, name string) (

builder.Definition = builder.Object

return &builder, nil
return builder, nil
}

// Exists checks whether the given ValidatingWebhookConfiguration object exists in the cluster.
Expand Down Expand Up @@ -85,7 +85,7 @@ func (builder *ValidatingConfigurationBuilder) Get() (*admregv1.ValidatingWebhoo
return &admregv1.ValidatingWebhookConfiguration{}, err
}

return validatingWebhookConfiguration, err
return validatingWebhookConfiguration, nil
}

// Delete removes a ValidatingWebhookConfiguration from a cluster.
Expand Down Expand Up @@ -148,7 +148,7 @@ func (builder *ValidatingConfigurationBuilder) validate() (bool, error) {
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

0 comments on commit 85c0e6c

Please sign in to comment.