diff --git a/google/access_context_manager_operation.go b/google/access_context_manager_operation.go deleted file mode 100644 index 93cfad7a..00000000 --- a/google/access_context_manager_operation.go +++ /dev/null @@ -1,3 +0,0 @@ -package google - -// Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now. diff --git a/google/resource_google_folder.go b/google/resource_google_folder.go index 1fbb7e2c..5a385140 100644 --- a/google/resource_google_folder.go +++ b/google/resource_google_folder.go @@ -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) } diff --git a/google/resource_google_project.go b/google/resource_google_project.go index dfa27ce6..c977cd35 100644 --- a/google/resource_google_project.go +++ b/google/resource_google_project.go @@ -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("") diff --git a/google/resource_manager_operation.go b/google/resource_manager_operation.go index e140278b..6735cb19 100644 --- a/google/resource_manager_operation.go +++ b/google/resource_manager_operation.go @@ -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