resource account: include AccountName as tag by default

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

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
 ```
 

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
 ```
 

resource/account.go

@@ -65,7 +65,7 @@ func (a Account) IsProvisioned() bool {
 }
 
 func (a Account) AllTags() []string {
-	var tags []string
+	tags := []string{"AccountName=" + a.AccountName}
 	tags = append(tags, a.Tags...)
 	if a.Parent != nil {
 		tags = append(tags, a.Parent.AllTags()...)

resourceoperation/organization_unit.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 	"text/template"
 
 	"github.com/fatih/color"
@@ -473,6 +474,10 @@ func diffTags(taggable Taggable) (added, removed []string) {
 
 	for _, tag := range taggable.AllTags() {
 		if _, ok := oldMap[tag]; !ok {
+			if ignorableTag(tag) {
+				continue
+			}
+
 			if contains(added, tag) {
 				// There can be duplicates when tags are inherited from an OU
 				continue
@@ -514,9 +519,18 @@ func ignorableTag(tag string) bool {
 	ignorableTags := map[string]struct{}{
 		"TelophaseManaged=true": {},
 	}
+	ignorableKeys := map[string]struct{}{
+		"AccountName": {},
+	}
 
 	_, ok := ignorableTags[tag]
-	return ok
+	if ok {
+		return true
+	}
+	if _, ok := ignorableKeys[strings.Split(tag, "=")[0]]; ok {
+		return true
+	}
+	return false
 }
 
 func oneOf(check string, slc []string) bool {

resourceoperation/organization_unit_test.go

@@ -0,0 +1,72 @@
+package resourceoperation
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/santiago-labs/telophasecli/resource"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDiffTags(t *testing.T) {
+	tests := []struct {
+		description string
+		input       resource.OrganizationUnit
+
+		wantAdded   []string
+		wantRemoved []string
+	}{
+		{
+			description: "adding basic tag",
+			input: resource.OrganizationUnit{
+				Accounts: []*resource.Account{
+					{
+						AccountName: "mgmt",
+						Tags: []string{
+							"ou=mgmt",
+						},
+					},
+				},
+			},
+			wantAdded: []string{"ou=mgmt"},
+		},
+		{
+			description: "removing basic tag",
+			input: resource.OrganizationUnit{
+				Accounts: []*resource.Account{
+					{
+						AccountName: "mgmt",
+						AWSTags: []string{
+							"ou=mgmt",
+						},
+					},
+				},
+			},
+			wantRemoved: []string{"ou=mgmt"},
+		},
+		{
+			description: "no tag diff",
+			input: resource.OrganizationUnit{
+				Accounts: []*resource.Account{
+					{
+						AccountName: "mgmt",
+						Tags: []string{
+							"ou=mgmt",
+						},
+						AWSTags: []string{
+							"ou=mgmt",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tests {
+		added, removed := diffTags(tc.input.Accounts[0])
+		fmt.Println("added", added)
+		fmt.Println("removed", removed)
+		assert.Equal(t, tc.wantAdded, added, "added: "+tc.description)
+		assert.Equal(t, tc.wantRemoved, removed, "removed: "+tc.description)
+	}
+}