Merge pull request #68 from dctrwatson/instance-profiles-first

Delete instance-profile before roles
99designs · Dec 4, 2019 · 8469cff · 8469cff
2 parents d67de18 + 4940375
commit 8469cff
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/iamy/awsdiff.go b/iamy/awsdiff.go
@@ -94,6 +94,15 @@ type awsSyncCmdGenerator struct {
 func (a *awsSyncCmdGenerator) deleteOldEntities() {
 	iam := newIamClient(awsSession())
 
+	for _, fromInstanceProfile := range a.from.InstanceProfiles {
+		if found, _ := a.to.FindInstanceProfileByName(fromInstanceProfile.Name, fromInstanceProfile.Path); !found {
+			for _, roleName := range fromInstanceProfile.Roles {
+				a.cmds.Add("aws", "iam", "remove-role-from-instance-profile", "--instance-profile-name", fromInstanceProfile.Name, "--role-name", roleName)
+			}
+			a.cmds.Add("aws", "iam", "delete-instance-profile",
+				"--instance-profile-name", fromInstanceProfile.Name)
+		}
+	}
 	for _, fromRole := range a.from.Roles {
 		if found, _ := a.to.FindRoleByName(fromRole.Name, fromRole.Path); !found {
 			// detach managed policies
@@ -194,15 +203,6 @@ func (a *awsSyncCmdGenerator) deleteOldEntities() {
 				"--policy-arn", Arn(fromPolicy, a.to.Account))
 		}
 	}
-	for _, fromInstanceProfile := range a.from.InstanceProfiles {
-		if found, _ := a.to.FindInstanceProfileByName(fromInstanceProfile.Name, fromInstanceProfile.Path); !found {
-			for _, roleName := range fromInstanceProfile.Roles {
-				a.cmds.Add("aws", "iam", "remove-role-from-instance-profile", "--instance-profile-name", fromInstanceProfile.Name, "--role-name", roleName)
-			}
-			a.cmds.Add("aws", "iam", "delete-instance-profile",
-				"--instance-profile-name", fromInstanceProfile.Name)
-		}
-	}
 }
 
 func (a *awsSyncCmdGenerator) updatePolicies() {