Fix google_dns_record_set with same name throw an error (#11622) (has…

…hicorp#8139) [upstream:fae1485a6883c2703183372f2eda1ad0316f9d94] Signed-off-by: Modular Magician <[email protected]>
askubis · Sep 9, 2024 · f7841e1 · f7841e1
1 parent 420a015
commit f7841e1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/.changelog/11622.txt b/.changelog/11622.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+dns: added a mutex to `google_dns_record_set` to prevent conflicts when multiple resources attempt to operate on the same record set
+```
diff --git a/google-beta/services/dns/resource_dns_record_set.go b/google-beta/services/dns/resource_dns_record_set.go
@@ -377,6 +377,14 @@ func resourceDnsRecordSetCreate(d *schema.ResourceData, meta interface{}) error
 		chg.Deletions = deletions
 	}
 
+	// Mutex
+	lockName := fmt.Sprintf("projects/%s/managedZones/%s/rrsets/%s/%s", project, zone, name, rType)
+	if err != nil {
+		return err
+	}
+	transport_tpg.MutexStore.Lock(lockName)
+	defer transport_tpg.MutexStore.Unlock(lockName)
+
 	log.Printf("[DEBUG] DNS Record create request: %#v", chg)
 	chg, err = config.NewDnsClient(userAgent).Changes.Create(project, zone, chg).Do()
 	if err != nil {
@@ -470,7 +478,9 @@ func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error
 		return err
 	}
 
+	name := d.Get("name").(string)
 	zone := d.Get("managed_zone").(string)
+	rType := d.Get("type").(string)
 
 	// NS and SOA records on the root zone must always have a value,
 	// so we short-circuit delete this allows terraform delete to work,
@@ -513,6 +523,14 @@ func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error
 		},
 	}
 
+	// Mutex
+	lockName := fmt.Sprintf("projects/%s/managedZones/%s/rrsets/%s/%s", project, zone, name, rType)
+	if err != nil {
+		return err
+	}
+	transport_tpg.MutexStore.Lock(lockName)
+	defer transport_tpg.MutexStore.Unlock(lockName)
+
 	log.Printf("[DEBUG] DNS Record delete request: %#v", chg)
 	chg, err = config.NewDnsClient(userAgent).Changes.Create(project, zone, chg).Do()
 	if err != nil {