cmd *: make tag comma separated options allowed

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")

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")

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)
+				}
 			}
 		}