Skip to content

Commit 9232354

Browse files
authored
Enforce mandatory JF_GIT_REPO param (#507)
1 parent 58b8e75 commit 9232354

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

utils/params.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -427,31 +427,31 @@ func extractGitParamsFromEnvs() (*Git, error) {
427427
if branch != "" {
428428
gitEnvParams.Branches = []string{branch}
429429
}
430-
// Set the repository name
431-
if err = readParamFromEnv(GitRepoEnv, &gitEnvParams.RepoName); err != nil && !e.IsMissingEnvErr(err) {
432-
return nil, err
433-
}
434-
435430
// Non-mandatory Git Api Endpoint, if not set, default values will be used.
436431
if err = readParamFromEnv(GitApiEndpointEnv, &gitEnvParams.APIEndpoint); err != nil && !e.IsMissingEnvErr(err) {
437432
return nil, err
438433
}
439434
if err = verifyValidApiEndpoint(gitEnvParams.APIEndpoint); err != nil {
440435
return nil, err
441436
}
442-
// Set the Git provider
437+
// [Mandatory] Set the Git provider
443438
if gitEnvParams.GitProvider, err = extractVcsProviderFromEnv(); err != nil {
444439
return nil, err
445440
}
446-
// Set the git repository owner name (organization)
441+
// [Mandatory] Set the git repository owner name (organization)
447442
if err = readParamFromEnv(GitRepoOwnerEnv, &gitEnvParams.RepoOwner); err != nil {
448443
return nil, err
449444
}
450-
// Set the access token to the git provider
445+
// [Mandatory] Set the access token to the git provider
451446
if err = readParamFromEnv(GitTokenEnv, &gitEnvParams.Token); err != nil {
452447
return nil, err
453448
}
454449

450+
// [Mandatory] Set the repository name
451+
if err = readParamFromEnv(GitRepoEnv, &gitEnvParams.RepoName); err != nil {
452+
return nil, err
453+
}
454+
455455
// Set Bitbucket Server username
456456
// Mandatory only for Bitbucket Server, this authentication detail is required for performing git operations.
457457
if err = readParamFromEnv(GitUsernameEnv, &gitEnvParams.Username); err != nil && !e.IsMissingEnvErr(err) {

utils/params_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ func TestExtractClientInfo(t *testing.T) {
143143
SetEnvAndAssert(t, map[string]string{GitRepoOwnerEnv: "jfrog"})
144144
_, err = extractGitParamsFromEnvs()
145145
assert.EqualError(t, err, "'JF_GIT_TOKEN' environment variable is missing")
146+
147+
SetEnvAndAssert(t, map[string]string{GitTokenEnv: "token"})
148+
_, err = extractGitParamsFromEnvs()
149+
assert.EqualError(t, err, "'JF_GIT_REPO' environment variable is missing")
146150
}
147151

148152
func TestExtractAndAssertRepoParams(t *testing.T) {

0 commit comments

Comments
 (0)