@@ -24,7 +24,6 @@ func ResourceTencentCloudPrivateDnsRecord() *schema.Resource {
24
24
Importer : & schema.ResourceImporter {
25
25
State : schema .ImportStatePassthrough ,
26
26
},
27
-
28
27
Schema : map [string ]* schema.Schema {
29
28
"zone_id" : {
30
29
Type : schema .TypeString ,
@@ -35,12 +34,12 @@ func ResourceTencentCloudPrivateDnsRecord() *schema.Resource {
35
34
"record_type" : {
36
35
Type : schema .TypeString ,
37
36
Required : true ,
38
- Description : "Record type. Valid values: \" A \" , \" AAAA\" , \" CNAME\" , \" MX \" , \" TXT\" , \" PTR\" ." ,
37
+ Description : "Record type. Valid values: `A`, ` AAAA`, ` CNAME`, `MX`, ` TXT`, ` PTR` ." ,
39
38
},
40
39
"sub_domain" : {
41
40
Type : schema .TypeString ,
42
41
Required : true ,
43
- Description : "Subdomain, such as \" www\" , \" m \" , and \" @ \" ." ,
42
+ Description : "Subdomain, such as ` www`, `m` , and `@` ." ,
44
43
},
45
44
"record_value" : {
46
45
Type : schema .TypeString ,
@@ -252,7 +251,7 @@ func resourceTencentCloudDPrivateDnsRecordDelete(d *schema.ResourceData, meta in
252
251
253
252
var (
254
253
logId = tccommon .GetLogId (tccommon .ContextNil )
255
- request = privatedns .NewDescribePrivateZoneRequest ()
254
+ request = privatedns .NewDeletePrivateZoneRecordRequest ()
256
255
)
257
256
258
257
idSplit := strings .Split (d .Id (), tccommon .FILED_SP )
@@ -263,54 +262,10 @@ func resourceTencentCloudDPrivateDnsRecordDelete(d *schema.ResourceData, meta in
263
262
zoneId := idSplit [0 ]
264
263
recordId := idSplit [1 ]
265
264
266
- // unbind
267
- var response * privatedns.DescribePrivateZoneResponse
268
265
request .ZoneId = helper .String (zoneId )
269
- err := resource .Retry (tccommon .ReadRetryTimeout , func () * resource.RetryError {
270
- result , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UsePrivateDnsClient ().DescribePrivateZone (request )
271
- if e != nil {
272
- return tccommon .RetryError (e )
273
- }
274
-
275
- response = result
276
- return nil
277
- })
278
-
279
- if err != nil {
280
- log .Printf ("[CRITAL]%s read private dns failed, reason:%s\n " , logId , err .Error ())
281
- return err
282
- }
283
-
284
- info := response .Response .PrivateZone
285
- oldVpcSet := info .VpcSet
286
- oldAccVpcSet := info .AccountVpcSet
287
-
288
- unBindRequest := privatedns .NewModifyPrivateZoneVpcRequest ()
289
- unBindRequest .ZoneId = helper .String (zoneId )
290
- unBindRequest .VpcSet = []* privatedns.VpcInfo {}
291
- unBindRequest .AccountVpcSet = []* privatedns.AccountVpcInfo {}
292
-
293
- err = resource .Retry (tccommon .ReadRetryTimeout , func () * resource.RetryError {
294
- _ , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UsePrivateDnsClient ().ModifyPrivateZoneVpc (unBindRequest )
295
- if e != nil {
296
- return tccommon .RetryError (e )
297
- }
298
-
299
- return nil
300
- })
301
-
302
- if err != nil {
303
- log .Printf ("[CRITAL]%s unbind privateDns zone vpc failed, reason:%s\n " , logId , err .Error ())
304
- return err
305
- }
306
-
307
- // delete
308
- recordRequest := privatedns .NewDeletePrivateZoneRecordRequest ()
309
- recordRequest .ZoneId = helper .String (zoneId )
310
- recordRequest .RecordId = helper .String (recordId )
311
-
312
- err = resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
313
- _ , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UsePrivateDnsClient ().DeletePrivateZoneRecord (recordRequest )
266
+ request .RecordId = helper .String (recordId )
267
+ err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
268
+ _ , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UsePrivateDnsClient ().DeletePrivateZoneRecord (request )
314
269
if e != nil {
315
270
return tccommon .RetryError (e )
316
271
}
@@ -323,36 +278,5 @@ func resourceTencentCloudDPrivateDnsRecordDelete(d *schema.ResourceData, meta in
323
278
return err
324
279
}
325
280
326
- // rebind
327
- unBindRequest = privatedns .NewModifyPrivateZoneVpcRequest ()
328
- unBindRequest .ZoneId = helper .String (zoneId )
329
- unBindRequest .VpcSet = oldVpcSet
330
-
331
- accountVpcSet := make ([]* privatedns.AccountVpcInfo , 0 , len (oldAccVpcSet ))
332
- for _ , item := range oldAccVpcSet {
333
- info := privatedns.AccountVpcInfo {
334
- Uin : item .Uin ,
335
- UniqVpcId : item .UniqVpcId ,
336
- Region : item .Region ,
337
- }
338
- accountVpcSet = append (accountVpcSet , & info )
339
- }
340
-
341
- unBindRequest .AccountVpcSet = accountVpcSet
342
-
343
- err = resource .Retry (tccommon .ReadRetryTimeout , func () * resource.RetryError {
344
- _ , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UsePrivateDnsClient ().ModifyPrivateZoneVpc (unBindRequest )
345
- if e != nil {
346
- return tccommon .RetryError (e )
347
- }
348
-
349
- return nil
350
- })
351
-
352
- if err != nil {
353
- log .Printf ("[CRITAL]%s rebind privateDns zone vpc failed, reason:%s\n " , logId , err .Error ())
354
- return err
355
- }
356
-
357
281
return nil
358
282
}
0 commit comments