Skip to content

Commit c3b5283

Browse files
gitmkngitmkn
committed
Merge branch 'master' into feat/eo-l7-acc-setting
2 parents 57a9ddb + 899a8d1 commit c3b5283

File tree

92 files changed

+2736
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2736
-225
lines changed

‎.changelog/3149.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_teo_l4_proxy_rule
3+
```

‎.changelog/3160.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_redis_instance: Optimize the change issue of the `replica_zone_ids` field in a single availability zone.
3+
```

‎.changelog/3166.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_waf_custom_white_rule: update doc
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_waf_custom_rule: update doc
7+
```

‎.changelog/3167.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_postgresql_instance: Support window period switching.
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_postgresql_readonly_instance: Support window period switching.
7+
```

‎.changelog/3171.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_dasb_asset_sync_job_operation
3+
```

‎.changelog/3172.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_mysql_readonly_instance: modify doc.
3+
```

‎.changelog/3173.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_tse_cngw_service: modify field properties
3+
```

‎.changelog/3174.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_accept_join_share_unit_invitation_operation: optimize unique ID
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_reject_join_share_unit_invitation_operation: optimize unique ID
7+
```

‎.changelog/3175.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_vpc_ipv6_eni_address: Offline this document
3+
```

‎.changelog/3176.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_cfs_auto_snapshot_policy: update doc
3+
```

‎.changelog/3177.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_cos_bucket: optimize `acl_body` verification logic
3+
```

‎.changelog/3178.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_dc_gateway_ccn_routes: add new params
3+
```

‎.changelog/3179.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_dc_internet_address_config: update doc
3+
```

‎.changelog/3180.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_dc_share_dcx_config: update doc
3+
```

‎.changelog/3181.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_cynosdb_backup_config
3+
```

‎.changelog/3182.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_scf_function: update doc
3+
```

‎.changelog/3183.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_postgresql_instance_ssl_config
3+
```

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1078
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1108
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1111
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1053
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
52-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058
52+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111
5353
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
5454
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.652
5555
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.633

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1107 h1:q6G
934934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1107/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1108 h1:yuRONtPue3RtEpCmMlM1HN2PPaoK9X89IE4qHA/Z0FA=
936936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1108/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1111 h1:f0RqQwdrXvT2behkBRo845d/x+soUU70Pm80DliiJk8=
938+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1111/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
938940
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
939941
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -944,6 +946,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69S
944946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762/go.mod h1:1XylIfNUbAzmNqi4XMhwcM3VhmUHdu1OYybOeaJ4sOw=
945947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058 h1:qgni/qIuUYkc5THMbtyGNSNleoac5ffMeM5TErJ9bnA=
946948
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058/go.mod h1:HqoJMWKikraStfU3fj5HRK8linrtr4mfWF03GbOj2j8=
949+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111 h1:Y7LLIZEQh8OAbnBWppUopu2PjPaQOO9Jzhp8LZO7adI=
950+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111/go.mod h1:hx4A0g62E4hq6vB0t9e/4vlUArok9R2qOYW5IzDiPYo=
947951
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970 h1:qVIRHgG1twsqF4aVN/x2T2yMRfPpsZBTNefDkqzM06M=
948952
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970/go.mod h1:NJuuQD4z6vcnsZnC7Tvz2U9hElNS1wroc34UQbZvP2U=
949953
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 h1:D8qrelkK5udv8RzJJIABMzItGIyaZoYnxEVeIsYqiNw=
@@ -1036,8 +1040,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
10361040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
10371041
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013 h1:Vcub4gbcTIs/uYINllI8eHXAhv652PpPLM+f/LWZroA=
10381042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013/go.mod h1:QUt5DeP3jmoYPrWwgupRPg/Xus21MjEiUzzhEUv0tOY=
1039-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1108 h1:IjBfssGmmqK9VVwQKhETRWoOowRqytnLdeYADiFy1Bk=
1040-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1108/go.mod h1:yzldBIX7obRjbGohIb78bKNKvnDIoki2jJROQd5Rdb0=
1043+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1103 h1:Dzd9AWT+E+ZsB8eFY92pr4VmL6IuBExn2QcQdl0L77A=
1044+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1103/go.mod h1:yAKtHjrmFg4uAMiTsq3r1Luk+1iROMaZ3jYUNc2xPkg=
10411045
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
10421046
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10431047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038 h1:tmK0aSj8zJrTx7aubJR8DBvtySj1uO8UdFANUDFtbmo=

‎schema/filter.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,20 @@
5252
"required": true,
5353
"description": "域名."
5454
},
55-
"sub_domain": {
56-
"type": "string",
55+
"sub_domains": {
56+
"type": "set_string",
5757
"metadata": {
58-
"filter": {
59-
"enable": true
60-
},
61-
"widget": "text",
58+
"widget": "textarea",
6259
"val_source": {
6360
"values": {}
6461
},
65-
"description": "主机记录, 默认值为 @.",
66-
"display_name": "主机记录"
62+
"display_name": "主机记录",
63+
"delimiter": "[\\s\n,;]",
64+
"help": "多个描述以英文逗号、英文分号、空格或换行分割，最多10个，重复将去重",
65+
"description": "主机记录列表, 默认值为 @."
6766
},
6867
"optional": true,
69-
"description": "主机记录, 默认值为 @."
68+
"description": "主机记录列表, 默认值为 @."
7069
},
7170
"is_exact_sub_domain": {
7271
"type": "bool",

‎tencentcloud/provider.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,6 +1567,7 @@ func Provider() *schema.Provider {
15671567
"tencentcloud_postgresql_clone_db_instance": postgresql.ResourceTencentCloudPostgresqlCloneDbInstance(),
15681568
"tencentcloud_postgresql_instance_network_access": postgresql.ResourceTencentCloudPostgresqlInstanceNetworkAccess(),
15691569
"tencentcloud_postgresql_parameters": postgresql.ResourceTencentCloudPostgresqlParameters(),
1570+
"tencentcloud_postgresql_instance_ssl_config": postgresql.ResourceTencentCloudPostgresqlInstanceSslConfig(),
15701571
"tencentcloud_sqlserver_instance": sqlserver.ResourceTencentCloudSqlserverInstance(),
15711572
"tencentcloud_sqlserver_db": sqlserver.ResourceTencentCloudSqlserverDB(),
15721573
"tencentcloud_sqlserver_account": sqlserver.ResourceTencentCloudSqlserverAccount(),
@@ -1636,6 +1637,7 @@ func Provider() *schema.Provider {
16361637
"tencentcloud_cynosdb_read_only_instance_exclusive_access": cynosdb.ResourceTencentCloudCynosdbReadOnlyInstanceExclusiveAccess(),
16371638
"tencentcloud_cynosdb_proxy_end_point": cynosdb.ResourceTencentCloudCynosdbProxyEndPoint(),
16381639
"tencentcloud_cynosdb_upgrade_proxy_version": cynosdb.ResourceTencentCloudCynosdbUpgradeProxyVersion(),
1640+
"tencentcloud_cynosdb_backup_config": cynosdb.ResourceTencentCloudCynosdbBackupConfig(),
16391641
"tencentcloud_vod_adaptive_dynamic_streaming_template": vod.ResourceTencentCloudVodAdaptiveDynamicStreamingTemplate(),
16401642
"tencentcloud_vod_image_sprite_template": vod.ResourceTencentCloudVodImageSpriteTemplate(),
16411643
"tencentcloud_vod_procedure_template": vod.ResourceTencentCloudVodProcedureTemplate(),
@@ -1766,6 +1768,7 @@ func Provider() *schema.Provider {
17661768
"tencentcloud_teo_zone_setting": teo.ResourceTencentCloudTeoZoneSetting(),
17671769
"tencentcloud_teo_origin_group": teo.ResourceTencentCloudTeoOriginGroup(),
17681770
"tencentcloud_teo_l4_proxy": teo.ResourceTencentCloudTeoL4Proxy(),
1771+
"tencentcloud_teo_l4_proxy_rule": teo.ResourceTencentCloudTeoL4ProxyRule(),
17691772
"tencentcloud_teo_l7_acc_setting": teo.ResourceTencentCloudTeoL7AccSetting(),
17701773
"tencentcloud_teo_rule_engine": teo.ResourceTencentCloudTeoRuleEngine(),
17711774
"tencentcloud_teo_ownership_verify": teo.ResourceTencentCloudTeoOwnershipVerify(),
@@ -2185,6 +2188,7 @@ func Provider() *schema.Provider {
21852188
"tencentcloud_dasb_reset_user": bh.ResourceTencentCloudDasbResetUser(),
21862189
"tencentcloud_dasb_bind_device_account_private_key": bh.ResourceTencentCloudDasbBindDeviceAccountPrivateKey(),
21872190
"tencentcloud_dasb_bind_device_account_password": bh.ResourceTencentCloudDasbBindDeviceAccountPassword(),
2191+
"tencentcloud_dasb_asset_sync_job_operation": bh.ResourceTencentCloudDasbAssetSyncJobOperationOperation(),
21882192
"tencentcloud_ssl_check_certificate_chain_operation": ssl.ResourceTencentCloudSslCheckCertificateChainOperation(),
21892193
"tencentcloud_ssl_complete_certificate_operation": ssl.ResourceTencentCloudSslCompleteCertificateOperation(),
21902194
"tencentcloud_ssl_deploy_certificate_instance_operation": ssl.ResourceTencentCloudSslDeployCertificateInstanceOperation(),

‎tencentcloud/provider.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ tencentcloud_cynosdb_cluster_slave_zone
534534
tencentcloud_cynosdb_read_only_instance_exclusive_access
535535
tencentcloud_cynosdb_proxy_end_point
536536
tencentcloud_cynosdb_upgrade_proxy_version
537+
tencentcloud_cynosdb_backup_config
537538

538539
Direct Connect(DC)
539540
Data Source
@@ -916,6 +917,7 @@ tencentcloud_postgresql_apply_parameter_template_operation
916917
tencentcloud_postgresql_clone_db_instance
917918
tencentcloud_postgresql_instance_network_access
918919
tencentcloud_postgresql_parameters
920+
tencentcloud_postgresql_instance_ssl_config
919921

920922
TencentDB for Redis(crs)
921923
Data Source
@@ -1258,7 +1260,6 @@ tencentcloud_vpc_net_detect
12581260
tencentcloud_vpc_dhcp_ip
12591261
tencentcloud_vpc_ipv6_cidr_block
12601262
tencentcloud_vpc_ipv6_subnet_cidr_block
1261-
tencentcloud_vpc_ipv6_eni_address
12621263
tencentcloud_vpc_local_gateway
12631264
tencentcloud_vpc_notify_routes
12641265
tencentcloud_vpc_resume_snapshot_instance
@@ -1476,6 +1477,7 @@ tencentcloud_teo_ownership_verify
14761477
tencentcloud_teo_certificate_config
14771478
tencentcloud_teo_acceleration_domain
14781479
tencentcloud_teo_l4_proxy
1480+
tencentcloud_teo_l4_proxy_rule
14791481
tencentcloud_teo_realtime_log_delivery
14801482
tencentcloud_teo_function
14811483
tencentcloud_teo_function_rule
@@ -2210,6 +2212,7 @@ tencentcloud_dasb_user_group
22102212
tencentcloud_dasb_reset_user
22112213
tencentcloud_dasb_bind_device_account_private_key
22122214
tencentcloud_dasb_bind_device_account_password
2215+
tencentcloud_dasb_asset_sync_job_operation
22132216

22142217
Cwp
22152218
Data Source

‎tencentcloud/services/bh/resource_tc_dasb_asset_sync_job_operation.go

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
package bh
2+
3+
import (
4+
"fmt"
5+
"log"
6+
"strconv"
7+
8+
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
9+
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
11+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
12+
dasb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb/v20191018"
13+
14+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
15+
)
16+
17+
func ResourceTencentCloudDasbAssetSyncJobOperationOperation() *schema.Resource {
18+
return &schema.Resource{
19+
Create: resourceTencentCloudDasbAssetSyncJobOperationCreate,
20+
Read: resourceTencentCloudDasbAssetSyncJobOperationRead,
21+
Delete: resourceTencentCloudDasbAssetSyncJobOperationDelete,
22+
23+
Schema: map[string]*schema.Schema{
24+
"category": {
25+
Required: true,
26+
ForceNew: true,
27+
Type: schema.TypeInt,
28+
Description: "Synchronize asset categories, 1- Host assets, 2- Database assets.",
29+
},
30+
},
31+
}
32+
}
33+
34+
func resourceTencentCloudDasbAssetSyncJobOperationCreate(d *schema.ResourceData, meta interface{}) error {
35+
defer tccommon.LogElapsed("resource.tencentcloud_dasb_asset_sync_job_operation.create")()
36+
defer tccommon.InconsistentCheck(d, meta)()
37+
38+
var (
39+
logId = tccommon.GetLogId(tccommon.ContextNil)
40+
request = dasb.NewCreateAssetSyncJobRequest()
41+
waitReq = dasb.NewDescribeAssetSyncStatusRequest()
42+
category string
43+
)
44+
45+
if v, ok := d.GetOkExists("category"); ok {
46+
request.Category = helper.IntUint64(v.(int))
47+
waitReq.Category = helper.IntUint64(v.(int))
48+
category = strconv.Itoa(v.(int))
49+
}
50+
51+
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
52+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseDasbClient().CreateAssetSyncJob(request)
53+
if e != nil {
54+
return tccommon.RetryError(e)
55+
} else {
56+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
57+
}
58+
59+
return nil
60+
})
61+
62+
if err != nil {
63+
log.Printf("[CRITAL]%s create dasb AssetSyncJob failed, reason:%+v", logId, err)
64+
return err
65+
}
66+
67+
d.SetId(category)
68+
69+
// wait
70+
err = resource.Retry(4*tccommon.WriteRetryTimeout, func() *resource.RetryError {
71+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseDasbClient().DescribeAssetSyncStatus(waitReq)
72+
if e != nil {
73+
return tccommon.RetryError(e)
74+
} else {
75+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, waitReq.GetAction(), waitReq.ToJsonString(), result.ToJsonString())
76+
}
77+
78+
if result == nil || result.Response == nil || result.Response.Status == nil {
79+
return resource.NonRetryableError(fmt.Errorf("Describe dasb AssetSyncJob failed, Response is nil."))
80+
}
81+
82+
if result.Response.Status.InProcess == nil {
83+
return resource.NonRetryableError(fmt.Errorf("InProcess is nil."))
84+
}
85+
86+
if !*result.Response.Status.InProcess {
87+
return nil
88+
}
89+
90+
return resource.RetryableError(fmt.Errorf("Dasb asset sync job is still running..."))
91+
})
92+
93+
if err != nil {
94+
log.Printf("[CRITAL]%s describe dasb AssetSyncJob failed, reason:%+v", logId, err)
95+
return err
96+
}
97+
98+
return resourceTencentCloudDasbAssetSyncJobOperationRead(d, meta)
99+
}
100+
101+
func resourceTencentCloudDasbAssetSyncJobOperationRead(d *schema.ResourceData, meta interface{}) error {
102+
defer tccommon.LogElapsed("resource.tencentcloud_dasb_asset_sync_job_operation.read")()
103+
defer tccommon.InconsistentCheck(d, meta)()
104+
105+
return nil
106+
}
107+
108+
func resourceTencentCloudDasbAssetSyncJobOperationDelete(d *schema.ResourceData, meta interface{}) error {
109+
defer tccommon.LogElapsed("resource.tencentcloud_dasb_asset_sync_job_operation.delete")()
110+
defer tccommon.InconsistentCheck(d, meta)()
111+
112+
return nil
113+
}

‎tencentcloud/services/bh/resource_tc_dasb_asset_sync_job_operation.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Provides a resource to create a dasb asset sync job
2+
3+
Example Usage
4+
5+
```hcl
6+
resource "tencentcloud_dasb_asset_sync_job_operation" "example" {
7+
category = 1
8+
}
9+
```

‎tencentcloud/services/bh/resource_tc_dasb_asset_sync_job_operation_test.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package bh_test
2+
3+
import (
4+
"testing"
5+
6+
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
7+
8+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
9+
)
10+
11+
// go test -i; go test -test.run TestAccTencentCloudNeedFixDasbAssetSyncJobOperationOperationResource_basic -v
12+
func TestAccTencentCloudNeedFixDasbAssetSyncJobOperationOperationResource_basic(t *testing.T) {
13+
t.Parallel()
14+
resource.Test(t, resource.TestCase{
15+
PreCheck: func() {
16+
tcacctest.AccPreCheck(t)
17+
},
18+
Providers: tcacctest.AccProviders,
19+
Steps: []resource.TestStep{
20+
{
21+
Config: testAccDasbAssetSyncJobOperationOperation,
22+
Check: resource.ComposeTestCheckFunc(
23+
resource.TestCheckResourceAttrSet("tencentcloud_dasb_asset_sync_job_operation.example", "id"),
24+
resource.TestCheckResourceAttrSet("tencentcloud_dasb_asset_sync_job_operation.example", "category"),
25+
),
26+
},
27+
},
28+
})
29+
}
30+
31+
const testAccDasbAssetSyncJobOperationOperation = `
32+
resource "tencentcloud_dasb_asset_sync_job_operation" "example" {
33+
category = 1
34+
}
35+
`

0 commit comments

Comments
 (0)