don't send the condition unless it's set

GoogleCloudPlatform · Oct 25, 2019 · d5e5d40 · d5e5d40
1 parent 0c0a13b
commit d5e5d40
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/third_party/terraform/resources/resource_iam_binding.go.erb b/third_party/terraform/resources/resource_iam_binding.go.erb
@@ -277,13 +277,16 @@ func resourceIamBindingDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBa
 
 func getResourceIamBinding(d *schema.ResourceData) *cloudresourcemanager.Binding {
 	members := d.Get("members").(*schema.Set).List()
-	return &cloudresourcemanager.Binding{
+	b := &cloudresourcemanager.Binding{
 		Members:   convertStringArr(members),
 		Role:      d.Get("role").(string),
+	}
 <% unless version == 'ga' -%>
-		Condition: expandIamCondition(d.Get("condition")),
-<% end -%>
+	if c := expandIamCondition(d.Get("condition")); c != nil {
+		b.Condition = c
 	}
+<% end -%>
+	return b
 }
 
 <% unless version == 'ga' -%>

diff --git a/third_party/terraform/resources/resource_iam_member.go.erb b/third_party/terraform/resources/resource_iam_member.go.erb
@@ -159,13 +159,16 @@ func ResourceIamMemberWithBatching(parentSpecificSchema map[string]*schema.Schem
 }
 
 func getResourceIamMember(d *schema.ResourceData) *cloudresourcemanager.Binding {
-	return &cloudresourcemanager.Binding{
+	b := &cloudresourcemanager.Binding{
 		Members:   []string{d.Get("member").(string)},
 		Role:      d.Get("role").(string),
+	}
 <% unless version == 'ga' -%>
-		Condition: expandIamCondition(d.Get("condition")),
-<% end -%>
+	if c := expandIamCondition(d.Get("condition")); c != nil {
+		b.Condition = c
 	}
+<% end -%>
+	return b
 }
 
 func resourceIamMemberCreate(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.CreateFunc {

diff --git a/third_party/terraform/utils/iam.go.erb b/third_party/terraform/utils/iam.go.erb
@@ -259,17 +259,20 @@ func listFromIamBindingMap(bm map[iamBindingKey]map[string]struct{}) []*cloudres
 		if len(members) == 0 {
 			continue
 		}
-		rb = append(rb, &cloudresourcemanager.Binding{
+		b := &cloudresourcemanager.Binding{
 			Role:    key.Role,
 			Members: stringSliceFromGolangSet(members),
+		}
 <% unless version == 'ga' -%>
-			Condition: &cloudresourcemanager.Expr{
+		if !key.Condition.Empty() {
+			b.Condition = &cloudresourcemanager.Expr{
 				Description: key.Condition.Description,
 				Expression:  key.Condition.Expression,
 				Title:       key.Condition.Title,
-			},
+			}
+		}
 <% end -%>
-		})
+		rb = append(rb, b)
 	}
 	return rb
 }