update

Author: mikatong

tencentcloud/services/cynosdb/resource_tc_cynosdb_ssl.go

@@ -33,7 +33,7 @@ func ResourceTencentCloudCynosdbSsl() *schema.Resource {
 				Description: "Cluster id.",
 			},
 			"instance_id": {
-				Optional:    true,
+				Required:    true,
 				Type:        schema.TypeString,
 				Description: "instance id.",
 			},
@@ -55,18 +55,10 @@ func resourceTencentCloudCynosdbSslCreate(d *schema.ResourceData, meta interface
 	defer tccommon.LogElapsed("resource.tencentcloud_cynosdb_ssl.create")()
 	defer tccommon.InconsistentCheck(d, meta)()
 
-	var clusterId, instanceId string
-	clusterId = d.Get("cluster_id").(string)
-	if v, ok := d.GetOk("instance_id"); ok && v.(string) != "" {
-		instanceId = v.(string)
-	}
-
-	if instanceId == "" {
-		d.SetId(clusterId)
-	} else {
-		d.SetId(clusterId + tccommon.FILED_SP + instanceId)
-	}
+	clusterId := d.Get("cluster_id").(string)
+	instanceId := d.Get("instance_id").(string)
 
+	d.SetId(clusterId + tccommon.FILED_SP + instanceId)
 	return resourceTencentCloudCynosdbSslUpdate(d, meta)
 }
 
@@ -80,12 +72,12 @@ func resourceTencentCloudCynosdbSslRead(d *schema.ResourceData, meta interface{}
 
 	service := CynosdbService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
 
-	var clusterId, instanceId string
 	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
-	clusterId = idSplit[0]
-	if len(idSplit) > 1 {
-		instanceId = idSplit[1]
+	if len(idSplit) != 2 {
+		return fmt.Errorf("id is broken,%s", d.Id())
 	}
+	clusterId := idSplit[0]
+	instanceId := idSplit[1]
 
 	ssl, err := service.DescribeSSLStatus(ctx, clusterId, instanceId)
 	if err != nil {
@@ -125,22 +117,20 @@ func resourceTencentCloudCynosdbSslUpdate(d *schema.ResourceData, meta interface
 
 	logId := tccommon.GetLogId(tccommon.ContextNil)
 
-	var clusterId, instanceId string
 	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
-	clusterId = idSplit[0]
-	if len(idSplit) > 1 {
-		instanceId = idSplit[1]
+	if len(idSplit) != 2 {
+		return fmt.Errorf("id is broken,%s", d.Id())
 	}
+	clusterId := idSplit[0]
+	instanceId := idSplit[1]
 
 	var taskId *int64
 	if v, ok := d.GetOk("status"); ok {
 		status := v.(string)
 		if status == "ON" {
 			request := cynosdb.NewOpenSSLRequest()
 			request.ClusterId = helper.String(clusterId)
-			if instanceId != "" {
-				request.InstanceId = helper.String(instanceId)
-			}
+			request.InstanceId = helper.String(instanceId)
 
 			err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 				result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCynosdbClient().OpenSSL(request)
@@ -159,9 +149,7 @@ func resourceTencentCloudCynosdbSslUpdate(d *schema.ResourceData, meta interface
 		} else if status == "OFF" {
 			request := cynosdb.NewCloseSSLRequest()
 			request.ClusterId = helper.String(clusterId)
-			if instanceId != "" {
-				request.InstanceId = helper.String(instanceId)
-			}
+			request.InstanceId = helper.String(instanceId)
 
 			err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 				result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCynosdbClient().CloseSSL(request)

tencentcloud/services/cynosdb/resource_tc_cynosdb_ssl_test.go

@@ -43,16 +43,16 @@ func TestAccTencentCloudCynosdbSslResource_basic(t *testing.T) {
 
 const testAccCynosdbSsl = `
 resource "tencentcloud_cynosdb_ssl" "cynosdb_ssl" {
-  cluster_id = "cynosdbmysql-1e0nzayx"
-  instance_id = "cynosdbmysql-ins-pfsv6q1e"
+  cluster_id = "cynosdbmysql-7yr4dde5"
+  instance_id = "cynosdbmysql-ins-4f62d5tq"
   status = "ON"
 }
 `
 
 const testAccCynosdbSsl_update = `
 resource "tencentcloud_cynosdb_ssl" "cynosdb_ssl" {
-  cluster_id = "cynosdbmysql-1e0nzayx"
-  instance_id = "cynosdbmysql-ins-pfsv6q1e"
+  cluster_id = "cynosdbmysql-7yr4dde5"
+  instance_id = "cynosdbmysql-ins-4f62d5tq"
   status = "OFF"
 }
 `

tencentcloud/services/cynosdb/service_tencentcloud_cynosdb.go

@@ -2960,13 +2960,8 @@ func (me *CynosdbService) DescribeSSLStatus(ctx context.Context, clusterId, inst
 	logId := tccommon.GetLogId(ctx)
 
 	request := cynosdb.NewDescribeSSLStatusRequest()
-
-	if clusterId != "" {
-		request.ClusterId = &clusterId
-	}
-	if instanceId != "" {
-		request.InstanceId = &instanceId
-	}
+	request.ClusterId = &clusterId
+	request.InstanceId = &instanceId
 	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())

website/docs/r/cynosdb_ssl.html.markdown

@@ -26,8 +26,8 @@ resource "tencentcloud_cynosdb_ssl" "cynosdb_ssl" {
 The following arguments are supported:
 
 * `cluster_id` - (Required, String) Cluster id.
+* `instance_id` - (Required, String) instance id.
 * `status` - (Required, String) Whether to enable SSL. `ON` means enabled, `OFF` means not enabled.
-* `instance_id` - (Optional, String) instance id.
 
 ## Attributes Reference