Replace Pulumi "role" fix with one from upstream

aws/resource_aws_iam_instance_profile.go

@@ -210,23 +210,19 @@ func instanceProfileSetRoles(d *schema.ResourceData, iamconn *iam.IAM) error {
 }
 
 func instanceProfileRemoveAllRoles(d *schema.ResourceData, iamconn *iam.IAM) error {
-	removedSingleRole := ""
-	if role, ok := d.GetOk("role"); ok {
+	role, hasRole := d.GetOk("role")
+	roles, hasRoles := d.GetOk("roles")
+	if hasRole && !hasRoles { // "roles" will always be a superset of "role", if set
 		err := instanceProfileRemoveRole(iamconn, d.Id(), role.(string))
 		if err != nil {
 			return fmt.Errorf("Error removing role %s from IAM instance profile %s: %s", role, d.Id(), err)
 		}
-		removedSingleRole = role.(string)
-	}
-
-	for _, role := range d.Get("roles").(*schema.Set).List() {
-		if role.(string) == removedSingleRole {
-			continue
-		}
-
-		err := instanceProfileRemoveRole(iamconn, d.Id(), role.(string))
-		if err != nil {
-			return fmt.Errorf("Error removing role %s from IAM instance profile %s: %s", role, d.Id(), err)
+	} else {
+		for _, role := range roles.(*schema.Set).List() {
+			err := instanceProfileRemoveRole(iamconn, d.Id(), role.(string))
+			if err != nil {
+				return fmt.Errorf("Error removing role %s from IAM instance profile %s: %s", role, d.Id(), err)
+			}
 		}
 	}
 	return nil