allow private base without key ref or with extra comment

Dockerfile

@@ -19,7 +19,7 @@ WORKDIR /app
 
 
 RUN go test -v -cover ./... \
-    && go build -o /argocd-voodoobox-plugin .
+    && go build -ldflags='-s -w' -o /argocd-voodoobox-plugin .
 
 # final stage
 # argocd requires that sidecar container is running as user 999

git-ssh.go

@@ -28,7 +28,7 @@ const (
 )
 
 var (
-	reKeyName            = regexp.MustCompile(`#\s*?argocd-voodoobox-plugin:\s*?(?P<keyName>\w+)`)
+	reKeyName            = regexp.MustCompile(`#.*?argocd-voodoobox-plugin:\s*?(?P<keyName>\w+)`)
 	reRepoAddressWithSSH = regexp.MustCompile(`(?P<beginning>^\s*-\s*ssh:\/\/)(?P<domain>\w.+?)(?P<repoDetails>\/.*$)`)
 )
 
@@ -167,8 +167,9 @@ func updateRepoBaseAddresses(in io.Reader) (map[string]string, []byte, error) {
 		case keyName != "" && !reRepoAddressWithSSH.MatchString(l):
 			return nil, nil, fmt.Errorf("found key reference in comment but next remote base url doesn't contain ssh://")
 
-		case keyName == "" && reRepoAddressWithSSH.MatchString(l):
-			return nil, nil, fmt.Errorf("found remote base url with ssh protocol without referenced key comment above")
+		// referencing key is not mandatory since only 1 key can be used for all private base
+		// case keyName == "" && reRepoAddressWithSSH.MatchString(l):
+		// 	return nil, nil, fmt.Errorf("found remote base url with ssh protocol without referenced key comment above")
 
 		case keyName != "" && reRepoAddressWithSSH.MatchString(l):
 			// If Key if found replace domain

git-ssh_test.go

@@ -107,6 +107,39 @@ resources:
 				"keyD":    "github.com",
 			},
 		},
+
+		{
+			name: "extra comments before key ref",
+			args: args{
+				in: []byte(`apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - app/
+
+  - github.com/org/open1//manifests/lab-foo?ref=master
+  # some-extra comment : key_b argocd-voodoobox-plugin: sshKeyB
+  - ssh://gitlab.io/org/repo2//manifests/lab-bar?ref=main
+  # argocd-voodoobox-plugin:  key_c
+  - ssh://bitbucket.org/org/repo3//manifests/lab-zoo?ref=dev
+`)},
+			wantOut: []byte(`apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - app/
+
+  - github.com/org/open1//manifests/lab-foo?ref=master
+  # some-extra comment : key_b argocd-voodoobox-plugin: sshKeyB
+  - ssh://sshKeyB_gitlab_io/org/repo2//manifests/lab-bar?ref=main
+  # argocd-voodoobox-plugin:  key_c
+  - ssh://key_c_bitbucket_org/org/repo3//manifests/lab-zoo?ref=dev
+`),
+			wantKeyMap: map[string]string{
+				"sshKeyB": "gitlab.io",
+				"key_c":   "bitbucket.org",
+			},
+			wantErr: false,
+		},
+
 		{
 			name: "missing key ref",
 			args: args{
@@ -118,10 +151,18 @@ resources:
   - github.com/org/open1//manifests/lab-foo?ref=master
   - ssh://github.com/org/repo3//manifests/lab-zoo?ref=dev
 `)},
-			wantOut:    nil,
-			wantKeyMap: nil,
-			wantErr:    true,
+			wantOut: []byte(`apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - app/
+
+  - github.com/org/open1//manifests/lab-foo?ref=master
+  - ssh://github.com/org/repo3//manifests/lab-zoo?ref=dev
+`),
+			wantKeyMap: map[string]string{},
+			wantErr:    false,
 		},
+
 		{
 			name: "missing ssh protocol",
 			args: args{