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

project field for google_project_services can use the default provider project (#1553)

Browse Source
This commit is contained in:
Vincent Roseberry 2018-05-29 14:26:58 -07:00 committed by GitHub
parent 61dcc56282
commit 8bb494520f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
google/resource_google_project_services.go
View File

@ -23,8 +23,9 @@ func resourceGoogleProjectServices() *schema.Resource {
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"project": &schema.Schema{ "project": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Optional: true,
ForceNew: true, ForceNew: true,
Computed: true,
}, },
"services": { "services": {
Type: schema.TypeSet, Type: schema.TypeSet,
@ -51,7 +52,11 @@ var ignoreProjectServices = map[string]struct{}{
func resourceGoogleProjectServicesCreate(d *schema.ResourceData, meta interface{}) error { func resourceGoogleProjectServicesCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config) config := meta.(*Config)
pid := d.Get("project").(string)
pid, err := getProject(d, config)
if err != nil {
return err
}
// Get services from config // Get services from config
cfgServices := getConfigServices(d) cfgServices := getConfigServices(d)
@ -89,20 +94,19 @@ func resourceGoogleProjectServicesRead(d *schema.ResourceData, meta interface{})
func resourceGoogleProjectServicesUpdate(d *schema.ResourceData, meta interface{}) error { func resourceGoogleProjectServicesUpdate(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG]: Updating google_project_services") log.Printf("[DEBUG]: Updating google_project_services")
config := meta.(*Config) config := meta.(*Config)
pid := d.Get("project").(string)
// Get services from config // Get services from config
cfgServices := getConfigServices(d) cfgServices := getConfigServices(d)
// Get services from API // Get services from API
apiServices, err := getApiServices(pid, config, ignoreProjectServices) apiServices, err := getApiServices(d.Id(), config, ignoreProjectServices)
if err != nil { if err != nil {
return fmt.Errorf("Error updating services: %v", err) return fmt.Errorf("Error updating services: %v", err)
} }
// This call disables any APIs that aren't defined in cfgServices, // This call disables any APIs that aren't defined in cfgServices,
// and enables all of those that are // and enables all of those that are
err = reconcileServices(cfgServices, apiServices, config, pid) err = reconcileServices(cfgServices, apiServices, config, d.Id())
if err != nil { if err != nil {
return fmt.Errorf("Error updating services: %v", err) return fmt.Errorf("Error updating services: %v", err)
} }