public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Don't allow users to specify certain APIs in google_project_services (#2468)

Browse Source 
<!-- This change is generated by MagicModules. -->
/cc @rileykarson
This commit is contained in:
The Magician 2018-11-13 15:52:01 -08:00 committed by Nathan McKinley
parent 2c68f72586
commit ff16c8f4e0
3 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
google/resource_google_project_services.go
View File

@ -32,8 +32,11 @@ func resourceGoogleProjectServices() *schema.Resource {
"services": {
Type: schema.TypeSet,
Required: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: StringNotInSlice(ignoredProjectServices, false),
},
},
"disable_on_destroy": &schema.Schema{
Type: schema.TypeBool,
@ -44,13 +47,11 @@ func resourceGoogleProjectServices() *schema.Resource {
}
}
var ignoredProjectServices = []string{"dataproc-control.googleapis.com", "source.googleapis.com", "stackdriverprovisioning.googleapis.com"}
// These services can only be enabled as a side-effect of enabling other services,
// so don't bother storing them in the config or using them for diffing.
var ignoreProjectServices = map[string]struct{}{
"dataproc-control.googleapis.com": struct{}{},
"source.googleapis.com": struct{}{},
"stackdriverprovisioning.googleapis.com": struct{}{},
}
var ignoreProjectServices = golangSetFromStringSlice(ignoredProjectServices)
func resourceGoogleProjectServicesCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)

9
google/utils.go
View File

@ -341,6 +341,15 @@ func convertStringSet(set *schema.Set) []string {
return s
}
func golangSetFromStringSlice(strings []string) map[string]struct{} {
set := map[string]struct{}{}
for _, v := range strings {
set[v] = struct{}{}
}
return set
}
func mergeSchemas(a, b map[string]*schema.Schema) map[string]*schema.Schema {
merged := make(map[string]*schema.Schema)

22
google/validation.go
View File

@ -186,3 +186,25 @@ func validateProjectName() schema.SchemaValidateFunc {
return
}
}
// StringNotInSlice returns a SchemaValidateFunc which tests if the provided value
// is of type string and that it matches none of the element in the invalid slice.
// if ignorecase is true, case is ignored.
func StringNotInSlice(invalid []string, ignoreCase bool) schema.SchemaValidateFunc {
return func(i interface{}, k string) (s []string, es []error) {
v, ok := i.(string)
if !ok {
es = append(es, fmt.Errorf("expected type of %s to be string", k))
return
}
for _, str := range invalid {
if v == str || (ignoreCase && strings.ToLower(v) == strings.ToLower(str)) {
es = append(es, fmt.Errorf("expected %s to not match any of %v, got %s", k, invalid, v))
return
}
}
return
}
}