Merge pull request #202 from synfinatic/via-tag

Via role option is now a tag

Author: synfinatic

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+### New Features
+ * The `Via` role option is now a searchable tag #199
+ * The `tags` command now returns the keys in sorted order
+
+### Bug Fixes
+ * Consistently pad AccountID with zeros whenever necessary
+
 ## [1.6.0] - 2021-12-24
 
 ### Breaking Changes
@@ -13,7 +20,7 @@
  * Add support for role chaining using `Via` tag #38
  * Cache file is now versioned for better compatibility across versions of `aws-sso` #195
 
-### Bugs Fixes 
+### Bug Fixes 
  * Incorrect `--level` value now correctly tells user the correct name of the flag
  * `exec` command now uses `cmd.exe` when no command is specified
 

cmd/exec_cmd.go

@@ -24,7 +24,6 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	"strconv"
 	"strings"
 	"text/template"
 
@@ -124,7 +123,8 @@ func firstItem(items []string) string {
 }
 
 func accountIdToStr(id int64) string {
-	return strconv.FormatInt(id, 10)
+	i, _ := utils.AccountIdToString(id)
+	return i
 }
 
 // Executes Cmd+Args in the context of the AWS Role creds

cmd/tags_cmd.go

@@ -20,6 +20,7 @@ package main
 
 import (
 	"fmt"
+	"sort"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/synfinatic/aws-sso-cli/sso"
@@ -57,6 +58,10 @@ func (cc *TagsCmd) Run(ctx *RunContext) error {
 
 		if err := set.Cache.Expired(s); err != nil {
 			log.Warn(err.Error())
+			c := &CacheCmd{}
+			if err = c.Run(ctx); err != nil {
+				return err
+			}
 		}
 	}
 	roles := []*sso.AWSRoleFlat{}
@@ -84,8 +89,13 @@ func (cc *TagsCmd) Run(ctx *RunContext) error {
 
 	for _, fRole := range roles {
 		fmt.Printf("%s\n", fRole.Arn)
-		for k, v := range fRole.Tags {
-			fmt.Printf("  %s: %s\n", k, v)
+		keys := make([]string, 0, len(fRole.Tags))
+		for k := range fRole.Tags {
+			keys = append(keys, k)
+		}
+		sort.Strings(keys)
+		for _, k := range keys {
+			fmt.Printf("  %s: %s\n", k, fRole.Tags[k])
 		}
 		fmt.Printf("\n")
 	}

sso/cache.go

@@ -279,7 +279,7 @@ type AWSRoleFlat struct {
 	SSORegion     string            `json:"SSORegion" header:"SSORegion"`
 	StartUrl      string            `json:"StartUrl" header:"StartUrl"`
 	Tags          map[string]string `json:"Tags"` // not supported by GenerateTable
-	Via           string            `json:"Via" header:"Via"`
+	Via           string            `json:"Via,omitempty" header:"Via"`
 	// SelectTags    map[string]string // tags without spaces
 }
 
@@ -305,7 +305,7 @@ func (c *Cache) NewRoles(as *AWSSSO, config *SSOConfig) (*Roles, error) {
 	for _, aInfo := range accounts {
 		accountId := aInfo.GetAccountId64()
 		r.Accounts[accountId] = &AWSAccount{
-			Alias:        aInfo.AccountName,
+			Alias:        aInfo.AccountName, // AWS SSO calls it `AccountName`
 			EmailAddress: aInfo.EmailAddress,
 			Tags:         map[string]string{},
 			Roles:        map[string]*AWSRole{},
@@ -320,7 +320,7 @@ func (c *Cache) NewRoles(as *AWSSSO, config *SSOConfig) (*Roles, error) {
 				Arn: utils.MakeRoleARN(accountId, role.RoleName),
 				Tags: map[string]string{
 					"AccountID":    aInfo.AccountId,
-					"AccountAlias": aInfo.AccountName,
+					"AccountAlias": aInfo.AccountName, // AWS SSO calls it `AccountName`
 					"Email":        aInfo.EmailAddress,
 					"Role":         role.RoleName,
 				},
@@ -358,7 +358,7 @@ func (c *Cache) NewRoles(as *AWSSSO, config *SSOConfig) (*Roles, error) {
 
 		// set the AWS SSO tags for all the SSO roles
 		for roleName := range r.Accounts[accountId].Roles {
-			aId := strconv.FormatInt(accountId, 10)
+			aId, _ := utils.AccountIdToString(accountId)
 			r.Accounts[accountId].Roles[roleName].Tags["AccountID"] = aId
 			r.Accounts[accountId].Roles[roleName].Tags["AccountName"] = r.Accounts[accountId].Name
 			r.Accounts[accountId].Roles[roleName].Tags["AccountAlias"] = r.Accounts[accountId].Alias
@@ -378,8 +378,8 @@ func (c *Cache) NewRoles(as *AWSSSO, config *SSOConfig) (*Roles, error) {
 			}
 			r.Accounts[accountId].Roles[roleName].Arn = utils.MakeRoleARN(accountId, roleName)
 			r.Accounts[accountId].Roles[roleName].Profile = role.Profile
-			r.Accounts[accountId].Roles[roleName].Via = role.Via
 			r.Accounts[accountId].Roles[roleName].DefaultRegion = r.Accounts[accountId].DefaultRegion
+			r.Accounts[accountId].Roles[roleName].Via = role.Via
 			if role.DefaultRegion != "" {
 				r.Accounts[accountId].Roles[roleName].DefaultRegion = role.DefaultRegion
 			}
@@ -528,11 +528,14 @@ func (r *Roles) GetRole(accountId int64, roleName string) (*AWSRoleFlat, error)
 				flat.DefaultRegion = role.DefaultRegion
 			}
 			// Automatic tags
-			flat.Tags["AccountID"] = strconv.FormatInt(accountId, 10)
+			flat.Tags["AccountID"], _ = utils.AccountIdToString(accountId)
 			flat.Tags["Email"] = account.EmailAddress
 			if role.Profile != "" {
 				flat.Tags["Profile"] = role.Profile
 			}
+			if role.Via != "" {
+				flat.Tags["Via"] = role.Via
+			}
 
 			// Account name is by default the alias, but can be manually overridden
 			flat.Tags["AccountName"] = flat.AccountAlias

sso/settings.go

@@ -24,7 +24,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	// "github.com/davecgh/go-spew/spew"
@@ -403,7 +402,7 @@ func (a *SSOAccount) GetAllTags(id int64) map[string]string {
 		"AccountName": accountName,
 	}
 	if id > 0 {
-		accountId := strconv.FormatInt(id, 10)
+		accountId, _ := utils.AccountIdToString(id)
 		tags["AccountId"] = accountId
 	}
 	if a.DefaultRegion != "" {