Skip to content

Commit 438ca71

Browse files
wiktornNA2047
authored andcommitted
Add information about failing member into the error message (GoogleCloudPlatform#13146)
1 parent aaea3e0 commit 438ca71

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func TestAccProjectIamBinding_invalidMembers(t *testing.T) {
267267
Steps: []resource.TestStep{
268268
{
269269
Config: testAccProjectAssociateBindingBasic(pid, org, role, "[email protected]"),
270-
ExpectError: regexp.MustCompile("invalid value for members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"),
270+
ExpectError: regexp.MustCompile("invalid value \"[email protected]\" for members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"),
271271
},
272272
{
273273
Config: testAccProjectAssociateBindingBasic(pid, org, role, "user:[email protected]"),

mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func TestAccProjectIamMember_invalidMembers(t *testing.T) {
183183
Steps: []resource.TestStep{
184184
{
185185
Config: testAccProjectAssociateMemberBasic(pid, org, role, "[email protected]"),
186-
ExpectError: regexp.MustCompile("invalid value for member \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"),
186+
ExpectError: regexp.MustCompile("invalid value \"[email protected]\" for member \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"),
187187
},
188188
{
189189
Config: testAccProjectAssociateMemberBasic(pid, org, role, "user:[email protected]"),

mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func TestAccProjectIamPolicy_invalidMembers(t *testing.T) {
177177
Steps: []resource.TestStep{
178178
{
179179
Config: testAccProjectAssociatePolicyBasic(pid, org, "[email protected]"),
180-
ExpectError: regexp.MustCompile("invalid value for bindings\\.1\\.members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"),
180+
ExpectError: regexp.MustCompile("invalid value \"[email protected]\" for bindings\\.1\\.members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"),
181181
},
182182
{
183183
Config: testAccProjectAssociatePolicyBasic(pid, org, "user:[email protected]"),

mmv1/third_party/terraform/tpgiamresource/resource_iam_member.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func validateIAMMember(i interface{}, k string) ([]string, []error) {
3838
if matched, err := regexp.MatchString("(.+:.+|projectOwners|projectReaders|projectWriters|allUsers|allAuthenticatedUsers)", v); err != nil {
3939
return nil, []error{fmt.Errorf("error validating %s: %v", k, err)}
4040
} else if !matched {
41-
return nil, []error{fmt.Errorf("invalid value for %s (IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding)", k)}
41+
return nil, []error{fmt.Errorf("invalid value \"%s\" for %s (IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding)", v, k)}
4242
}
4343
return nil, nil
4444
}

0 commit comments

Comments
 (0)