Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into anlyzer…

…-version # Conflicts: # go.mod # go.sum
sverdlov93 · Sep 14, 2023 · aab974a · aab974a
2 parents 9d8d6b0 + 667c810
commit aab974a
Show file tree

Hide file tree

Showing 23 changed files with 172 additions and 63 deletions.
diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml
@@ -15,6 +15,7 @@ jobs:
       - uses: jfrog/frogbot@v2
         env:
           JFROG_CLI_LOG_LEVEL: "DEBUG"
+
           # [Mandatory]
           # JFrog platform URL (This functionality requires version 3.29.0 or above of Xray)
           JF_URL: ${{ secrets.FROGBOT_URL }}
@@ -116,4 +117,5 @@ jobs:
           # [Optional]
           # Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests
           # The following values are accepted: Low, Medium, High or Critical
-          # JF_MIN_SEVERITY: ""
+          # JF_MIN_SEVERITY: ""
+
diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml
@@ -20,6 +20,7 @@ jobs:
       - uses: jfrog/frogbot@v2
         env:
           JFROG_CLI_LOG_LEVEL: "DEBUG"
+
           # [Mandatory]
           # JFrog platform URL (This functionality requires version 3.29.0 or above of Xray)
           JF_URL: ${{ secrets.FROGBOT_URL }}

diff --git a/access_test.go b/access_test.go
@@ -76,7 +76,7 @@ func TestRefreshableAccessTokens(t *testing.T) {
 	assert.NotEmpty(t, curRefreshToken)
 
 	// Make the token always refresh.
-	auth.InviteRefreshBeforeExpiryMinutes = 365 * 24 * 60
+	auth.RefreshPlatformTokenBeforeExpiryMinutes = 365 * 24 * 60
 
 	// Upload a file and assert tokens were refreshed.
 	uploadedFiles++
@@ -90,7 +90,7 @@ func TestRefreshableAccessTokens(t *testing.T) {
 	}
 
 	// Make the token not refresh. Verify Tokens did not refresh.
-	auth.InviteRefreshBeforeExpiryMinutes = 0
+	auth.RefreshPlatformTokenBeforeExpiryMinutes = 0
 	uploadedFiles++
 	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, "testdata/a/b/b2.in", uploadedFiles)
 	if !assert.NoError(t, err) {

diff --git a/artifactory_test.go b/artifactory_test.go
@@ -5268,7 +5268,7 @@ func TestRefreshableArtifactoryTokens(t *testing.T) {
 	assert.NotEmpty(t, curRefreshToken)
 
 	// Make the token always refresh.
-	auth.RefreshBeforeExpiryMinutes = 60
+	auth.RefreshArtifactoryTokenBeforeExpiryMinutes = 60
 
 	// Upload a file and assert tokens were refreshed.
 	uploadedFiles++
@@ -5312,7 +5312,7 @@ func TestRefreshableArtifactoryTokens(t *testing.T) {
 	}
 
 	// Make the token not refresh. Verify Tokens did not refresh.
-	auth.RefreshBeforeExpiryMinutes = 0
+	auth.RefreshArtifactoryTokenBeforeExpiryMinutes = 0
 	uploadedFiles++
 	err = uploadWithSpecificServerAndVerify(t, artifactoryCommandExecutor, "testdata/a/b/b2.in", uploadedFiles)
 	if err != nil {

diff --git a/build/getcli/jf.sh b/build/getcli/jf.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 CLI_OS="na"
-CLI_UNAME="na"
 CLI_MAJOR_VER="v2-jf"
 VERSION="[RELEASE]"
 
@@ -52,7 +51,7 @@ else
            ;;
         *)
             echo "Unknown machine type: $MACHINE_TYPE"
-            exit -1
+            exit 1
             ;;
     esac
     URL="https://releases.jfrog.io/artifactory/jfrog-cli/${CLI_MAJOR_VER}/${VERSION}/jfrog-cli-${CLI_OS}-${ARCH}/jf"

diff --git a/build/getcli/jfrog.sh b/build/getcli/jfrog.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 CLI_OS="na"
-CLI_UNAME="na"
 CLI_MAJOR_VER="v2"
 VERSION="[RELEASE]"
 
@@ -52,7 +51,7 @@ else
            ;;
         *)
             echo "Unknown machine type: $MACHINE_TYPE"
-            exit -1
+            exit 1
             ;;
     esac
     URL="https://releases.jfrog.io/artifactory/jfrog-cli/${CLI_MAJOR_VER}/${VERSION}/jfrog-cli-${CLI_OS}-${ARCH}/jfrog"

diff --git a/build/installcli/jf.sh b/build/installcli/jf.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 CLI_OS="na"
-CLI_UNAME="na"
 CLI_MAJOR_VER="v2-jf"
 VERSION="[RELEASE]"
 # Order is by destination priority.
@@ -55,7 +54,7 @@ else
            ;;
         *)
             echo "Unknown machine type: $MACHINE_TYPE"
-            exit -1
+            exit 1
             ;;
     esac
     URL="https://releases.jfrog.io/artifactory/jfrog-cli/${CLI_MAJOR_VER}/${VERSION}/jfrog-cli-${CLI_OS}-${ARCH}/jf"

diff --git a/build/installcli/jfrog.sh b/build/installcli/jfrog.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 CLI_OS="na"
-CLI_UNAME="na"
 CLI_MAJOR_VER="v2"
 VERSION="[RELEASE]"
 # Order is by destination priority.
@@ -55,7 +54,7 @@ else
            ;;
         *)
             echo "Unknown machine type: $MACHINE_TYPE"
-            exit -1
+            exit 1
             ;;
     esac
     URL="https://releases.jfrog.io/artifactory/jfrog-cli/${CLI_MAJOR_VER}/${VERSION}/jfrog-cli-${CLI_OS}-${ARCH}/jfrog"

diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json
diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.46.3",
+  "version": "2.47.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json
diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2",
-  "version": "2.46.3",
+  "version": "2.47.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

diff --git a/build/setupcli/jf.sh b/build/setupcli/jf.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 CLI_OS="na"
-CLI_UNAME="na"
 CLI_MAJOR_VER="v2-jf"
 VERSION="[RELEASE]"
 # Order is by destination priority.
@@ -59,7 +58,7 @@ else
            ;;
         *)
             echo "Unknown machine type: $MACHINE_TYPE"
-            exit -1
+            exit 1
             ;;
     esac
     URL="https://releases.jfrog.io/artifactory/jfrog-cli/${CLI_MAJOR_VER}/${VERSION}/jfrog-cli-${CLI_OS}-${ARCH}/jf"

diff --git a/documentation/CLI-for-JFrog-Lifecycle.md b/documentation/CLI-for-JFrog-Lifecycle.md
@@ -121,3 +121,69 @@ Use signing key pair "myKeyPair" and overwrite in case of conflicts.
 ```
 jf rbp --signing-key=myKeyPair --project=project0 --overwrite=true --sync=true myApp 1.0.0 PROD
 ```
+
+### Distributing a release bundle
+
+This command distributes a Release Bundle v2 to an edge node.
+
+|                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Command-name           | release-bundle-distribute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| Abbreviation           | rbd                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| Command options        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| --create-repo          | \[Default: false\]<br><br>Set to true to create the repository on the edge if it does not exist.                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| --dry-run              | \[Default: false\]<br><br>Set to true to disable communication with JFrog Distribution.                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| --dist-rules           | \[Optional\]<br><br>Path to a file, which includes the Distribution Rules in a JSON format. See [structure](#distribution-rules-structure) bellow.                                                                                                                                                                                                                                                                                                                                                                                    |
+| --site                 | \[Default: *\]<br><br>Wildcard filter for site name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| --city                 | \[Default: *\]<br><br>Wildcard filter for site city name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| --country-codes        | \[Default: *\]<br><br>Semicolon-separated list of wildcard filters for site country codes.                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| --insecure-tls         | \[Default: false\]<br><br>Set to true to skip TLS certificates verification.                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| --mapping-pattern      | \[Optional\]<br><br>Specify along with 'mapping-target' to distribute artifacts to a different path on the edge node. You can use wildcards to specify multiple artifacts.                                                                                                                                                                                                                                                                                                                                                            |
+| --mapping-target       | \[Optional\]<br><br>The target path for distributed artifacts on the edge node. If not specified, the artifacts will have the same path and name on the edge node, as on the source Artifactory server. For flexibility in specifying the distribution path, you can include [placeholders](https://www.jfrog.com/confluence/display/CLI/CLI+for+JFrog+Artifactory#CLIforJFrogArtifactory-UsingPlaceholders) in the form of {1}, {2} which are replaced by corresponding tokens in the pattern path that are enclosed in parenthesis. |
+| Command arguments      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| release bundle name    | Name of the Release Bundle to distribute.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| release bundle version | Version of the Release Bundle to distribute.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+
+#### Distribution Rules Structure:
+   ```json
+   {
+    "distribution_rules": [
+       {
+          "site_name": "DC-1",
+          "city_name": "New-York",
+          "country_codes": ["1"]
+       },
+       {
+          "site_name": "DC-2",
+          "city_name": "Tel-Aviv",
+          "country_codes": ["972"]
+       }
+    ]
+   }
+   ```
+The Distribution Rules format also supports wildcards. For example:
+   ```json
+   {
+    "distribution_rules": [
+       {
+          "site_name": "",
+          "city_name": "",
+          "country_codes": ["*"]
+       }
+    ]
+   }
+   ```
+
+#### Examples
+
+#### Example 1
+Distribute the Release Bundle v2 named myApp with version 1.0.0. Use the distribution rules defined in the specified file.
+
+	jf rbd --dist-rules=/path/to/dist-rules.json myApp 1.0.0
+
+#### Example 2
+
+Distribute the Release Bundle v2 named myApp with version 1.0.0 using the default distribution rules.
+Map files under the 'source' directory to be placed under the 'target' directory. 
+
+	jf rbd --dist-rules=/path/to/dist-rules.json --mapping-pattern="(*)/source/(*)" --mapping-target="{1}/target/{2}" myApp 1.0.0
diff --git a/go.mod b/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
 	github.com/jfrog/build-info-go v1.9.10
 	github.com/jfrog/gofrog v1.3.0
-	github.com/jfrog/jfrog-cli-core/v2 v2.41.7
-	github.com/jfrog/jfrog-client-go v1.32.1
+	github.com/jfrog/jfrog-cli-core/v2 v2.43.0
+	github.com/jfrog/jfrog-client-go v1.32.2
 	github.com/jszwec/csvutil v1.8.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/stretchr/testify v1.8.4
@@ -21,6 +21,7 @@ require (
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
 	golang.org/x/term v0.12.0
 	gopkg.in/yaml.v2 v2.4.0
+
 )
 
 require (
@@ -125,10 +126,10 @@ require (
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230828134416-f0db33dd9344
 
-// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230907095444-fd00f19be95d
+// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230904170814-03a7938bae94
 
 // 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 v1.28.1-0.20230906115540-2c3c91d271d6
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230913164821-c396cb9a4e06
 
-// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230905120411-62d1bdd4eb38
+// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230831151231-e5e7bd035ddc
diff --git a/go.sum b/go.sum
@@ -239,10 +239,10 @@ github.com/jfrog/build-info-go v1.9.10 h1:uXnDLVxpqxoAMpXcki00QaBB+M2BoGMMpHODPk
 github.com/jfrog/build-info-go v1.9.10/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg=
 github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk=
 github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
-github.com/jfrog/jfrog-cli-core/v2 v2.41.7 h1:t54PfmmTWsrX1L/7WpY0n57AwWfNZSfoTI1RG9huXlE=
-github.com/jfrog/jfrog-cli-core/v2 v2.41.7/go.mod h1:HCMfdtCy2B81EF8YiQlsfbG3CsLk/VeqoWGNYoSUz8Q=
-github.com/jfrog/jfrog-client-go v1.32.1 h1:RQmuPSLsF5222vZJzwkgHSZMMJF83ExS7SwIvh4P+H8=
-github.com/jfrog/jfrog-client-go v1.32.1/go.mod h1:362+oa7uTTYurzBs1L0dmUTlLo7uhpAU/pwM5Zb9clg=
+github.com/jfrog/jfrog-cli-core/v2 v2.43.0 h1:euo1CjZcpMdWkFUQ3zffRPfCR1zXhLD6TE/lfexV99o=
+github.com/jfrog/jfrog-cli-core/v2 v2.43.0/go.mod h1:NWqT0ZnAvEdjaXGp64POvRV35TJ2R/c0W45UmrXQonk=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230913164821-c396cb9a4e06 h1:QcREjpuUJmLsy7aSXTcMomAIVFgOsdUHGi7lcqVfg8M=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230913164821-c396cb9a4e06/go.mod h1:UewnwkIf/77HzBgwCPzOHZCK6V/Nw5/JwdzN/tRb4aU=
 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=

diff --git a/lifecycle/cli.go b/lifecycle/cli.go
@@ -55,7 +55,6 @@ func GetCommands() []cli.Command {
 			ArgsUsage:    common.CreateEnvVars(),
 			BashComplete: coreCommon.CreateBashCompletionFunc(),
 			Category:     lcCategory,
-			Hidden:       true,
 			Action:       distribute,
 		},
 	})
@@ -170,7 +169,7 @@ func assertSigningKeyProvided(c *cli.Context) error {
 }
 
 func createLifecycleDetailsByFlags(c *cli.Context) (*coreConfig.ServerDetails, error) {
-	lcDetails, err := cliutils.CreateServerDetailsWithConfigOffer(c, false, cliutils.Platform)
+	lcDetails, err := cliutils.CreateServerDetailsWithConfigOffer(c, true, cliutils.Platform)
 	if err != nil {
 		return nil, err
 	}