Browse Source

Removing Key checks from utils.go and passing them to IBM provider

Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>
Gustavo Carvalho 4 years ago
parent
commit
5f608594a4
3 changed files with 7 additions and 7 deletions
  1. 6 0
      pkg/provider/ibm/provider.go
  2. 1 1
      pkg/provider/ibm/provider_test.go
  3. 0 6
      pkg/utils/utils.go

+ 6 - 0
pkg/provider/ibm/provider.go

@@ -332,6 +332,12 @@ func (ibm *providerIBM) ValidateStore(store esv1beta1.GenericStore) error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
+	if secretRef.Name == "" {
+		return fmt.Errorf("secretAPIKey.name cannot be empty")
+	}
+	if secretRef.Key == "" {
+		return fmt.Errorf("secretAPIKey.key cannot be empty")
+	}
 	return nil
 	return nil
 }
 }
 
 

+ 1 - 1
pkg/provider/ibm/provider_test.go

@@ -136,7 +136,7 @@ func TestValidateStore(t *testing.T) {
 	err = p.ValidateStore(store)
 	err = p.ValidateStore(store)
 	if err == nil {
 	if err == nil {
 		t.Errorf(errExpectedErr)
 		t.Errorf(errExpectedErr)
-	} else if err.Error() != "secret name is required" {
+	} else if err.Error() != "secretAPIKey.name cannot be empty" {
 		t.Errorf("KeySelector test failed: expected secret name is required, got %v", err)
 		t.Errorf("KeySelector test failed: expected secret name is required, got %v", err)
 	}
 	}
 	store.Spec.Provider.IBM.Auth.SecretRef.SecretAPIKey.Name = "foo"
 	store.Spec.Provider.IBM.Auth.SecretRef.SecretAPIKey.Name = "foo"

+ 0 - 6
pkg/utils/utils.go

@@ -110,12 +110,6 @@ func ErrorContains(out error, want string) bool {
 // We MUST NOT check the name or key property here. It MAY be defaulted by the provider.
 // We MUST NOT check the name or key property here. It MAY be defaulted by the provider.
 func ValidateSecretSelector(store esv1beta1.GenericStore, ref esmeta.SecretKeySelector) error {
 func ValidateSecretSelector(store esv1beta1.GenericStore, ref esmeta.SecretKeySelector) error {
 	clusterScope := store.GetObjectKind().GroupVersionKind().Kind == esv1beta1.ClusterSecretStoreKind
 	clusterScope := store.GetObjectKind().GroupVersionKind().Kind == esv1beta1.ClusterSecretStoreKind
-	if ref.Name == "" {
-		return fmt.Errorf("secret name is required")
-	}
-	if ref.Key == "" {
-		return fmt.Errorf("secret key is required")
-	}
 	if clusterScope && ref.Namespace == nil {
 	if clusterScope && ref.Namespace == nil {
 		return fmt.Errorf("cluster scope requires namespace")
 		return fmt.Errorf("cluster scope requires namespace")
 	}
 	}