Enforce mandatory JF_GIT_REPO param (#507)

jfrog · Sep 19, 2023 · 9232354 · 9232354
1 parent 58b8e75
commit 9232354
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/utils/params.go b/utils/params.go
@@ -427,31 +427,31 @@ func extractGitParamsFromEnvs() (*Git, error) {
 	if branch != "" {
 		gitEnvParams.Branches = []string{branch}
 	}
-	// Set the repository name
-	if err = readParamFromEnv(GitRepoEnv, &gitEnvParams.RepoName); err != nil && !e.IsMissingEnvErr(err) {
-		return nil, err
-	}
-
 	// Non-mandatory Git Api Endpoint, if not set, default values will be used.
 	if err = readParamFromEnv(GitApiEndpointEnv, &gitEnvParams.APIEndpoint); err != nil && !e.IsMissingEnvErr(err) {
 		return nil, err
 	}
 	if err = verifyValidApiEndpoint(gitEnvParams.APIEndpoint); err != nil {
 		return nil, err
 	}
-	// Set the Git provider
+	// [Mandatory] Set the Git provider
 	if gitEnvParams.GitProvider, err = extractVcsProviderFromEnv(); err != nil {
 		return nil, err
 	}
-	// Set the git repository owner name (organization)
+	// [Mandatory] Set the git repository owner name (organization)
 	if err = readParamFromEnv(GitRepoOwnerEnv, &gitEnvParams.RepoOwner); err != nil {
 		return nil, err
 	}
-	// Set the access token to the git provider
+	// [Mandatory] Set the access token to the git provider
 	if err = readParamFromEnv(GitTokenEnv, &gitEnvParams.Token); err != nil {
 		return nil, err
 	}
 
+	// [Mandatory] Set the repository name
+	if err = readParamFromEnv(GitRepoEnv, &gitEnvParams.RepoName); err != nil {
+		return nil, err
+	}
+
 	// Set Bitbucket Server username
 	// Mandatory only for Bitbucket Server, this authentication detail is required for performing git operations.
 	if err = readParamFromEnv(GitUsernameEnv, &gitEnvParams.Username); err != nil && !e.IsMissingEnvErr(err) {

diff --git a/utils/params_test.go b/utils/params_test.go
@@ -143,6 +143,10 @@ func TestExtractClientInfo(t *testing.T) {
 	SetEnvAndAssert(t, map[string]string{GitRepoOwnerEnv: "jfrog"})
 	_, err = extractGitParamsFromEnvs()
 	assert.EqualError(t, err, "'JF_GIT_TOKEN' environment variable is missing")
+
+	SetEnvAndAssert(t, map[string]string{GitTokenEnv: "token"})
+	_, err = extractGitParamsFromEnvs()
+	assert.EqualError(t, err, "'JF_GIT_REPO' environment variable is missing")
 }
 
 func TestExtractAndAssertRepoParams(t *testing.T) {