Merge branch 'master' into feat/cfw-sg-rule

Author: gitmkn

.changelog/2877.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_ccn_routes: fix ccn routes read
+```

.changelog/2883.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_cdn_domain: Support origin_company field and add computed to the message field.
+```

.changelog/2885.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_scale_worker: add params `create_result_output_file`
+```

.changelog/2888.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_postgresql_clone_db_instance
+```

.changelog/2889.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_lite_hbase_instance: fix delete state refresh
+```

.changelog/2890.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_security_group_rule_set: update doc
+```

CHANGELOG.md

@@ -1,3 +1,30 @@
+## 1.81.133 (October 14 , 2024)
+
+FEATURES:
+
+* **New Resource:** `tencentcloud_postgresql_clone_db_instance` ([#2888](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2888))
+
+ENHANCEMENTS:
+
+* resource/tencentcloud_cdn_domain: Support origin_company field and add computed to the message field. ([#2883](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2883))
+* resource/tencentcloud_kubernetes_scale_worker: add params `create_result_output_file` ([#2885](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2885))
+* resource/tencentcloud_lite_hbase_instance: fix delete state refresh ([#2889](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2889))
+* resource/tencentcloud_security_group_rule_set: update doc ([#2890](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2890))
+
+## 1.81.132 (October 11 , 2024)
+
+FEATURES:
+
+* **New Resource:** `tencentcloud_ssl_check_certificate_domain_verification_operation` ([#2871](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2871))
+
+ENHANCEMENTS:
+
+* ccn/Update sdk version ([#2882](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2882))
+* resource/tencentcloud_as_scaling_config: Supports `enhanced_automation_tools_service` params. ([#2875](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2875))
+* resource/tencentcloud_ccn_routes: fix ccn routes read ([#2877](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2877))
+* resource/tencentcloud_instance: support `disable_automation_service` params ([#2873](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2873))
+* resource/tencentcloud_mysql_cls_log_attachment: Update md doc ([#2879](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2879))
+
 ## 1.81.131 (October 1 , 2024)
 
 ENHANCEMENTS:

tencentcloud/common/context.go

@@ -2,12 +2,14 @@ package common
 
 import (
 	"context"
+	"sync"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 type ctxResourceDataKey struct{}
 type ctxProviderMetaKey struct{}
+type ctxDataKey struct{}
 
 // NewResourceLifeCycleHandleFuncContext 创建一个资源生命周期处理方法上下文
 func NewResourceLifeCycleHandleFuncContext(
@@ -19,6 +21,7 @@ func NewResourceLifeCycleHandleFuncContext(
 	ctx := context.WithValue(parent, LogIdKey, logID)
 	ctx = context.WithValue(ctx, ctxResourceDataKey{}, d)
 	ctx = context.WithValue(ctx, ctxProviderMetaKey{}, meta)
+	ctx = context.WithValue(ctx, ctxDataKey{}, &ContextData{})
 	return ctx
 }
 
@@ -37,3 +40,77 @@ func ProviderMetaFromContext(ctx context.Context) interface{} {
 	}
 	return nil
 }
+
+// DataFromContext 从上下文获取 data
+func DataFromContext(ctx context.Context) *ContextData {
+	if data, ok := ctx.Value(ctxDataKey{}).(*ContextData); ok {
+		return data
+	}
+	return nil
+}
+
+// ContextData 上下文临时数据
+type ContextData struct {
+	lock sync.RWMutex
+	data map[string]interface{}
+}
+
+// Set 设置值
+func (d *ContextData) Set(key string, v interface{}) {
+	d.lock.Lock()
+	defer d.lock.Unlock()
+	if d.data == nil {
+		d.data = make(map[string]interface{})
+	}
+	d.data[key] = v
+}
+
+// Delete 删除值
+func (d *ContextData) Delete(key string) {
+	d.lock.Lock()
+	defer d.lock.Unlock()
+	delete(d.data, key)
+}
+
+// Get 获取键
+func (d *ContextData) Get(key string) interface{} {
+	d.lock.RLock()
+	defer d.lock.RUnlock()
+	return d.data[key]
+}
+
+// GetInt 获取 int 数据键
+func (d *ContextData) GetInt(key string) (ret int, ok bool) {
+	ret, ok = d.Get(key).(int)
+	return
+}
+
+// GetUInt 获取 uint 数据键
+func (d *ContextData) GetUInt(key string) (ret uint, ok bool) {
+	ret, ok = d.Get(key).(uint)
+	return
+}
+
+// GetInt64 获取 int64 数据键
+func (d *ContextData) GetInt64(key string) (ret int64, ok bool) {
+	ret, ok = d.Get(key).(int64)
+	return
+}
+
+// GetUInt64 获取 uint64 数据键
+func (d *ContextData) GetUInt64(key string) (ret uint64, ok bool) {
+	ret, ok = d.Get(key).(uint64)
+	return
+}
+
+// GetString 获取 string 数据键
+func (d *ContextData) GetString(key string) (ret string, ok bool) {
+	ret, ok = d.Get(key).(string)
+	return
+}
+
+// GetBool 获取 bool 数据键
+func (d *ContextData) GetBool(key string) (ret bool, ok bool) {
+	ret, ok = d.Get(key).(bool)
+	return
+}

tencentcloud/connectivity/client.go

@@ -211,10 +211,11 @@ type TencentCloudClient struct {
 	controlcenterConn *controlcenter.Client
 	thpcConn          *thpc.Client
 	//omit nil client
-	omitNilConn      *common.Client
-	emrv20190103Conn *emr.Client
-	teov20220901Conn *teo.Client
-	sslv20191205Conn *sslCertificate.Client
+	omitNilConn           *common.Client
+	emrv20190103Conn      *emr.Client
+	teov20220901Conn      *teo.Client
+	sslv20191205Conn      *sslCertificate.Client
+	postgresv20170312Conn *postgre.Client
 	cfwv20190904Conn *cfw.Client
 }
 
@@ -1860,6 +1861,19 @@ func (me *TencentCloudClient) UseSslV20191205Client() *sslCertificate.Client {
 	return me.sslv20191205Conn
 }
 
+// UsePostgresV20170312Client return POSTGRES client for service
+func (me *TencentCloudClient) UsePostgresV20170312Client() *postgre.Client {
+	if me.postgresv20170312Conn != nil {
+		return me.postgresv20170312Conn
+	}
+	cpf := me.NewClientProfile(300)
+	cpf.Language = "zh-CN"
+	me.postgresv20170312Conn, _ = postgre.NewClient(me.Credential, me.Region, cpf)
+	me.postgresv20170312Conn.WithHttpTransport(&LogRoundTripper{})
+
+	return me.postgresv20170312Conn
+}
+
 // UseCfwV20190904Client return CFW client for service
 func (me *TencentCloudClient) UseCfwV20190904Client() *cfw.Client {
 	if me.cfwv20190904Conn != nil {

tencentcloud/provider.go

@@ -1506,6 +1506,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_postgresql_account":                                                     postgresql.ResourceTencentCloudPostgresqlAccount(),
 			"tencentcloud_postgresql_account_privileges_operation":                                postgresql.ResourceTencentCloudPostgresqlAccountPrivilegesOperation(),
 			"tencentcloud_postgresql_apply_parameter_template_operation":                          postgresql.ResourceTencentCloudPostgresqlApplyParameterTemplateOperation(),
+			"tencentcloud_postgresql_clone_db_instance":                                           postgresql.ResourceTencentCloudPostgresqlCloneDbInstance(),
 			"tencentcloud_sqlserver_instance":                                                     sqlserver.ResourceTencentCloudSqlserverInstance(),
 			"tencentcloud_sqlserver_db":                                                           sqlserver.ResourceTencentCloudSqlserverDB(),
 			"tencentcloud_sqlserver_account":                                                      sqlserver.ResourceTencentCloudSqlserverAccount(),

tencentcloud/provider.md

@@ -901,6 +901,7 @@ TencentDB for PostgreSQL(PostgreSQL)
     tencentcloud_postgresql_instance_ha_config
     tencentcloud_postgresql_account
     tencentcloud_postgresql_apply_parameter_template_operation
+    tencentcloud_postgresql_clone_db_instance
 
 TencentDB for Redis(crs)
   Data Source

tencentcloud/services/ccn/resource_tc_ccn_routes_test.go

@@ -39,8 +39,8 @@ func TestAccTencentCloudCcnRoutesResource_basic(t *testing.T) {
 const testAccVpcCcnRoutes = `
 
 resource "tencentcloud_ccn_routes" "ccn_routes" {
-  ccn_id = "ccn-39lqkygf"
-  route_id = "ccnr-3o0dfyuw"
+  ccn_id = "ccn-0bbkedsb"
+  route_id = "ccnr-9sqye2qg"
   switch = "off"
 }
 
@@ -49,8 +49,8 @@ resource "tencentcloud_ccn_routes" "ccn_routes" {
 const testAccVpcCcnRoutesUpdate = `
 
 resource "tencentcloud_ccn_routes" "ccn_routes" {
-  ccn_id = "ccn-39lqkygf"
-  route_id = "ccnr-3o0dfyuw"
+  ccn_id = "ccn-0bbkedsb"
+  route_id = "ccnr-9sqye2qg"
   switch = "on"
 }
 

tencentcloud/services/ccn/service_tencentcloud_ccn.go

@@ -1260,7 +1260,12 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string
 
 	request := vpc.NewDescribeCcnRoutesRequest()
 	request.CcnId = &ccnId
-
+	request.Filters = []*vpc.Filter{
+		{
+			Name:   helper.String("route-id"),
+			Values: []*string{helper.String(routeId)},
+		},
+	}
 	defer func() {
 		if errRet != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
@@ -1276,11 +1281,8 @@ func (me *VpcService) DescribeVpcCcnRoutesById(ctx context.Context, ccnId string
 	}
 	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
-	for _, route := range response.Response.RouteSet {
-		if *route.RouteId == routeId {
-			ccnRoutes = route
-			return
-		}
+	if response != nil && response.Response != nil && len(response.Response.RouteSet) > 0 {
+		ccnRoutes = response.Response.RouteSet[0]
 	}
 
 	return

tencentcloud/services/cdn/resource_tc_cdn_domain.go

@@ -41,6 +41,7 @@ func ResourceTencentCloudCdnDomain() *schema.Resource {
 				"cache_key": []interface{}{map[string]interface{}{
 					"full_url_cache": "on",
 				}},
+				"full_url_cache": true,
 			}),
 		},
 
@@ -137,6 +138,11 @@ func ResourceTencentCloudCdnDomain() *schema.Resource {
 							Optional:    true,
 							Description: "Host header used when accessing the backup origin server. If left empty, the ServerName of master origin server will be used by default.",
 						},
+						"origin_company": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: "Object storage back to the source vendor. Required when the source station type is a third-party storage source station (third_party). Optional values include the following: `aws_s3`: AWS S3; `ali_oss`: Alibaba Cloud OSS; `hw_obs`: Huawei OBS; `qiniu_kodo`: Qiniu Cloud kodo; `others`: other vendors' object storage, only supports object storage compatible with AWS signature algorithm, such as Tencent Cloud Financial Zone COS. Example value: `hw_obs`.",
+						},
 					},
 				},
 			},
@@ -212,6 +218,7 @@ func ResourceTencentCloudCdnDomain() *schema.Resource {
 									"message": {
 										Type:        schema.TypeString,
 										Optional:    true,
+										Computed:    true,
 										Description: "Certificate remarks.",
 									},
 									"deploy_time": {
@@ -1861,6 +1868,9 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
 			request.Origin.BackupOrigins = append(request.Origin.BackupOrigins, helper.String(item.(string)))
 		}
 	}
+	if v := origin["origin_company"]; v.(string) != "" {
+		request.Origin.OriginCompany = helper.String(v.(string))
+	}
 
 	// https config
 	if v, ok := d.GetOk("https_config"); ok {
@@ -2564,6 +2574,7 @@ func resourceTencentCloudCdnDomainRead(d *schema.ResourceData, meta interface{})
 	origin["backup_origin_type"] = domainConfig.Origin.BackupOriginType
 	origin["backup_origin_list"] = domainConfig.Origin.BackupOrigins
 	origin["backup_server_name"] = domainConfig.Origin.BackupServerName
+	origin["origin_company"] = domainConfig.Origin.OriginCompany
 	origins = append(origins, origin)
 	_ = d.Set("origin", origins)
 
@@ -3178,6 +3189,9 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
 				request.Origin.BackupOrigins = append(request.Origin.BackupOrigins, helper.String(item.(string)))
 			}
 		}
+		if v := origin["origin_company"]; v.(string) != "" {
+			request.Origin.OriginCompany = helper.String(v.(string))
+		}
 	}
 	if d.HasChange("request_header") {
 		updateAttrs = append(updateAttrs, "request_header")