Merge pull request #54 from envato/allow-user-tags

Allow user tags

iamy/aws.go

@@ -218,10 +218,13 @@ func (a *AwsFetcher) populateIamData(resp *iam.GetAccountAuthorizationDetailsOut
 			continue
 		}
 
-		user := User{iamService: iamService{
-			Name: *userResp.UserName,
-			Path: *userResp.Path,
-		}}
+		user := User{
+			iamService: iamService{
+				Name: *userResp.UserName,
+				Path: *userResp.Path,
+			},
+			Tags: make(map[string]string),
+		}
 
 		for _, g := range userResp.GroupList {
 			user.Groups = append(user.Groups, *g)
@@ -232,6 +235,9 @@ func (a *AwsFetcher) populateIamData(resp *iam.GetAccountAuthorizationDetailsOut
 		if err := a.populateInlinePolicies(userResp.UserPolicyList, &user.InlinePolicies); err != nil {
 			return err
 		}
+		for _, t := range userResp.Tags {
+			user.Tags[*t.Key] = *t.Value
+		}
 
 		a.data.Users = append(a.data.Users, &user)
 	}

iamy/awsdiff.go

@@ -78,6 +78,14 @@ func path(v string) string {
 	return v
 }
 
+func mapTagsToString(tags map[string]string) string {
+	var result []string
+	for k, v := range tags {
+		result = append(result, "Key="+k+",Value="+v)
+	}
+	return strings.Join(result, ",")
+}
+
 type awsSyncCmdGenerator struct {
 	from, to *AccountData
 	cmds     CmdList
@@ -397,9 +405,19 @@ func (a *awsSyncCmdGenerator) updateUsers() {
 				a.cmds.Add("aws", "iam", "attach-user-policy", "--user-name", toUser.Name, "--policy-arn", a.to.Account.policyArnFromString(p))
 			}
 
+			// remove old tags
+			for tagKey, _ := range mapStringSetDifference(fromUser.Tags, toUser.Tags) {
+				a.cmds.Add("aws", "iam", "untag-user", "--user-name", toUser.Name, "--tag-keys", tagKey)
+			}
+
+			// attach new tags
+			for tagKey, tagValue := range mapStringSetDifference(toUser.Tags, fromUser.Tags) {
+				a.cmds.Add("aws", "iam", "tag-user", "--user-name", toUser.Name, "--tags", "Key="+tagKey+",Value="+tagValue)
+			}
+
 		} else {
 			// Create user
-			a.cmds.Add("aws", "iam", "create-user", "--user-name", toUser.Name, "--path", path(toUser.Path))
+			a.cmds.Add("aws", "iam", "create-user", "--user-name", toUser.Name, "--path", path(toUser.Path), "--tags", mapTagsToString(toUser.Tags))
 
 			// add new groups
 			for _, g := range toUser.Groups {

iamy/map.go

@@ -0,0 +1,11 @@
+package iamy
+
+func mapStringSetDifference(aa, bb map[string]string) map[string]string {
+	rr := make(map[string]string)
+	for k, v := range aa {
+		if bb[k] != v {
+			rr[k] = v
+		}
+	}
+	return rr
+}

iamy/models.go

@@ -68,9 +68,10 @@ func (s iamService) ResourcePath() string {
 
 type User struct {
 	iamService     `json:"-"`
-	Groups         []string       `json:"Groups,omitempty"`
-	InlinePolicies []InlinePolicy `json:"InlinePolicies,omitempty"`
-	Policies       []string       `json:"Policies,omitempty"`
+	Groups         []string          `json:"Groups,omitempty"`
+	InlinePolicies []InlinePolicy    `json:"InlinePolicies,omitempty"`
+	Policies       []string          `json:"Policies,omitempty"`
+	Tags           map[string]string `json:"Tags,omitempty"`
 }
 
 func (u User) ResourceType() string {

iamy/yaml.go

@@ -91,7 +91,10 @@ func (a *YamlLoadDumper) Load() ([]AccountData, error) {
 
 			switch entity {
 			case "iam/user":
-				u := User{iamService: nameAndPath}
+				u := User{
+					iamService: nameAndPath,
+					Tags:       make(map[string]string),
+				}
 				err = a.unmarshalYamlFile(fp, &u)
 				accounts[accountid].addUser(&u)
 			case "iam/group":