mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-04 17:51:11 +00:00
project field for google_project_services can use the default provider project (#1553)
This commit is contained in:
parent
61dcc56282
commit
8bb494520f
@ -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)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user