public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-05 17:52:38 +00:00
Code Issues Projects Releases Wiki Activity

make setFields a list of regexps (#696)

Browse Source
This commit is contained in:
Dana Hoffman 2017-11-07 11:27:05 -08:00 committed by GitHub
parent 205b093701
commit 7f9f7201a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
google/resource_container_cluster_test.go
View File

@ -595,10 +595,10 @@ func testAccCheckContainerClusterDestroy(s *terraform.State) error {
return nil
}
var setFields map[string]struct{} = map[string]struct{}{
"additional_zones": struct{}{},
"node_config.0.oauth_scopes": struct{}{},
"node_pool.0.node_config.0.oauth_scopes": struct{}{},
var setFields = []string{
"additional_zones",
"node_config.0.oauth_scopes",
"node_pool.[0-9]*.node_config.0.oauth_scopes",
}
func testAccCheckContainerCluster(n string) resource.TestCheckFunc {
@ -756,8 +756,10 @@ func getResourceAttributes(n string, s *terraform.State) (map[string]string, err
func checkMatch(attributes map[string]string, attr string, gcp interface{}) string {
if gcpList, ok := gcp.([]string); ok {
if _, ok := setFields[attr]; ok {
return checkSetMatch(attributes, attr, gcpList)
for _, setField := range setFields {
if match, _ := regexp.MatchString(setField, attr); match {
return checkSetMatch(attributes, attr, gcpList)
}
}
return checkListMatch(attributes, attr, gcpList)
}