From 601a437311af1def6bb737d06202a8a360e64acd Mon Sep 17 00:00:00 2001
From: Remington Breeze <remington@breeze.software>
Date: Thu, 21 Dec 2023 15:39:06 -0800
Subject: [PATCH] fix(cli): project flag not recognized for several CLI
 commands (#1320)

---
 internal/cli/cmd/stage/promote.go             | 3 ++-
 internal/cli/cmd/stage/promote_subscribers.go | 5 +++--
 internal/cli/cmd/stage/set_auto_promotion.go  | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/internal/cli/cmd/stage/promote.go b/internal/cli/cmd/stage/promote.go
index 83c67c89e..57b389f0d 100644
--- a/internal/cli/cmd/stage/promote.go
+++ b/internal/cli/cmd/stage/promote.go
@@ -23,7 +23,7 @@ func newPromoteCommand(opt *option.Option) *cobra.Command {
 	var flag PromoteFlags
 	cmd := &cobra.Command{
 		Use:  "promote --project=project (STAGE) [(--freight=)freight-id]",
-		Args: option.ExactArgs(2),
+		Args: option.ExactArgs(1),
 		Example: `
 # Promote a freight to a stage for a specific project
 kargo stage promote dev --project=my-project --freight=abc123
@@ -80,5 +80,6 @@ kargo stage promote dev --freight=abc123
 	}
 	opt.PrintFlags.AddFlags(cmd)
 	option.Freight(&flag.Freight)(cmd.Flags())
+	option.Project(&opt.Project, opt.Project)(cmd.Flags())
 	return cmd
 }
diff --git a/internal/cli/cmd/stage/promote_subscribers.go b/internal/cli/cmd/stage/promote_subscribers.go
index 0cb4c7432..e67b6892d 100644
--- a/internal/cli/cmd/stage/promote_subscribers.go
+++ b/internal/cli/cmd/stage/promote_subscribers.go
@@ -22,8 +22,8 @@ type PromoteSubscribersFlags struct {
 func newPromoteSubscribersCommand(opt *option.Option) *cobra.Command {
 	var flag PromoteSubscribersFlags
 	cmd := &cobra.Command{
-		Use:  "promote --project=project (STAGE) [(--freight=)freight-id]",
-		Args: option.ExactArgs(2),
+		Use:  "promote-subscribers --project=project (STAGE) [(--freight=)freight-id]",
+		Args: option.ExactArgs(1),
 		Example: `
 # Promote subscribers for a specific project
 kargo stage promote-subscribers dev --project=my-project --freight=abc123
@@ -85,5 +85,6 @@ kargo stage promote-subscribers dev --freight=abc123
 	}
 	opt.PrintFlags.AddFlags(cmd)
 	option.Freight(&flag.Freight)(cmd.Flags())
+	option.Project(&opt.Project, opt.Project)(cmd.Flags())
 	return cmd
 }
diff --git a/internal/cli/cmd/stage/set_auto_promotion.go b/internal/cli/cmd/stage/set_auto_promotion.go
index 96505f952..60a9497b3 100644
--- a/internal/cli/cmd/stage/set_auto_promotion.go
+++ b/internal/cli/cmd/stage/set_auto_promotion.go
@@ -19,7 +19,7 @@ import (
 func newEnableAutoPromotion(opt *option.Option) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:  "enable-auto-promotion --project=project (STAGE)",
-		Args: option.ExactArgs(2),
+		Args: option.ExactArgs(1),
 		Example: `
 # Enable auto-promotion on a stage for a specific project
 kargo stage enable-auto-promotion --project=my-project dev
@@ -44,13 +44,14 @@ kargo stage enable-auto-promotion dev
 		},
 	}
 	opt.PrintFlags.AddFlags(cmd)
+	option.Project(&opt.Project, opt.Project)(cmd.Flags())
 	return cmd
 }
 
 func newDisableAutoPromotion(opt *option.Option) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:  "disable-auto-promotion --project=project (STAGE)",
-		Args: option.ExactArgs(2),
+		Args: option.ExactArgs(1),
 		Example: `
 # Disable auto-promotion on a stage for a specific project
 kargo stage disable-auto-promotion --project=my-project dev
@@ -75,6 +76,7 @@ kargo stage disable-auto-promotion dev
 		},
 	}
 	opt.PrintFlags.AddFlags(cmd)
+	option.Project(&opt.Project, opt.Project)(cmd.Flags())
 	return cmd
 }