cmd *: make tag comma separated options allowed

Santiago-Labs · Jul 3, 2024 · 8b9b15d · 8b9b15d
1 parent 904f16c
commit 8b9b15d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -26,7 +26,7 @@ var (
 func init() {
 	rootCmd.AddCommand(deployCmd)
 	deployCmd.Flags().StringVar(&stacks, "stacks", "", "Filter stacks to deploy")
-	deployCmd.Flags().StringVar(&tag, "tag", "", "Filter accounts and organization units to deploy")
+	deployCmd.Flags().StringVar(&tag, "tag", "", "Filter accounts and organization units to deploy with a comma separated list")
 	deployCmd.Flags().StringVar(&targets, "targets", "", "Filter resource types to deploy. Options: organization, scp, stacks")
 	deployCmd.Flags().StringVar(&orgFile, "org", "organization.yml", "Path to the organization.yml file")
 	deployCmd.Flags().BoolVar(&useTUI, "tui", false, "use the TUI for deploy")

diff --git a/cmd/diff.go b/cmd/diff.go
@@ -16,7 +16,7 @@ import (
 func init() {
 	rootCmd.AddCommand(diffCmd)
 	diffCmd.Flags().StringVar(&stacks, "stacks", "", "Filter stacks to deploy")
-	diffCmd.Flags().StringVar(&tag, "tag", "", "Filter accounts and organization units to deploy.")
+	diffCmd.Flags().StringVar(&tag, "tag", "", "Filter accounts and organization units to deploy with a comma separated list")
 	diffCmd.Flags().StringVar(&targets, "targets", "", "Filter resource types to deploy. Options: organization, scp, stacks")
 	diffCmd.Flags().StringVar(&orgFile, "org", "organization.yml", "Path to the organization.yml file")
 	diffCmd.Flags().BoolVar(&useTUI, "tui", false, "use the TUI for diff")

diff --git a/cmd/root.go b/cmd/root.go
@@ -104,10 +104,13 @@ func ProcessOrgEndToEnd(consoleUI runner.ConsoleUI, cmd int, targets []string) e
 	}
 
 	if len(targets) == 0 || deployStacks {
+		totalTags := strings.Split(tag, ",")
 		var accountsToApply []resource.Account
 		for _, acct := range rootAWSOU.AllDescendentAccounts() {
-			if contains(tag, acct.AllTags()) || tag == "" {
-				accountsToApply = append(accountsToApply, *acct)
+			for _, tag := range totalTags {
+				if contains(tag, acct.AllTags()) || tag == "" {
+					accountsToApply = append(accountsToApply, *acct)
+				}
 			}
 		}
 

diff --git a/mintlifydocs/commands/deploy.mdx b/mintlifydocs/commands/deploy.mdx
@@ -10,7 +10,7 @@ Flags:
   -h, --help              help for deploy
       --org string        Path to the organization.yml file (default "organization.yml")
       --stacks string     Filter stacks to deploy
-      --tag string        Filter accounts and account groups to deploy
+      --tag string        Filter accounts and account groups to deploy via a comma separated list
       --tui               use the TUI for deploy
 ```
 

diff --git a/mintlifydocs/commands/diff.mdx b/mintlifydocs/commands/diff.mdx
@@ -10,7 +10,7 @@ Flags:
   -h, --help              help for diff
       --org string        Path to the organization.yml file (default "organization.yml")
       --stacks string     Filter stacks to diff 
-      --tag string        Filter accounts and account groups to diff.
+      --tag string        Filter accounts and account groups to diff via a comma separated list.
       --tui               use the TUI for diff
 ```