Merge remote-tracking branch 'upstream/dev' into add-module-flag-to-bad

# Conflicts:
#	go.mod
#	go.sum

.github/workflows/dockerTests.yml

@@ -21,7 +21,8 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          # We are temporarily downgrading to Go 1.20.5 due to a bug in version 1.20.6 that causes Docker tests to fail.
+          go-version: 1.20.5
       - name: Checkout code
         uses: actions/checkout@v3
         with:

README.md

@@ -268,7 +268,7 @@ We welcome pull requests from the community. To help us improve this project, pl
 JFrog CLI can be used for a variety of functions with Artifactory, Xray and Mission Control,
 and has a dedicated set of commands for each product.
 To learn how to use JFrog CLI, please visit
-the [JFrog CLI User Guide](https://www.jfrog.com/confluence/display/CLI/Welcome+to+JFrog+CLI).
+the [JFrog CLI User Guide](https://jfrog.com/help/r/jfrog-cli).
 
 # JFrog CLI Plugins
 

docker_test.go

@@ -180,7 +180,6 @@ func TestPushFatManifestImage(t *testing.T) {
 	if !*tests.TestDocker {
 		t.Skip("Skipping test. To run it, add the '-test.docker=true' option.")
 	}
-
 	buildName := "push-fat-manifest" + tests.DockerBuildName
 
 	// Create temp test dir.

documentation/JFrog-CLI.md

@@ -1,5 +1,5 @@
 # JFrog CLI 
-![image](https://github.com/jfrog/jfrog-cli/blob/v2/images/jfrog-cli-intro.png)
+![image](images/jfrog-cli-intro.png)
 
 ## About JFrog CLI
 ### General
@@ -38,9 +38,11 @@ Your contributions will be reviewed, and if accepted, they will be merged into t
 ## Read More
 
 * [CLI for JFrog Artifactory](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-artifactory)
-* [CLI for JFrog Xray](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-xray)
-* [CLI for JFrog Mission Control](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-mission-control)
+* [CLI for JFrog Curation](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-curation)
 * [CLI for JFrog Distribution](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-distribution)
+* [CLI for JFrog Mission Control](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-mission-control)
+* [CLI for JFrog Pipelines](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-pipelines)
+* [CLI for JFrog Xray](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-xray)
 
 * * *
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
 	github.com/jfrog/build-info-go v1.9.6
 	github.com/jfrog/gofrog v1.3.0
-	github.com/jfrog/jfrog-cli-core/v2 v2.39.2
+	github.com/jfrog/jfrog-cli-core/v2 v2.39.3
 	github.com/jfrog/jfrog-client-go v1.31.2
 	github.com/jszwec/csvutil v1.8.0
 	github.com/mholt/archiver/v3 v3.5.1
@@ -127,4 +127,4 @@ replace github.com/jfrog/jfrog-cli-core/v2 => github.com/sarao1310/jfrog-cli-cor
 
 // 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.20230718091417-c761a2d17c6c
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230730114019-1d6985b1f8bd

go.sum

@@ -238,8 +238,10 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A
 github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4=
 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-client-go v1.28.1-0.20230718091417-c761a2d17c6c h1:2dBAFi8WjRH5YagArNfUdVB7WQoaoNufmRhrhDuq3Qs=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20230718091417-c761a2d17c6c/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI=
+github.com/jfrog/jfrog-cli-core/v2 v2.39.3 h1:GtBwEAchuvI4c8ZwaJ6CKN/KavMlEu5+DwNX9OesYMI=
+github.com/jfrog/jfrog-cli-core/v2 v2.39.3/go.mod h1:/HJ9mO3AZsACtQWxkwMj7REWPdXT3yHKjJXjPHlmB34=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230730114019-1d6985b1f8bd h1:UZxgBwOplrYdKgM3Uj8h3lRkjnHqK/gea1TV2E3yjU8=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230730114019-1d6985b1f8bd/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI=
 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=

pipelines/cli.go

@@ -86,7 +86,7 @@ func createPipelinesDetailsByFlags(c *cli.Context) (*coreConfig.ServerDetails, e
 	if err != nil {
 		return nil, err
 	}
-	if plDetails.DistributionUrl == "" {
+	if plDetails.PipelinesUrl == "" {
 		return nil, fmt.Errorf("the --pipelines-url option is mandatory")
 	}
 	return plDetails, nil
@@ -138,7 +138,13 @@ func syncPipelineResources(c *cli.Context) error {
 // getSyncPipelineResourcesStatus fetch sync status for a given repository path and branch name
 func getSyncPipelineResourcesStatus(c *cli.Context) error {
 	branch := c.String("branch")
+	if branch == "" {
+		return cliutils.PrintHelpAndReturnError("The --branch option is mandatory.", c)
+	}
 	repository := c.String("repository")
+	if repository == "" {
+		return cliutils.PrintHelpAndReturnError("The --repository option is mandatory.", c)
+	}
 	clientlog.Info("Fetching pipeline sync status on repository:", repository, "branch:", branch)
 
 	// Fetch service details for authentication

utils/cliutils/commandsflags.go

@@ -1547,7 +1547,7 @@ var flagsMap = map[string]cli.Flag{
 	},
 	branch: cli.StringFlag{
 		Name:  branch,
-		Usage: "[Optional] Branch name to filter.` `",
+		Usage: "[Mandatory] Branch name to filter.` `",
 	},
 	pipelineName: cli.StringFlag{
 		Name:  pipelineName,
@@ -1559,7 +1559,7 @@ var flagsMap = map[string]cli.Flag{
 	},
 	repository: cli.StringFlag{
 		Name:  repository,
-		Usage: "[Optional] Repository name to filter resource.` `",
+		Usage: "[Mandatory] Repository name to filter resource.` `",
 	},
 	singleBranch: cli.BoolFlag{
 		Name:  singleBranch,