Merge remote-tracking branch 'upstream/dev' into add_report_usage_met…

…hods
jfrog · Aug 22, 2023 · cc2b1df · cc2b1df
2 parents 4ec0339 + f64d0fc
commit cc2b1df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/artifactory/services/gitlfsclean_test.go b/artifactory/services/gitlfsclean_test.go
@@ -34,6 +34,7 @@ func TestExtractRepo(t *testing.T) {
 
 func TestGetLfsFilesFromGit(t *testing.T) {
 	log.SetLogger(log.NewLogger(log.DEBUG, nil))
+	// #nosec G101
 	fileId := "4bf4c8c0fef3f5c8cf6f255d1c784377138588c0a9abe57e440bce3ccb350c2e"
 	gitPath := getCliDotGitPath(t)
 	refs := strings.Join([]string{"refs", "heads", "*"}, "/")

diff --git a/artifactory/services/go/go_test.go b/artifactory/services/go/go_test.go
@@ -18,11 +18,11 @@ func TestCreateUrlPath(t *testing.T) {
 		{"withoutBuildProperties", "go-repo/github.com/jfrog/test/@v/v1.1.1.zip", "", "http://test.url/api/go/", "http://test.url/api/go/go-repo/github.com/jfrog/test/@v/v1.1.1.zip"},
 		{"withoutBuildPropertiesModExtension", "go-repo/github.com/jfrog/test/@v/v1.1.1.mod", "", "http://test.url/api/go/", "http://test.url/api/go/go-repo/github.com/jfrog/test/@v/v1.1.1.mod"},
 	}
-	for _, test := range tests {
+	for i, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			assert.NoError(t, CreateUrlPath(test.pathInArtifactory, test.props, &test.goApiUrl))
+			assert.NoError(t, CreateUrlPath(tests[i].pathInArtifactory, tests[i].props, &tests[i].goApiUrl))
 			// The props might have a different order each time, so we split the URLs and check if the lists are equal (ignoring the order)
-			assert.ElementsMatch(t, strings.Split(test.goApiUrl, ";"), strings.Split(test.expectedUrl, ";"))
+			assert.ElementsMatch(t, strings.Split(tests[i].goApiUrl, ";"), strings.Split(tests[i].expectedUrl, ";"))
 		})
 	}
 }
diff --git a/pipelines/services/run.go b/pipelines/services/run.go
@@ -36,7 +36,7 @@ func (rs *RunService) GetRunStatus(branch, pipeName string, isMultiBranch bool)
 	httpDetails := rs.getHttpDetails()
 
 	// Query params
-	queryParams := make(map[string]string, 0)
+	queryParams := make(map[string]string)
 	if isMultiBranch {
 		// Add this query param only when pipeline source is multi-branch
 		queryParams["pipelineSourceBranch"] = branch

diff --git a/pipelines/services/syncstatus.go b/pipelines/services/syncstatus.go
@@ -32,7 +32,7 @@ func (ss *SyncStatusService) GetSyncPipelineResourceStatus(repoName, branch stri
 	if resourceErr != nil {
 		return []PipelineSyncStatus{}, fmt.Errorf("unable to fetch resourceID for '%s'. Second error: %s", repoName, resourceErr.Error())
 	}
-	queryParams := make(map[string]string, 0)
+	queryParams := make(map[string]string)
 	if *res.IsMultiBranch {
 		queryParams["pipelineSourceBranches"] = branch
 	}