Skip to content

Fix google_dns_record_set with same name throw an error #11622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 9, 2024
Merged

Fix google_dns_record_set with same name throw an error #11622

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88a3685
Code preventing error removed
Samir-Cit Sep 3, 2024
1b68197
Use mutex lock on resource
Samir-Cit Sep 6, 2024
afdbaa2
Merge remote-tracking branch 'origin' into bug/dns-record-set
Samir-Cit Sep 9, 2024
68792e2
Add name and rType on delete function
Samir-Cit Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions mmv1/third_party/terraform/services/dns/resource_dns_record_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,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 {
Expand Down Expand Up @@ -468,7 +476,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,
Expand Down Expand Up @@ -511,6 +521,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 {
Expand Down
Loading