Fixes git-resolver configuration for serverUrl and scmType

With the latest support for multiple git providers in git-resolvers, it was having a regression issue where if value serverUrl was not given then it used to return an error Hence this patch fixes the issue to avoid regression Signed-off-by: PuneetPunamiya <[email protected]>
tektoncd · Dec 3, 2024 · acb6211 · acb6211
1 parent 4e8eec7
commit acb6211
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/pkg/remoteresolution/resolver/git/resolver_test.go b/pkg/remoteresolution/resolver/git/resolver_test.go
@@ -645,9 +645,9 @@ func TestResolve(t *testing.T) {
 			gitresolution.APISecretKeyKey:       "token",
 			gitresolution.APISecretNamespaceKey: system.Namespace(),
 		},
-		apiToken:       "some-token",
-		expectedStatus: resolution.CreateResolutionRequestFailureStatus(),
-		expectedErr:    createError("missing or empty scm-type value in configmap"),
+		apiToken:          "some-token",
+		expectedCommitSHA: commitSHAsInSCMRepo[0],
+		expectedStatus:    resolution.CreateResolutionRequestStatusWithData(mainPipelineYAML),
 	}}
 
 	for _, tc := range testCases {

diff --git a/pkg/resolution/resolver/git/resolver.go b/pkg/resolution/resolver/git/resolver.go
@@ -530,18 +530,12 @@ func getSCMTypeAndServerURL(ctx context.Context, params map[string]string) (stri
 	}
 	if scmType == "" {
 		scmType = conf.SCMType
-		if scmType == "" {
-			return "", "", fmt.Errorf("missing or empty %s value in configmap", SCMTypeKey)
-		}
 	}
 	if key, ok := params[ServerURLParam]; ok {
 		serverURL = key
 	}
 	if serverURL == "" {
 		serverURL = conf.ServerURL
-		if serverURL == "" {
-			return "", "", fmt.Errorf("missing or empty %s value in configmap", ServerURLKey)
-		}
 	}
 	return scmType, serverURL, nil
 }

diff --git a/pkg/resolution/resolver/git/resolver_test.go b/pkg/resolution/resolver/git/resolver_test.go
@@ -642,9 +642,9 @@ func TestResolve(t *testing.T) {
 			APISecretKeyKey:       "token",
 			APISecretNamespaceKey: system.Namespace(),
 		},
-		apiToken:       "some-token",
-		expectedStatus: resolution.CreateResolutionRequestFailureStatus(),
-		expectedErr:    createError("missing or empty scm-type value in configmap"),
+		apiToken:          "some-token",
+		expectedCommitSHA: commitSHAsInSCMRepo[0],
+		expectedStatus:    resolution.CreateResolutionRequestStatusWithData(mainPipelineYAML),
 	}}
 
 	for _, tc := range testCases {