Merge branch 'dev' into dependabot/go_modules/github.com/docker/docke…

…r-24.0.7incompatible

.github/workflows/pythonTests.yml

@@ -27,10 +27,11 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.20.x
+      # Due to a bug in Python 3.12.0 we temporary use version 3.11.5
       - name: Setup Python3
         uses: actions/setup-python@v4
         with:
-          python-version: "3.x"
+          python-version: "3.11.5"
       - name: Setup Pipenv
         if: ${{ matrix.suite == 'pipenv' }}
         run: python -m pip install pipenv

.github/workflows/scriptTests.yml

@@ -72,14 +72,26 @@ jobs:
           ./jf${{ matrix.suite.osSuffix }} --version
         if: ${{ matrix.suite.os == 'windows' }}
 
+      # Prior to the release, we set the new version in the package.json files, introducing the prereleased version. 
+      # This adjustment may result in an attempt to download a version that hasn't been published to releases.jfrog.io yet. 
+      # To handle it, we fetch the most recent JFrog CLI release and store it in the LATEST_RELEASE step output.
+      - name: "Get latest release"
+        id: latest-release
+        run: |
+         export LATEST_RELEASE=`curl https://api.github.com/repos/jfrog/jfrog-cli/releases/latest -s | jq .name -r | cut -c 2-`
+         echo "LATEST_RELEASE=$LATEST_RELEASE" >> "$GITHUB_OUTPUT"
+        shell: bash
+
       - name: Test install npm - v2
         working-directory: build/npm/v2
         run: |
+          npm version ${{ steps.latest-release.outputs.LATEST_RELEASE }} --allow-same-version
           npm install
           ./bin/jfrog${{ matrix.suite.osSuffix }} --version
 
       - name: Test install npm - v2-jf
         working-directory: build/npm/v2-jf
         run: |
+          npm version ${{ steps.latest-release.outputs.LATEST_RELEASE }} --allow-same-version
           npm install
           ./bin/jf${{ matrix.suite.osSuffix }} --version    

README.md

@@ -6,7 +6,7 @@
 
 [![Scanned by Frogbot](https://raw.github.com/jfrog/frogbot/master/images/frogbot-badge.svg)](https://github.com/jfrog/frogbot#readme)
 [![Go Report Card](https://goreportcard.com/badge/github.com/jfrog/jfrog-cli)](https://goreportcard.com/report/github.com/jfrog/jfrog-cli)
-[![license](https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/jfrog/jfrog-cli/v2/LICENSE) [![](https://img.shields.io/badge/Docs-%F0%9F%93%96-blue)](https://www.jfrog.com/confluence/display/CLI/JFrog+CLI)
+[![license](https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/jfrog/jfrog-cli/v2/LICENSE) [![](https://img.shields.io/badge/Docs-%F0%9F%93%96-blue)](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli)
 [![Go version](https://img.shields.io/github/go-mod/go-version/jfrog/jfrog-cli)](https://tip.golang.org/doc/go1.20)
 
 </div>

access_test.go

@@ -175,9 +175,9 @@ const (
 )
 
 var atcTestCases = []struct {
-	name                string
-	args                []string
-	shouldExpire        bool
+	name         string
+	args         []string
+	shouldExpire bool
 	// The expected expiry or -1 if we use the default expiry value
 	expectedExpiry      int
 	expectedScope       string

build/chocolatey/v2-jf/jfrog-cli-v2-jf.nuspec

@@ -8,7 +8,7 @@
     <title>JFrog CLI V2-jf</title>
     <authors>JFrog Ltd</authors>
     <owners>JFrog Ltd</owners>
-    <projectUrl>https://www.jfrog.com/confluence/display/CLI/JFrog+CLI</projectUrl>
+    <projectUrl>https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli</projectUrl>
     <licenseUrl>https://github.com/jfrog/jfrog-cli/blob/v2/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <bugTrackerUrl>https://github.com/jfrog/jfrog-cli/issues</bugTrackerUrl>

build/chocolatey/v2/jfrog-cli.nuspec

@@ -8,7 +8,7 @@
     <title>JFrog CLI V2</title>
     <authors>JFrog Ltd</authors>
     <owners>JFrog Ltd</owners>
-    <projectUrl>https://www.jfrog.com/confluence/display/CLI/JFrog+CLI</projectUrl>
+    <projectUrl>https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli</projectUrl>
     <licenseUrl>https://github.com/jfrog/jfrog-cli/blob/v2/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <bugTrackerUrl>https://github.com/jfrog/jfrog-cli/issues</bugTrackerUrl>

build/deb_rpm/v2-jf/deb/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jfrog <devops@jfrog.com>
 Build-Depends: debhelper (>=8~)
 Standards-Version: 3.9.7
-Homepage: https://www.jfrog.com/confluence/display/CLI/JFrog+CLI
+Homepage: https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli
 
 Package: jfrog-cli-v2-jf
 Architecture: any 

build/deb_rpm/v2/deb/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jfrog <devops@jfrog.com>
 Build-Depends: debhelper (>=8~)
 Standards-Version: 3.9.7
-Homepage: https://www.jfrog.com/confluence/display/CLI/JFrog+CLI
+Homepage: https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli
 
 Package: jfrog-cli-v2
 Architecture: any 

build/npm/v2-jf/README.md

@@ -6,7 +6,7 @@
 
 # JFrog CLI
 
-[Website](http://www.jfrog.com)  •  [Docs](https://www.jfrog.com/confluence/display/CLI/JFrog+CLI)  •  [Issues](https://github.com/jfrog/jfrog-cli-go/issues)  •  [Blog](https://jfrog.com/blog/)  •  [We're Hiring](https://join.jfrog.com/)  •  [Artifactory Free Trial](https://jfrog.com/artifactory/free-trial/)
+[Website](http://www.jfrog.com)  •  [Docs](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli)  •  [Issues](https://github.com/jfrog/jfrog-cli/issues)  •  [Blog](https://jfrog.com/blog/)  •  [We're Hiring](https://join.jfrog.com/)  •  [Artifactory Free Trial](https://jfrog.com/artifactory/free-trial/)
 
 ## Overview
 

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.50.4",
+  "version": "2.51.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/README.md

@@ -6,7 +6,7 @@
 
 # JFrog CLI
 
-[Website](http://www.jfrog.com)  •  [Docs](https://www.jfrog.com/confluence/display/CLI/JFrog+CLI)  •  [Issues](https://github.com/jfrog/jfrog-cli-go/issues)  •  [Blog](https://jfrog.com/blog/)  •  [We're Hiring](https://join.jfrog.com/)  •  [Artifactory Free Trial](https://jfrog.com/artifactory/free-trial/)
+[Website](http://www.jfrog.com)  •  [Docs](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli)  •  [Issues](https://github.com/jfrog/jfrog-cli/issues)  •  [Blog](https://jfrog.com/blog/)  •  [We're Hiring](https://join.jfrog.com/)  •  [Artifactory Free Trial](https://jfrog.com/artifactory/free-trial/)
 
 ## Overview
 

build/npm/v2/package.json

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

go.mod

@@ -7,10 +7,10 @@ require (
 	github.com/buger/jsonparser v1.1.1
 	github.com/go-git/go-git/v5 v5.9.0
 	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
-	github.com/jfrog/build-info-go v1.9.14
+	github.com/jfrog/build-info-go v1.9.15
 	github.com/jfrog/gofrog v1.3.1
-	github.com/jfrog/jfrog-cli-core/v2 v2.45.4
-	github.com/jfrog/jfrog-client-go v1.34.3
+	github.com/jfrog/jfrog-cli-core/v2 v2.46.0
+	github.com/jfrog/jfrog-client-go v1.34.4
 	github.com/jszwec/csvutil v1.8.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/stretchr/testify v1.8.4
@@ -122,17 +122,17 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
-	google.golang.org/grpc v1.58.2 // indirect
+	google.golang.org/grpc v1.58.3 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20231019085746-e1b192457664
+// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20231107094842-97a0ca9da395
 
-// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231019090648-a85aaa5fe352
+// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231105094115-13b1588fc537
 
 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27
 
-// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev
+// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20231101142932-422f20520a28

go.sum

@@ -237,16 +237,16 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jedib0t/go-pretty/v6 v6.4.8 h1:HiNzyMSEpsBaduKhmK+CwcpulEeBrTmxutz4oX/oWkg=
 github.com/jedib0t/go-pretty/v6 v6.4.8/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs=
-github.com/jfrog/build-info-go v1.9.14 h1:xVezJ16Vpm/boRBn3lI1THCQmkylm+6R4zYWxOQ0NSM=
-github.com/jfrog/build-info-go v1.9.14/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg=
+github.com/jfrog/build-info-go v1.9.15 h1:DN7DKZq6H5FlHfL3Lu8fo4t2INgczRgT09dJiZjJ1oo=
+github.com/jfrog/build-info-go v1.9.15/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q=
 github.com/jfrog/gofrog v1.3.1 h1:QqAwQXCVReT724uga1AYqG/ZyrNQ6f+iTxmzkb+YFQk=
 github.com/jfrog/gofrog v1.3.1/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
 github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
-github.com/jfrog/jfrog-cli-core/v2 v2.45.4 h1:IHwL2RQ0VwibUCPLFtCm53tMrO1ZOmSkf6Kt2o3iD3U=
-github.com/jfrog/jfrog-cli-core/v2 v2.45.4/go.mod h1:5rTYHinkg5k2ALHYROR3AnE2mMQ22SFZF5dwew1sgco=
-github.com/jfrog/jfrog-client-go v1.34.3 h1:kDfw3FUQQvOsTKFqonIgLlziez6CSX80xCYZIH9YYcg=
-github.com/jfrog/jfrog-client-go v1.34.3/go.mod h1:fuxhYzWEkA16+ZV5cP/BJUGjA3SXVKbBoDmb8ZS6J4g=
+github.com/jfrog/jfrog-cli-core/v2 v2.46.0 h1:4wLboOCNDWx5/fQpxd8qIFqGeveOUx5dyrW8sZJXUFw=
+github.com/jfrog/jfrog-cli-core/v2 v2.46.0/go.mod h1:9x/Pwyf1RahXDWtfVrmZgsmAzQWHgsV6FDkIqmezrdc=
+github.com/jfrog/jfrog-client-go v1.34.4 h1:Qt6Yniv48N9EaE0rrUZznOohuDRvqp9sUUHiHXAo3Xs=
+github.com/jfrog/jfrog-client-go v1.34.4/go.mod h1:0PVhP6xGvBBaUzOU9LKf5OYkke/gY2IFILHA++iabFM=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jszwec/csvutil v1.8.0 h1:G7vS2LGdpZZDH1HmHeNbxOaJ/ZnJlpwGFvOkTkJzzNk=
@@ -774,8 +774,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
-google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

gradle_test.go

@@ -82,7 +82,7 @@ func TestGradleBuildWithServerID(t *testing.T) {
 	searchSpec, err := tests.CreateSpec(tests.SearchAllGradle)
 	assert.NoError(t, err)
 	inttestutils.VerifyExistInArtifactory(tests.GetGradleDeployedArtifacts(), searchSpec, serverDetails, t)
-	verifyExistInArtifactoryByProps(tests.GetGradleDeployedArtifacts(), tests.GradleRepo+"/*", "build.name="+tests.GradleBuildName+";build.number="+buildNumber, t)
+	verifyExistInArtifactoryByProps(tests.GetGradleDeployedArtifacts(), tests.GradleRepo+"/*", "build.name="+tests.GradleBuildName+";build.number="+buildNumber+";build.timestamp="+getBuildTimestamp(tests.GradleBuildName, buildNumber, t), t)
 	assert.NoError(t, artifactoryCli.Exec("bp", tests.GradleBuildName, buildNumber))
 
 	publishedBuildInfo, found, err := tests.GetBuildInfo(serverDetails, tests.GradleBuildName, buildNumber)

guides/getting-started-with-jfrog-using-the-cli.md

@@ -124,6 +124,6 @@ jf rt bp
 ### More
 
 * Read more
-  about [JFrog CLI](https://www.jfrog.com/confluence/display/CLI/JFrog+CLI) & [JFrog's IDE Integrations](https://www.jfrog.com/confluence/display/JFROG/IDE+Integration)
+  about [JFrog CLI](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli) & [JFrog's IDE Integrations](https://docs.jfrog-applications.jfrog.io/jfrog-applications/ide)
 * **Your feedback is important!** We'd love to get your feedback and answer any questions you may have.
   Communicate with us through [GitHub](https://github.com/jfrog/jfrog-cli/issues).

maven_test.go

@@ -2,6 +2,12 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/jfrog/build-info-go/build"
 	buildinfo "github.com/jfrog/build-info-go/entities"
 	biutils "github.com/jfrog/build-info-go/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/mvn"
@@ -17,10 +23,6 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
 )
 
 const mavenTestsProxyPort = "1028"
@@ -200,6 +202,16 @@ func createHomeConfigAndLocalRepo(t *testing.T, encryptPassword bool) (err error
 	return err
 }
 
+// Get the build timestamp from the build info.
+func getBuildTimestamp(buildName, buildNumber string, t *testing.T) string {
+	service := build.NewBuildInfoService()
+	bld, err := service.GetOrCreateBuild(buildName, buildNumber)
+	if assert.NoError(t, err) {
+		return fmt.Sprintf("%d", bld.GetBuildTimestamp().UnixMilli())
+	}
+	return ""
+}
+
 func TestMavenBuildIncludePatterns(t *testing.T) {
 	initMavenTest(t, false)
 	buildNumber := "123"
@@ -209,7 +221,7 @@ func TestMavenBuildIncludePatterns(t *testing.T) {
 	searchSpec, err := tests.CreateSpec(tests.SearchAllMaven)
 	assert.NoError(t, err)
 	inttestutils.VerifyExistInArtifactory(tests.GetMavenMultiIncludedDeployedArtifacts(), searchSpec, serverDetails, t)
-	verifyExistInArtifactoryByProps(tests.GetMavenMultiIncludedDeployedArtifacts(), tests.MvnRepo1+"/*", "build.name="+tests.MvnBuildName+";build.number="+buildNumber, t)
+	verifyExistInArtifactoryByProps(tests.GetMavenMultiIncludedDeployedArtifacts(), tests.MvnRepo1+"/*", "build.name="+tests.MvnBuildName+";build.number="+buildNumber+";build.timestamp="+getBuildTimestamp(tests.MvnBuildName, buildNumber, t), t)
 
 	// Validate build info.
 	assert.NoError(t, artifactoryCli.Exec("build-publish", tests.MvnBuildName, buildNumber))

scan/cli.go

@@ -259,7 +259,8 @@ func createAuditCmd(c *cli.Context) (*audit.AuditCommand, error) {
 		SetPrintExtendedTable(c.Bool(cliutils.ExtendedTable)).
 		SetMinSeverityFilter(minSeverity).
 		SetFixableOnly(c.Bool(cliutils.FixableOnly)).
-		SetThirdPartyApplicabilityScan(c.Bool(cliutils.ThirdPartyContextualAnalysis))
+		SetThirdPartyApplicabilityScan(c.Bool(cliutils.ThirdPartyContextualAnalysis)).
+		SetExclusions(cliutils.GetStringsArrFlagValue(c, "exclusions"))
 
 	if c.String("watches") != "" {
 		auditCmd.SetWatches(splitByCommaAndTrim(c.String("watches")))

testdata/docker/script.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
-./buildx create --name mybuilder --driver-opt "network=host" --config buildkitd.toml --use
+# We pin v0.12.2 since buildkit v0.12.3 is getting a 401 unauthorized error when using a private HTTP insecure registry.
+./buildx create --name mybuilder --driver-opt "network=host" --driver-opt image=moby/buildkit:v0.12.2 --config buildkitd.toml --use
 ./buildx inspect --bootstrap

transfer_test.go

@@ -368,7 +368,7 @@ func generateTestRepoSnapshotFile(t *testing.T, repoKey, repoSnapshotFilePath st
 func addChildWithFiles(t *testing.T, parent *reposnapshot.Node, dirName string, explored, checkCompleted bool, filesCount int) *reposnapshot.Node {
 	childNode := reposnapshot.CreateNewNode(dirName, nil)
 	for i := 0; i < filesCount; i++ {
-		assert.NoError(t, childNode.IncrementFilesCount())
+		assert.NoError(t, childNode.IncrementFilesCount(uint64(i)))
 	}
 
 	assert.NoError(t, parent.AddChildNode(dirName, []*reposnapshot.Node{childNode}))

utils/cliutils/cli_consts.go

@@ -4,7 +4,7 @@ import "time"
 
 const (
 	// General CLI constants
-	CliVersion  = "2.50.4"
+	CliVersion  = "2.51.0"
 	ClientAgent = "jfrog-cli-go"
 
 	// CLI base commands constants: