Merge remote-tracking branch 'origin/dev' into v2

Author: jfrog-ecosystem

.github/workflows/npmTests.yml

@@ -41,4 +41,6 @@ jobs:
           RTLIC: ${{ secrets.RTLIC }}
 
       - name: Run npm tests
+        env:
+          YARN_IGNORE_NODE: 1
         run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.npm

artifactory/cli.go

@@ -1962,6 +1962,19 @@ func curlCmd(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
+
+	// Check if --server-id is explicitly passed in arguments
+	flagIndex, _, _, err := coreutils.FindFlag("--server-id", cliutils.ExtractCommand(c))
+	if err != nil {
+		return err
+	}
+	// If --server-id is NOT present, then we check for JFROG_CLI_SERVER_ID env variable
+	if flagIndex == -1 {
+		if artDetails, err := cliutils.CreateArtifactoryDetailsByFlags(c); err == nil && artDetails.ArtifactoryUrl != "" {
+			rtCurlCommand.SetServerDetails(artDetails)
+			rtCurlCommand.SetUrl(artDetails.ArtifactoryUrl)
+		}
+	}
 	return commands.Exec(rtCurlCommand)
 }
 
@@ -2640,6 +2653,7 @@ func createBuildInfoConfiguration(c *cli.Context) *buildinfocmd.Configuration {
 	if flags.EnvExclude == "" {
 		flags.EnvExclude = "*password*;*psw*;*secret*;*key*;*token*;*auth*"
 	}
+	flags.Overwrite = c.Bool("overwrite")
 	return flags
 }
 

artifactory_test.go

@@ -5543,15 +5543,41 @@ func TestArtifactoryCurl(t *testing.T) {
 	_, err := createServerConfigAndReturnPassphrase(t)
 	defer deleteServerConfig(t)
 	assert.NoError(t, err)
-	// Check curl command with config default server
-	err = artifactoryCli.WithoutCredentials().Exec("curl", "-XGET", "/api/system/version")
-	assert.NoError(t, err)
-	// Check curl command with '--server-id' flag
-	err = artifactoryCli.WithoutCredentials().Exec("curl", "-XGET", "/api/system/version", "--server-id="+tests.ServerId)
-	assert.NoError(t, err)
-	// Check curl command with invalid server id - should get an error.
-	err = artifactoryCli.WithoutCredentials().Exec("curl", "-XGET", "/api/system/version", "--server-id=not_configured_name_"+tests.ServerId)
-	assert.Error(t, err)
+
+	baseArgs := []string{"curl", "-XGET", "/api/system/version"}
+
+	testRuns := []struct {
+		testName         string
+		serverIDEnvValue string
+		expectedErr      bool
+		serverID         string
+	}{
+		{"defaultConfig", "", false, ""},
+		{"serverIdFlag", "", false, tests.ServerId},
+		{"invalidServerId", "", true, "not_configured_name_" + tests.ServerId},
+		{"envVarSet", tests.ServerId, false, ""},
+		{"envVarWithFlag", tests.ServerId, false, tests.ServerId},
+		{"priorityFlagOverEnv", "wrong_server_id", false, tests.ServerId},
+		{"priorityEnvOverDefault", tests.ServerId, false, ""},
+	}
+
+	for _, test := range testRuns {
+		t.Run(test.testName, func(t *testing.T) {
+			setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, coreutils.ServerID, test.serverIDEnvValue)
+
+			args := append([]string{}, baseArgs...)
+			if test.serverID != "" {
+				args = append(args, "--server-id="+test.serverID)
+			}
+			err = artifactoryCli.WithoutCredentials().Exec(args...)
+			if test.expectedErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+			}
+			setEnvCallBack()
+		})
+	}
 
 	cleanArtifactoryTest()
 }

build/npm/v2-jf/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.73.3",
+  "version": "2.74.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2",
-  "version": "2.73.3",
+  "version": "2.74.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

build/npm/v2/package-lock.json

@@ -18,6 +18,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 
+	rtBuildInfo "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/buildinfo"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
@@ -267,6 +268,17 @@ func TestBuildPublishDryRun(t *testing.T) {
 	buildInfo := publishedBuildInfo.BuildInfo
 	validateBuildInfo(buildInfo, t, 0, 9, tests.RtBuildName1, buildinfo.Generic)
 
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
+	// Verify build publish info overwrite flag with dryrun
+	for i := 0; i < 2; i++ {
+		runRt(t, "bp", tests.RtBuildName1, buildNumber)
+	}
+	existingBuildInfo, found, err := tests.GetBuildRuns(serverDetails, tests.RtBuildName1)
+	assertBuildNumberOccurrencesForGivenBuildNameAndNumber(t, existingBuildInfo, 2, found, buildNumber, err)
+	runRt(t, "bp", tests.RtBuildName1, buildNumber, "--dry-run=true", "--overwrite=true")
+	// Expect no changes in the build info since it's a dry run
+	assertBuildNumberOccurrencesForGivenBuildNameAndNumber(t, existingBuildInfo, 2, found, buildNumber, err)
+
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
 	cleanArtifactoryTest()
 }
@@ -517,7 +529,9 @@ func testArtifactoryPublishWithoutBuildUrl(t *testing.T, buildName, buildNumber
 func TestArtifactoryPublishBuildInfoBuildUrl(t *testing.T) {
 	initArtifactoryTest(t, "")
 	buildNumber := "11"
+	// jfrog-ignore - false positive not a real URL.
 	buildUrl := "http://example.ci.com"
+	// jfrog-ignore - false positive not a real URL.
 	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, cliutils.BuildUrl, "http://override-me.ci.com")
 	defer setEnvCallBack()
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
@@ -538,6 +552,7 @@ func TestArtifactoryPublishBuildInfoBuildUrl(t *testing.T) {
 func TestArtifactoryPublishBuildInfoBuildUrlFromEnv(t *testing.T) {
 	initArtifactoryTest(t, "")
 	buildNumber := "11"
+	// jfrog-ignore - false positive not a real URL.
 	buildUrl := "http://example-env.ci.com"
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
 	setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, cliutils.BuildUrl, buildUrl)
@@ -658,6 +673,80 @@ func TestBuildAddGitEnvBuildNameAndNumber(t *testing.T) {
 	testBuildAddGit(t, true)
 }
 
+func TestBuildPublishWithOverwrite(t *testing.T) {
+	initArtifactoryTest(t, "")
+	buildName := tests.RtBuildName1
+	buildNumber := "1"
+	preReleaseBuildNumber := "1-rc"
+	defaultNumberOfBuilds := 5
+
+	// Clean old build tests if exists
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	// Publish build info without overwrite flag
+	for i := 0; i < defaultNumberOfBuilds; i++ {
+		runRt(t, "bp", buildName, buildNumber)
+	}
+	for i := 0; i < 2; i++ {
+		runRt(t, "bp", buildName, preReleaseBuildNumber)
+	}
+	publishedBuildInfo, found, err := tests.GetBuildRuns(serverDetails, buildName)
+	assertNoErrorAndAssertBuildInfoFound(t, err, found)
+	// Verify if total of 7 build info's are available
+	assert.Equal(t, 7, len(publishedBuildInfo.BuildsNumbers), "expected five build info's to be available")
+
+	buildNumberFrequency := rtBuildInfo.CalculateBuildNumberFrequency(publishedBuildInfo)
+	// Verify if 5 build info's are available for given build number and 2 for pre-release build number
+	assert.Equal(t, defaultNumberOfBuilds, buildNumberFrequency[buildNumber])
+	assert.Equal(t, 2, buildNumberFrequency[preReleaseBuildNumber])
+
+	// Publish build info with overwrite flag
+	runRt(t, "bp", buildName, buildNumber, "--overwrite=true")
+	publishedBuildInfo, found, err = tests.GetBuildRuns(serverDetails, buildName)
+	assertNoErrorAndAssertBuildInfoFound(t, err, found)
+	buildNumbersFrequencyAfterOverwrite := rtBuildInfo.CalculateBuildNumberFrequency(publishedBuildInfo)
+	// Since overwrite is ran for buildNumber verify if only one build info is available for given build number
+	assert.Equal(t, 1, buildNumbersFrequencyAfterOverwrite[buildNumber])
+	// Since overwrite is ran for buildNumber verify no change for preReleaseBuildNumber
+	assert.Equal(t, 2, buildNumbersFrequencyAfterOverwrite[preReleaseBuildNumber])
+
+	// Verify that only one build info is available for given build number with overwrite
+	runRt(t, "bp", buildName, preReleaseBuildNumber, "--overwrite=true")
+	publishedBuildInfo, found, err = tests.GetBuildRuns(serverDetails, buildName)
+	assertNoErrorAndAssertBuildInfoFound(t, err, found)
+	buildNumbersFrequencyAfterOverwrite = rtBuildInfo.CalculateBuildNumberFrequency(publishedBuildInfo)
+	// Since overwrite is ran for preReleaseBuildNumber verify no change for buildNumber
+	assert.Equal(t, 1, buildNumbersFrequencyAfterOverwrite[buildNumber], "expected only one build info to be available")
+	// Since overwrite is ran for preReleaseBuildNumber verify if only one build info is available for given preReleaseBuildNumber
+	assert.Equal(t, 1, buildNumbersFrequencyAfterOverwrite[preReleaseBuildNumber])
+
+	// Delete existing build info
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+
+	// Run build-publish with overwrite flag and build should be published
+	runRt(t, "bp", buildName, buildNumber, "--overwrite=true")
+	publishedBuildInfo, found, err = tests.GetBuildRuns(serverDetails, buildName)
+	// Verify even though overwrite is used when no build infos are available build info should be published
+	assertBuildNumberOccurrencesForGivenBuildNameAndNumber(t, publishedBuildInfo, 1, found, buildNumber, err)
+
+	// Cleanup
+	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
+	cleanArtifactoryTest()
+}
+
+func assertBuildNumberOccurrencesForGivenBuildNameAndNumber(t *testing.T, existingBuildInfo *buildinfo.BuildRuns,
+	expectedOccurrences int, found bool, buildNumber string, err error) {
+
+	buildNumbersFrequencyAfterOverwrite := rtBuildInfo.CalculateBuildNumberFrequency(existingBuildInfo)
+	assertNoErrorAndAssertBuildInfoFound(t, err, found)
+	assert.Equal(t, expectedOccurrences, buildNumbersFrequencyAfterOverwrite[buildNumber], "expected only one build info to be available")
+}
+
+func assertNoErrorAndAssertBuildInfoFound(t *testing.T, err error, found bool) {
+	assert.NoError(t, err)
+	assert.True(t, found, "build info was expected to be found")
+}
+
 func testBuildAddGit(t *testing.T, useEnvBuildNameAndNumber bool) {
 	initArtifactoryTest(t, "")
 	gitCollectCliRunner := coretests.NewJfrogCli(execMain, "jfrog rt", "")