Skip to content

Commit c05b53d

Browse files
oneceronecer
authored
Merge branch 'tencentcloudstack:master' into master
2 parents 3da9f77 + 0160fff commit c05b53d

20 files changed

+1041
-48
lines changed

‎.changelog/3656.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_kubernetes_cluster_release: optimiz code logic
3+
```

‎.changelog/3658.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_mongodb_instance_backup_rule: update doc
3+
```

‎.changelog/3659.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_cls_delivery
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.3.8
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
52-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7
52+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.11
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -935,9 +935,9 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.50/go.mod h
935935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.51/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
936936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
938-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8 h1:DdeB0VtEs8UmJSPdNCTeqMW5ifX3Phlvu0o0WJXZ6yE=
940938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11 h1:pexLAyZVjVcxS8dmGY5qtiYyXZ68vKUmKPamMqsAoso=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
941941
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51 h1:pGwrfCBBCt1u+EDHwfNj9NLQpvk5MVKVMcsE7SvwqM4=
942942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51/go.mod h1:aTEdZDUTIOTS0CMDMMpKIkoc0HqtQ5+dRlaZO1KF/gg=
943943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -946,8 +946,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206 h1:tx8L5s
946946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206/go.mod h1:zkdrFNYxTFX7E3QRgNVayQi7fq/A1TYRKLkGE8NS0lQ=
947947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69SP/wPsmnfozcQVZ6tUY6F6N/TpEe/7xtXrc/8=
948948
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762/go.mod h1:1XylIfNUbAzmNqi4XMhwcM3VhmUHdu1OYybOeaJ4sOw=
949-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7 h1:HvkbNkVwUdg//O4BKwd87BqSJIH3NJKOLVROdHeCcVQ=
950-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7/go.mod h1:k0qhXvE8aIHsC3tjaXr7VvOxcD8pEW+ohsFS5vMZquE=
949+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.11 h1:MPAXIEszoMhyks18vqcDkMj8nzSV698+lXKfWvQQUg8=
950+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.11/go.mod h1:EgkuM4By2dxr2qsJNupW4sX2eWCdepnRR3axxLC0flg=
951951
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970 h1:qVIRHgG1twsqF4aVN/x2T2yMRfPpsZBTNefDkqzM06M=
952952
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970/go.mod h1:NJuuQD4z6vcnsZnC7Tvz2U9hElNS1wroc34UQbZvP2U=
953953
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 h1:D8qrelkK5udv8RzJJIABMzItGIyaZoYnxEVeIsYqiNw=

‎tencentcloud/provider.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,9 @@ func Provider() *schema.Provider {
575575
"tencentcloud_container_clusters": tke.DataSourceTencentCloudContainerClusters(),
576576
"tencentcloud_container_cluster_instances": tke.DataSourceTencentCloudContainerClusterInstances(),
577577
"tencentcloud_kubernetes_addons": tke.DataSourceTencentCloudKubernetesAddons(),
578+
"tencentcloud_kubernetes_cluster_instances": tke.DataSourceTencentCloudKubernetesClusterInstances(),
579+
"tencentcloud_kubernetes_cluster_node_pools": tke.DataSourceTencentCloudKubernetesClusterNodePools(),
580+
"tencentcloud_kubernetes_cluster_native_node_pools": tke.DataSourceTencentCloudKubernetesClusterNativeNodePools(),
578581
"tencentcloud_mysql_backup_list": cdb.DataSourceTencentCloudMysqlBackupList(),
579582
"tencentcloud_mysql_zone_config": cdb.DataSourceTencentCloudMysqlZoneConfig(),
580583
"tencentcloud_mysql_parameter_list": cdb.DataSourceTencentCloudMysqlParameterList(),
@@ -1280,12 +1283,9 @@ func Provider() *schema.Provider {
12801283
"tencentcloud_antiddos_bgp_biz_trend": antiddos.DataSourceTencentCloudAntiddosBgpBizTrend(),
12811284
"tencentcloud_antiddos_list_listener": antiddos.DataSourceTencentCloudAntiddosListListener(),
12821285
"tencentcloud_antiddos_overview_attack_trend": antiddos.DataSourceTencentCloudAntiddosOverviewAttackTrend(),
1283-
"tencentcloud_kubernetes_cluster_instances": tke.DataSourceTencentCloudKubernetesClusterInstances(),
1284-
"tencentcloud_kubernetes_cluster_node_pools": tke.DataSourceTencentCloudKubernetesClusterNodePools(),
12851286
"tencentcloud_clickhouse_spec": cdwch.DataSourceTencentCloudClickhouseSpec(),
12861287
"tencentcloud_clickhouse_instance_shards": cdwch.DataSourceTencentCloudClickhouseInstanceShards(),
12871288
"tencentcloud_clickhouse_instance_nodes": cdwch.DataSourceTencentCloudClickhouseInstanceNodes(),
1288-
"tencentcloud_kubernetes_cluster_native_node_pools": tke.DataSourceTencentCloudKubernetesClusterNativeNodePools(),
12891289
"tencentcloud_cdc_dedicated_cluster_hosts": cdc.DataSourceTencentCloudCdcDedicatedClusterHosts(),
12901290
"tencentcloud_cdc_dedicated_cluster_instance_types": cdc.DataSourceTencentCloudCdcDedicatedClusterInstanceTypes(),
12911291
"tencentcloud_cdc_dedicated_cluster_orders": cdc.DataSourceTencentCloudCdcDedicatedClusterOrders(),
@@ -1482,6 +1482,11 @@ func Provider() *schema.Provider {
14821482
"tencentcloud_kubernetes_encryption_protection": tke.ResourceTencentCloudKubernetesEncryptionProtection(),
14831483
"tencentcloud_kubernetes_cluster_master_attachment": tke.ResourceTencentCloudKubernetesClusterMasterAttachment(),
14841484
"tencentcloud_kubernetes_cluster_release": tke.ResourceTencentCloudKubernetesClusterRelease(),
1485+
"tencentcloud_kubernetes_addon": tke.ResourceTencentCloudKubernetesAddon(),
1486+
"tencentcloud_kubernetes_addon_config": tke.ResourceTencentCloudKubernetesAddonConfig(),
1487+
"tencentcloud_kubernetes_native_node_pool": tke.ResourceTencentCloudKubernetesNativeNodePool(),
1488+
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy(),
1489+
"tencentcloud_kubernetes_log_config": tke.ResourceTencentCloudKubernetesLogConfig(),
14851490
"tencentcloud_mysql_backup_policy": cdb.ResourceTencentCloudMysqlBackupPolicy(),
14861491
"tencentcloud_mysql_account": cdb.ResourceTencentCloudMysqlAccount(),
14871492
"tencentcloud_mysql_account_privilege": cdb.ResourceTencentCloudMysqlAccountPrivilege(),
@@ -1813,6 +1818,7 @@ func Provider() *schema.Provider {
18131818
"tencentcloud_cynosdb_audit_log_file": cynosdb.ResourceTencentCloudCynosdbAuditLogFile(),
18141819
"tencentcloud_cynosdb_security_group": cynosdb.ResourceTencentCloudCynosdbSecurityGroup(),
18151820
"tencentcloud_cynosdb_audit_service": cynosdb.ResourceTencentCloudCynosdbAuditService(),
1821+
"tencentcloud_cynosdb_cls_delivery": cynosdb.ResourceTencentCloudCynosdbClsDelivery(),
18161822
"tencentcloud_vod_adaptive_dynamic_streaming_template": vod.ResourceTencentCloudVodAdaptiveDynamicStreamingTemplate(),
18171823
"tencentcloud_vod_image_sprite_template": vod.ResourceTencentCloudVodImageSpriteTemplate(),
18181824
"tencentcloud_vod_procedure_template": vod.ResourceTencentCloudVodProcedureTemplate(),
@@ -2455,9 +2461,6 @@ func Provider() *schema.Provider {
24552461
"tencentcloud_elastic_public_ipv6_attachment": vpc.ResourceTencentCloudElasticPublicIpv6Attachment(),
24562462
"tencentcloud_ha_vip_instance_attachment": vpc.ResourceTencentCloudHaVipInstanceAttachment(),
24572463
"tencentcloud_csip_risk_center": csip.ResourceTencentCloudCsipRiskCenter(),
2458-
"tencentcloud_kubernetes_addon": tke.ResourceTencentCloudKubernetesAddon(),
2459-
"tencentcloud_kubernetes_addon_config": tke.ResourceTencentCloudKubernetesAddonConfig(),
2460-
"tencentcloud_kubernetes_native_node_pool": tke.ResourceTencentCloudKubernetesNativeNodePool(),
24612464
"tencentcloud_cdc_site": cdc.ResourceTencentCloudCdcSite(),
24622465
"tencentcloud_cdc_dedicated_cluster": cdc.ResourceTencentCloudCdcDedicatedCluster(),
24632466
"tencentcloud_cdc_dedicated_cluster_image_cache": cdc.ResourceTencentCloudDedicatedClusterImageCache(),
@@ -2466,13 +2469,11 @@ func Provider() *schema.Provider {
24662469
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
24672470
"tencentcloud_controlcenter_account_factory_baseline_config": controlcenter.ResourceTencentCloudControlcenterAccountFactoryBaselineConfig(),
24682471
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
2469-
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy(),
24702472
"tencentcloud_lite_hbase_instance": emr.ResourceTencentCloudLiteHbaseInstance(),
24712473
"tencentcloud_serverless_hbase_instance": emr.ResourceTencentCloudServerlessHbaseInstance(),
24722474
"tencentcloud_emr_yarn": emr.ResourceTencentCloudEmrYarn(),
24732475
"tencentcloud_emr_deploy_yarn_operation": emr.ResourceTencentCloudEmrDeployYarnOperation(),
24742476
"tencentcloud_emr_auto_scale_strategy": emr.ResourceTencentCloudEmrAutoScaleStrategy(),
2475-
"tencentcloud_kubernetes_log_config": tke.ResourceTencentCloudKubernetesLogConfig(),
24762477
"tencentcloud_tcss_image_registry": tcss.ResourceTencentCloudTcssImageRegistry(),
24772478
"tencentcloud_tcss_cluster_access": tcss.ResourceTencentCloudTcssClusterAccess(),
24782479
"tencentcloud_tcss_refresh_task_operation": tcss.ResourceTencentCloudTcssRefreshTaskOperation(),

‎tencentcloud/provider.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ tencentcloud_cynosdb_backup_config
548548
tencentcloud_cynosdb_ssl
549549
tencentcloud_cynosdb_cluster_transparent_encrypt
550550
tencentcloud_cynosdb_audit_service
551+
tencentcloud_cynosdb_cls_delivery
551552

552553
Direct Connect(DC)
553554
Data Source

0 commit comments

Comments
 (0)