Merge branch 'dev' into v2

jfrog · Jun 27, 2023 · ad874c5 · ad874c5
2 parents 5692756 + ec93585
commit ad874c5
Show file tree

Hide file tree

Showing 46 changed files with 289 additions and 441 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -34,6 +34,7 @@ jobs:
           restore-keys: ${{ runner.os }}-go
       - name: Run Go vet
         run: go vet -v ./...
+
   Static-Check:
     name: Static Check ubuntu-latest
     runs-on: ubuntu-latest
@@ -45,9 +46,11 @@ jobs:
         with:
           go-version: 1.20.x
       - name: Static Code Analysis
-        uses: dominikh/staticcheck-action@v1
+        uses: golangci/golangci-lint-action@v3
         with:
-          install-go: false
+          args: |
+            --timeout 5m --out-${NO_FUTURE}format colored-line-number --enable errcheck,gosimple,govet,ineffassign,staticcheck,typecheck,unused,gocritic,asasalint,asciicheck,errchkjson,exportloopref,forcetypeassert,makezero,nilerr,unparam,unconvert,wastedassign,usestdlibvars 
+
   Go-Sec:
     name: Go-Sec ubuntu-latest
     runs-on: ubuntu-latest

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,7 @@ node("docker") {
     repo = 'jfrog-cli'
     sh 'rm -rf temp'
     sh 'mkdir temp'
-    def goRoot = tool 'go-1.20.4'
+    def goRoot = tool 'go-1.20.5'
     env.GOROOT="$goRoot"
     env.PATH+=":${goRoot}/bin"
     env.GO111MODULE="on"

diff --git a/access_test.go b/access_test.go
@@ -64,7 +64,7 @@ func TestRefreshableAccessTokens(t *testing.T) {
 	// Upload a file and assert the refreshable tokens were generated.
 	artifactoryCommandExecutor := tests.NewJfrogCli(execMain, "jfrog rt", "")
 	uploadedFiles := 1
-	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, tests.ServerId, "testdata/a/a1.in", uploadedFiles)
+	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, "testdata/a/a1.in", uploadedFiles)
 	if !assert.NoError(t, err) {
 		return
 	}
@@ -80,23 +80,23 @@ func TestRefreshableAccessTokens(t *testing.T) {
 
 	// Upload a file and assert tokens were refreshed.
 	uploadedFiles++
-	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, tests.ServerId, "testdata/a/a2.in", uploadedFiles)
+	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, "testdata/a/a2.in", uploadedFiles)
 	if !assert.NoError(t, err) {
 		return
 	}
-	curAccessToken, curRefreshToken, err = assertTokensChanged(t, tests.ServerId, curAccessToken, curRefreshToken)
+	curAccessToken, curRefreshToken, err = assertTokensChanged(t, curAccessToken, curRefreshToken)
 	if !assert.NoError(t, err) {
 		return
 	}
 
 	// Make the token not refresh. Verify Tokens did not refresh.
 	auth.InviteRefreshBeforeExpiryMinutes = 0
 	uploadedFiles++
-	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, tests.ServerId, "testdata/a/b/b2.in", uploadedFiles)
+	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, "testdata/a/b/b2.in", uploadedFiles)
 	if !assert.NoError(t, err) {
 		return
 	}
-	newAccessToken, newRefreshToken, err := getArtifactoryTokensFromConfig(t, tests.ServerId)
+	newAccessToken, newRefreshToken, err := getArtifactoryTokensFromConfig(t)
 	if !assert.NoError(t, err) {
 		return
 	}