Skip to content

fix(private_dns): [123828318] tencentcloud_private_dns_record Optimize the creation logic #3344

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.

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 3 commits into from
May 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/3344.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_private_dns_record: Optimize the creation logic
```
39 changes: 36 additions & 3 deletions tencentcloud/services/privatedns/resource_tc_private_dns_record.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ func resourceTencentCloudDPrivateDnsRecordCreate(d *schema.ResourceData, meta in

var (
logId = tccommon.GetLogId(tccommon.ContextNil)
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
service = PrivateDnsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
request = privatedns.NewCreatePrivateZoneRecordRequest()
response = privatedns.NewCreatePrivateZoneRecordResponse()
zoneId string
Expand Down Expand Up @@ -114,8 +116,8 @@ func resourceTencentCloudDPrivateDnsRecordCreate(d *schema.ResourceData, meta in
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}

if result == nil {
e = fmt.Errorf("create PrivateDns record failed")
if result == nil || result.Response == nil || result.Response.RecordId == nil {
e = fmt.Errorf("create PrivateDns record failed, Response is nil.")
return resource.NonRetryableError(e)
}

Expand All @@ -129,6 +131,37 @@ func resourceTencentCloudDPrivateDnsRecordCreate(d *schema.ResourceData, meta in
}

recordId := *response.Response.RecordId

// wait
err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
records, e := service.DescribePrivateDnsRecordByFilter(ctx, zoneId, nil)
if e != nil {
return tccommon.RetryError(e)
}

if len(records) < 1 {
return resource.RetryableError(fmt.Errorf("[WARN]%s resource `PrivateDnsRecord` [%s] wait creating...\n", logId, zoneId))
}

var record *privatedns.PrivateZoneRecord
for _, item := range records {
if item.RecordId != nil && *item.RecordId == recordId {
record = item
}
}

if record != nil {
return nil
}

return resource.RetryableError(fmt.Errorf("[WARN]%s resource `PrivateDnsRecord` [%s] wait creating...\n", logId, recordId))
})

if err != nil {
log.Printf("[CRITAL]%s describe PrivateDns record failed, reason:%s\n", logId, err.Error())
return err
}

d.SetId(strings.Join([]string{zoneId, recordId}, tccommon.FILED_SP))

return resourceTencentCloudDPrivateDnsRecordRead(d, meta)
Expand Down Expand Up @@ -165,7 +198,7 @@ func resourceTencentCloudDPrivateDnsRecordRead(d *schema.ResourceData, meta inte

var record *privatedns.PrivateZoneRecord
for _, item := range records {
if *item.RecordId == recordId {
if item.RecordId != nil && *item.RecordId == recordId {
record = item
}
}
Expand Down
Loading