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

Terraform - AccessContextManager autogenerated operations (#3338)

Browse Source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2019-03-28 15:47:57 -07:00 committed by Riley Karson
parent 12a25f053b
commit e12b5c2a04
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
google/access_context_manager_operation.go
View File

@ -1,3 +0,0 @@
package google
// Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now.

4
google/resource_google_folder.go
View File

@ -68,7 +68,7 @@ func resourceGoogleFolderCreate(d *schema.ResourceData, meta interface{}) error
return err
}
err = resourceManagerOperationWaitTime(config, opAsMap, "", "creating folder", int(d.Timeout(schema.TimeoutCreate).Minutes()))
err = resourceManagerOperationWaitTime(config, opAsMap, "creating folder", int(d.Timeout(schema.TimeoutCreate).Minutes()))
if err != nil {
return fmt.Errorf("Error creating folder '%s' in '%s': %s", displayName, parent, err)
}
@ -141,7 +141,7 @@ func resourceGoogleFolderUpdate(d *schema.ResourceData, meta interface{}) error
return err
}
err = resourceManagerOperationWaitTime(config, opAsMap, "", "move folder", int(d.Timeout(schema.TimeoutCreate).Minutes()))
err = resourceManagerOperationWaitTime(config, opAsMap, "move folder", int(d.Timeout(schema.TimeoutCreate).Minutes()))
if err != nil {
return fmt.Errorf("Error moving folder '%s' to '%s': %s", displayName, newParent, err)
}

2
google/resource_google_project.go
View File

@ -232,7 +232,7 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error
return err
}
waitErr := resourceManagerOperationWaitTime(config, opAsMap, "", "creating folder", int(d.Timeout(schema.TimeoutCreate).Minutes()))
waitErr := resourceManagerOperationWaitTime(config, opAsMap, "creating folder", int(d.Timeout(schema.TimeoutCreate).Minutes()))
if waitErr != nil {
// The resource wasn't actually created
d.SetId("")

2
google/resource_manager_operation.go
View File

@ -31,7 +31,7 @@ func (w *ResourceManagerOperationWaiter) QueryOp() (interface{}, error) {
return sendRequest(w.Config, "GET", url, nil)
}
func resourceManagerOperationWaitTime(config *Config, op map[string]interface{}, project, activity string, timeoutMinutes int) error {
func resourceManagerOperationWaitTime(config *Config, op map[string]interface{}, activity string, timeoutMinutes int) error {
if val, ok := op["name"]; !ok || val == "" {
// This was a synchronous call - there is no operation to wait for.
return nil