From a9b9724d0781f8022d07cff4ba441162805c4022 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 10 Oct 2022 14:22:10 -0700 Subject: [PATCH] Revert filestore instance mutex lock (#6672) (#12753) Signed-off-by: Modular Magician Signed-off-by: Modular Magician --- .changelog/6672.txt | 3 +++ google/resource_filestore_instance.go | 21 --------------------- 2 files changed, 3 insertions(+), 21 deletions(-) create mode 100644 .changelog/6672.txt diff --git a/.changelog/6672.txt b/.changelog/6672.txt new file mode 100644 index 00000000000..2a6f4531717 --- /dev/null +++ b/.changelog/6672.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +filestore: removed constraint that forced multiple `google_filestore_instance` creations to occur serially +``` diff --git a/google/resource_filestore_instance.go b/google/resource_filestore_instance.go index ca01735984b..3aded692c7a 100644 --- a/google/resource_filestore_instance.go +++ b/google/resource_filestore_instance.go @@ -296,13 +296,6 @@ func resourceFilestoreInstanceCreate(d *schema.ResourceData, meta interface{}) e obj["kmsKeyName"] = kmsKeyNameProp } - lockName, err := replaceVars(d, config, "filestore/{{project}}") - if err != nil { - return err - } - mutexKV.Lock(lockName) - defer mutexKV.Unlock(lockName) - url, err := replaceVars(d, config, "{{FilestoreBasePath}}projects/{{project}}/locations/{{location}}/instances?instanceId={{name}}") if err != nil { return err @@ -473,13 +466,6 @@ func resourceFilestoreInstanceUpdate(d *schema.ResourceData, meta interface{}) e obj["fileShares"] = fileSharesProp } - lockName, err := replaceVars(d, config, "filestore/{{project}}") - if err != nil { - return err - } - mutexKV.Lock(lockName) - defer mutexKV.Unlock(lockName) - url, err := replaceVars(d, config, "{{FilestoreBasePath}}projects/{{project}}/locations/{{location}}/instances/{{name}}") if err != nil { return err @@ -545,13 +531,6 @@ func resourceFilestoreInstanceDelete(d *schema.ResourceData, meta interface{}) e } billingProject = project - lockName, err := replaceVars(d, config, "filestore/{{project}}") - if err != nil { - return err - } - mutexKV.Lock(lockName) - defer mutexKV.Unlock(lockName) - url, err := replaceVars(d, config, "{{FilestoreBasePath}}projects/{{project}}/locations/{{location}}/instances/{{name}}") if err != nil { return err