Fix pipelines sync-status command flags handling (#2095)

jfrog · Jul 30, 2023 · 0c944d8 · 0c944d8
1 parent d8ebef4
commit 0c944d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pipelines/cli.go b/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

diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go
@@ -1542,7 +1542,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,
@@ -1554,7 +1554,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,