Browse Source

Feat: Added and refactored accessToken validation

Signed-off-by: Marcin Kubica <marcin.kubica@engineerbetter.com>
William Young 4 years ago
parent
commit
8ca73aff47
2 changed files with 15 additions and 5 deletions
  1. 7 5
      pkg/provider/gitlab/gitlab.go
  2. 8 0
      pkg/provider/gitlab/gitlab_test.go

+ 7 - 5
pkg/provider/gitlab/gitlab.go

@@ -245,14 +245,16 @@ func (g *Gitlab) ValidateStore(store esv1beta1.GenericStore) error {
 		return err
 	}
 
-	projectID := gitlabSpec.ProjectID
-	if projectID == "" {
+	if gitlabSpec.ProjectID == "" {
 		return fmt.Errorf("projectID cannot be empty")
 	}
 
-	key := gitlabSpec.Auth.SecretRef.AccessToken.Key
-	if key == "" {
-		return fmt.Errorf("key cannot be empty")
+	if accessToken.Key == "" {
+		return fmt.Errorf("accessToken.key cannot be empty")
+	}
+
+	if accessToken.Name == "" {
+		return fmt.Errorf("accessToken.name cannot be empty")
 	}
 	return nil
 }

+ 8 - 0
pkg/provider/gitlab/gitlab_test.go

@@ -276,6 +276,14 @@ func TestValidateStore(t *testing.T) {
 	if err == nil {
 		t.Errorf("key cannot be empty")
 	}
+
+	store.Spec.Provider.Gitlab.Auth.SecretRef.AccessToken.Key = "key"
+	store.Spec.Provider.Gitlab.Auth.SecretRef.AccessToken.Name = ""
+	err = p.ValidateStore(store)
+	if err == nil {
+		t.Errorf("name cannot be empty")
+	}
+
 }
 
 // func makeSecretStore()store := &esv1beta1.SecretStore{