Merge branch 'dev' into generic-audit-improvements

xray/audit/java/gradle.go

@@ -181,17 +181,21 @@ func getRemoteRepos(releasesRepo, depsRepo string, server *config.ServerDetails)
 }
 
 func constructReleasesRemoteRepo(releasesRepo string, server *config.ServerDetails) (string, error) {
+	releasesServer := server
 	if releasesRepo == "" {
 		// Try to get releases repository from the environment variable
-		_, repoName, err := coreutils.GetServerIdAndRepo(coreutils.ReleasesRemoteEnv)
-		if err != nil || repoName == "" {
-			return repoName, err
+		serverId, repoName, err := coreutils.GetServerIdAndRepo(coreutils.ReleasesRemoteEnv)
+		if err != nil || serverId == "" || repoName == "" {
+			return "", err
+		}
+		releasesServer, err = config.GetSpecificConfig(serverId, false, true)
+		if err != nil {
+			return "", err
 		}
 		releasesRepo = repoName
 	}
-
 	releasesPath := fmt.Sprintf("%s/%s", releasesRepo, remoteDepTreePath)
-	return getDepTreeArtifactoryRepository(releasesPath, server)
+	return getDepTreeArtifactoryRepository(releasesPath, releasesServer)
 }
 
 func (dtp *depTreeManager) execGradleDepTree(depTreeDir string) (outputFileContent []byte, err error) {

xray/audit/java/gradle_test.go

@@ -1,8 +1,10 @@
 package java
 
 import (
+	"errors"
 	"fmt"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	testsutils "github.com/jfrog/jfrog-cli-core/v2/utils/config/tests"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"os"
@@ -252,6 +254,16 @@ allprojects {
 }
 
 func TestConstructReleasesRemoteRepo(t *testing.T) {
+	cleanUp := testsutils.CreateTempEnv(t, false)
+	serverDetails := &config.ServerDetails{
+		ServerId:       "test",
+		ArtifactoryUrl: "https://domain.com/artifactory",
+		User:           "user",
+		Password:       "pass",
+	}
+	err := config.SaveServersConf([]*config.ServerDetails{serverDetails})
+	assert.NoError(t, err)
+	defer cleanUp()
 	server := &config.ServerDetails{
 		ArtifactoryUrl: "https://myartifactory.com/artifactory",
 		User:           "myuser",
@@ -264,7 +276,8 @@ func TestConstructReleasesRemoteRepo(t *testing.T) {
 		expectedErr  error
 	}{
 		{releasesRepo: "", envVar: "", expectedRepo: "", expectedErr: nil},
-		{releasesRepo: "", envVar: "server/repo1", expectedRepo: "\n\t\tmaven {\n\t\t\turl \"https://myartifactory.com/artifactory/repo1/artifactory/oss-release-local\"\n\t\t\tcredentials {\n\t\t\t\tusername = 'myuser'\n\t\t\t\tpassword = 'mypass'\n\t\t\t}\n\t\t}", expectedErr: nil},
+		{releasesRepo: "", envVar: "test/repo1", expectedRepo: "\n\t\tmaven {\n\t\t\turl \"https://domain.com/artifactory/repo1/artifactory/oss-release-local\"\n\t\t\tcredentials {\n\t\t\t\tusername = 'user'\n\t\t\t\tpassword = 'pass'\n\t\t\t}\n\t\t}", expectedErr: nil},
+		{releasesRepo: "", envVar: "notexist/repo1", expectedRepo: "", expectedErr: errors.New("Server ID 'notexist' does not exist.")},
 		{releasesRepo: "repo2", envVar: "", expectedRepo: "\n\t\tmaven {\n\t\t\turl \"https://myartifactory.com/artifactory/repo2/artifactory/oss-release-local\"\n\t\t\tcredentials {\n\t\t\t\tusername = 'myuser'\n\t\t\t\tpassword = 'mypass'\n\t\t\t}\n\t\t}", expectedErr: nil},
 	}