Unbreak IAM. (#2180)

Merged PR #2180.
GoogleCloudPlatform · Aug 14, 2019 · bba002a · bba002a
1 parent ad8a5af
commit bba002a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/utils/iam.go b/third_party/terraform/utils/iam.go
@@ -199,8 +199,18 @@ func createIamBindingsMap(bindings []*cloudresourcemanager.Binding) map[string]m
 		}
 		// Get each member (user/principal) for the binding
 		for _, m := range b.Members {
+			// members are in <type>:<value> format
+			// <type> is case sensitive
+			// <value> isn't
+			// so let's lowercase the value and leave the type alone
+			pieces := strings.SplitN(m, ":", 2)
+			if len(pieces) > 1 {
+				pieces[1] = strings.ToLower(pieces[1])
+			}
+			m = strings.Join(pieces, ":")
+
 			// Add the member
-			bm[b.Role][strings.ToLower(m)] = struct{}{}
+			bm[b.Role][m] = struct{}{}
 		}
 	}
 	return bm