Fixes hashicorp#1624 - issues with consecutive whitespace.

Olve S. Hansen · Olve S. Hansen · commit 189c9f9123e2 · 2018-06-08T13:23:22.000+02:00
diff --git a/google/resource_iam_binding.go b/google/resource_iam_binding.go
@@ -119,7 +119,7 @@ func iamBindingImport(resourceIdParser resourceIdParserFunc) schema.StateFunc {
 			return nil, errors.New("Import not supported for this IAM resource.")
 		}
 		config := m.(*Config)
-		s := strings.Split(d.Id(), " ")
+		s := strings.Fields(d.Id())
 		if len(s) != 2 {
 			d.SetId("")
 			return nil, fmt.Errorf("Wrong number of parts to Binding id %s; expected 'resource_name role'.", s)
diff --git a/google/resource_iam_member.go b/google/resource_iam_member.go
@@ -33,7 +33,7 @@ func iamMemberImport(resourceIdParser resourceIdParserFunc) schema.StateFunc {
 			return nil, errors.New("Import not supported for this IAM resource.")
 		}
 		config := m.(*Config)
-		s := strings.Split(d.Id(), " ")
+		s := strings.Fields(d.Id())
 		if len(s) != 3 {
 			d.SetId("")
 			return nil, fmt.Errorf("Wrong number of parts to Member id %s; expected 'resource_name role username'.", s)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func iamBindingImport(resourceIdParser resourceIdParserFunc) schema.StateFunc {`
`119`	`119`	`return nil, errors.New("Import not supported for this IAM resource.")`
`120`	`120`	`}`
`121`	`121`	`config := m.(*Config)`
`122`		`- s := strings.Split(d.Id(), " ")`
	`122`	`+ s := strings.Fields(d.Id())`
`123`	`123`	`if len(s) != 2 {`
`124`	`124`	`d.SetId("")`
`125`	`125`	`return nil, fmt.Errorf("Wrong number of parts to Binding id %s; expected 'resource_name role'.", s)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func iamMemberImport(resourceIdParser resourceIdParserFunc) schema.StateFunc {`
`33`	`33`	`return nil, errors.New("Import not supported for this IAM resource.")`
`34`	`34`	`}`
`35`	`35`	`config := m.(*Config)`
`36`		`- s := strings.Split(d.Id(), " ")`
	`36`	`+ s := strings.Fields(d.Id())`
`37`	`37`	`if len(s) != 3 {`
`38`	`38`	`d.SetId("")`
`39`	`39`	`return nil, fmt.Errorf("Wrong number of parts to Member id %s; expected 'resource_name role username'.", s)`