feat(cdb): [117461373]mysql ssl

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.760
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.800
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.974
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch v1.0.843
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627
@@ -46,7 +46,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.961
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.974
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692

go.sum

@@ -838,6 +838,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591 h1:TPGLjH6
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591/go.mod h1:nCAGfVTXZkVnurkbjF3b0FM6RwGztE9t8D9Ms1unaKo=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.800 h1:VnnmCIaAXU7t0uwNtaLs990V7+V7/7viMpOytOT6GOE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.800/go.mod h1:8wiecMvcwN6785rTWLJmdm/Y7u1DjFmqI/iqiWwpm5o=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.974 h1:uz6BNZNeHrcL7NOrgVOKgnYES87k9S+9KW18KCJ/jIg=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.974/go.mod h1:v/SPz2nAK1y61zvHtGPR10UOqNG+2vDIByGCac2vM/I=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.967 h1:+05iVbm200Dh1td+apCB/aX2w97TvmcSlpECkaL53Bw=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.967/go.mod h1:JzIWhJtlitR2S92TMXikPAOQlC8smQrMbU2Y8NBzRk8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.970 h1:0A6PwOaUeLtm4U5TR1uD91ETBgDcnfqFnsG9mwCNvlY=
@@ -970,6 +972,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.970 h1:IsF+
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.970/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971 h1:T5zEH1QM1XX+hJoAe4krnSjrnsTgHv1KfGC4Sos0Y4M=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.971/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.974 h1:x1zadG50kfBUzjBvPINZCpzjelbJuXVf7OnTPUElOzc=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.974/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=

tencentcloud/services/cdb/resource_tc_mysql_dr_instance.go

@@ -203,6 +203,12 @@ func ResourceTencentCloudMysqlDrInstance() *schema.Resource {
 				Default:     false,
 				Description: "Indicate whether to delete instance directly or not. Default is `false`. If set true, the instance will be deleted instead of staying recycle bin. Note: only works for `PREPAID` instance.",
 			},
+			"ssl_status": {
+				Optional:    true,
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "Whether to enable SSL. `ON` means enabled, `OFF` means not enabled. Default: `OFF`.",
+			},
 			"tags": {
 				Type:        schema.TypeMap,
 				Optional:    true,
@@ -215,6 +221,12 @@ func ResourceTencentCloudMysqlDrInstance() *schema.Resource {
 				Computed:    true,
 				Description: "instance intranet IP.",
 			},
+
+			"ssl_url": {
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "The certificate download link. Example value: http://testdownload.url.",
+			},
 		},
 	}
 }
@@ -324,6 +336,12 @@ func resourceTencentCloudMysqlDrInstanceCreate(d *schema.ResourceData, meta inte
 		return err
 	}
 
+	// ssl
+	if err := mysqlInstanceSSLUpdate(ctx, d, meta); err != nil {
+		log.Printf("[CRITAL]%s update mysql ssl fail, reason:%s\n ", logId, err.Error())
+		return err
+	}
+
 	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
 		tcClient := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
 		tagService := svctag.NewTagService(tcClient)
@@ -426,6 +444,27 @@ func resourceTencentCloudMysqlDrInstanceRead(d *schema.ResourceData, meta interf
 	_ = d.Set("intranet_ip", mysqlInfo.Vip)
 	_ = d.Set("intranet_port", int(*mysqlInfo.Vport))
 
+	ssl, err := mysqlService.DescribeMysqlSslById(ctx, d.Id())
+	if err != nil {
+		return err
+	}
+
+	if ssl == nil {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `tencentcloud_mysql_ssl` [%s] not found, please check if it has been deleted.",
+			logId, d.Id(),
+		)
+		return nil
+	}
+
+	if ssl.Status != nil {
+		_ = d.Set("ssl_status", ssl.Status)
+	}
+
+	if ssl.Url != nil {
+		_ = d.Set("ssl_url", ssl.Url)
+	}
+
 	return nil
 }
 

tencentcloud/services/cdb/resource_tc_mysql_dr_instance_test.go

@@ -34,6 +34,8 @@ func TestAccTencentNeedFixCloudMysqlDrInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "volume_size", "100"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "intranet_port", "3360"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "tags.test", "test-tf"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "ssl_status", "ON"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_dr_instance.mysql_dr", "ssl_url"),
 				),
 			},
 			{
@@ -50,6 +52,7 @@ func TestAccTencentNeedFixCloudMysqlDrInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "volume_size", "100"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "intranet_port", "3360"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "tags.test", "test-tf"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_dr_instance.mysql_dr", "ssl_status", "OFF"),
 				),
 			},
 		},
@@ -128,6 +131,7 @@ resource "tencentcloud_mysql_dr_instance" "mysql_dr" {
   volume_size       = 100
   vpc_id            = "vpc-h6s1s3aa"
   intranet_port      = 3360
+  ssl_status		= "ON"
   tags = {
     test = "test-tf"
   }
@@ -158,6 +162,7 @@ resource "tencentcloud_mysql_dr_instance" "mysql_dr" {
   volume_size       = 100
   vpc_id            = "vpc-h6s1s3aa"
   intranet_port      = 3360
+  ssl_status		= "OFF"
   tags = {
     test = "test-tf"
   }

tencentcloud/services/cdb/resource_tc_mysql_instance.go

@@ -281,6 +281,12 @@ func ResourceTencentCloudMysqlInstance() *schema.Resource {
 			Default:     0,
 			Description: "Project ID, default value is 0.",
 		},
+		"ssl_status": {
+			Optional:    true,
+			Computed:    true,
+			Type:        schema.TypeString,
+			Description: "Whether to enable SSL. `ON` means enabled, `OFF` means not enabled. Default: `OFF`.",
+		},
 
 		// Computed values
 		"internet_host": {
@@ -293,6 +299,12 @@ func ResourceTencentCloudMysqlInstance() *schema.Resource {
 			Computed:    true,
 			Description: "Access port for public access.",
 		},
+
+		"ssl_url": {
+			Computed:    true,
+			Type:        schema.TypeString,
+			Description: "The certificate download link. Example value: http://testdownload.url.",
+		},
 	}
 
 	basic := TencentMsyqlBasicInfo()
@@ -746,6 +758,12 @@ func resourceTencentCloudMysqlInstanceCreate(d *schema.ResourceData, meta interf
 		}
 	}
 
+	// ssl
+	if err := mysqlInstanceSSLUpdate(ctx, d, meta); err != nil {
+		log.Printf("[CRITAL]%s update mysql ssl fail, reason:%s\n ", logId, err.Error())
+		return err
+	}
+
 	return resourceTencentCloudMysqlInstanceRead(d, meta)
 }
 
@@ -965,6 +983,28 @@ func resourceTencentCloudMysqlInstanceRead(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return fmt.Errorf("Describe DBInstanceConfig Fail, reason:%s", err.Error())
 	}
+
+	ssl, err := mysqlService.DescribeMysqlSslById(ctx, d.Id())
+	if err != nil {
+		return err
+	}
+
+	if ssl == nil {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `tencentcloud_mysql_ssl` [%s] not found, please check if it has been deleted.",
+			logId, d.Id(),
+		)
+		return nil
+	}
+
+	if ssl.Status != nil {
+		_ = d.Set("ssl_status", ssl.Status)
+	}
+
+	if ssl.Url != nil {
+		_ = d.Set("ssl_url", ssl.Url)
+	}
+
 	return nil
 }
 
@@ -1256,6 +1296,13 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		}
 	}
 
+	if !isReadonly && d.HasChange("ssl_status") {
+		if err := mysqlInstanceSSLUpdate(ctx, d, meta); err != nil {
+			log.Printf("[CRITAL]%s update mysql ssl fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
+	}
+
 	if d.HasChange("tags") {
 
 		oldValue, newValue := d.GetChange("tags")
@@ -1531,6 +1578,81 @@ func resourceTencentCloudMysqlInstanceUpdate(d *schema.ResourceData, meta interf
 	return resourceTencentCloudMysqlInstanceRead(d, meta)
 }
 
+func mysqlInstanceSSLUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
+	logId := tccommon.GetLogId(tccommon.ContextNil)
+
+	instanceId := d.Id()
+	status := ""
+	if v, ok := d.GetOk("ssl_status"); ok {
+		status = v.(string)
+		if status == "ON" {
+			request := cdb.NewOpenSSLRequest()
+			request.InstanceId = helper.String(instanceId)
+
+			err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+				result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMysqlClient().OpenSSL(request)
+				if e != nil {
+					return tccommon.RetryError(e)
+				} else {
+					log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+				}
+				return nil
+			})
+			if err != nil {
+				log.Printf("[CRITAL]%s update mysql ssl failed, reason:%+v", logId, err)
+				return err
+			}
+		} else if status == "OFF" {
+			request := cdb.NewCloseSSLRequest()
+			request.InstanceId = helper.String(instanceId)
+
+			err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+				result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMysqlClient().CloseSSL(request)
+				if e != nil {
+					return tccommon.RetryError(e)
+				} else {
+					log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+				}
+				return nil
+			})
+			if err != nil {
+				log.Printf("[CRITAL]%s update mysql ssl failed, reason:%+v", logId, err)
+				return err
+			}
+		} else {
+			return fmt.Errorf("[CRITAL]%s update mysql ssl failed, reason:your status must be ON or OFF!", logId)
+		}
+
+		if status != "" {
+			service := MysqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+			err := resource.Retry(7*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+				ssl, err := service.DescribeMysqlSslById(ctx, instanceId)
+				if err != nil {
+					return resource.NonRetryableError(err)
+				}
+				if ssl == nil {
+					err = fmt.Errorf("mysqlid %s instance ssl not exists", instanceId)
+					return resource.NonRetryableError(err)
+				}
+				if *ssl.Status != status {
+					return resource.RetryableError(fmt.Errorf("mysql ssl status is (%v)", *ssl.Status))
+				}
+				if *ssl.Status == status {
+					return nil
+				}
+				err = fmt.Errorf("mysql ssl status is %v,we won't wait for it finish", *ssl.Status)
+				return resource.NonRetryableError(err)
+			})
+
+			if err != nil {
+				log.Printf("[CRITAL]%s mysql switchForUpgrade fail, reason:%s\n ", logId, err.Error())
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func resourceTencentCloudMysqlInstanceDelete(d *schema.ResourceData, meta interface{}) error {
 	defer tccommon.LogElapsed("resource.tencentcloud_mysql_instance.delete")()
 

tencentcloud/services/cdb/resource_tc_mysql_instance_test.go

@@ -160,6 +160,8 @@ func TestAccTencentCloudMysqlInstanceResource_DeviceType(t *testing.T) {
 					testAccCheckMysqlMasterInstanceExists("tencentcloud_mysql_instance.mysql_exclusive"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_exclusive", "device_type", "EXCLUSIVE"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.mysql_exclusive", "first_slave_zone"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_exclusive", "ssl_statue", "ON"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.mysql_exclusive", "ssl_url"),
 				),
 			},
 			{
@@ -173,6 +175,7 @@ func TestAccTencentCloudMysqlInstanceResource_DeviceType(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckMysqlMasterInstanceExists("tencentcloud_mysql_instance.mysql_exclusive"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_exclusive", "device_type", "EXCLUSIVE"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_exclusive", "ssl_statue", "OFF"),
 				),
 			},
 		},
@@ -465,6 +468,7 @@ resource "tencentcloud_mysql_instance" "mysql_exclusive" {
   force_delete      = true
   device_type       = "EXCLUSIVE"
   param_template_id = var.temporary_param_tmpl_id
+  ssl_status		= "ON"
 }
 `
 
@@ -488,6 +492,7 @@ resource "tencentcloud_mysql_instance" "mysql_exclusive" {
   device_type       = "EXCLUSIVE"
   fast_upgrade      = 1
   param_template_id = var.temporary_param_tmpl_id
+  ssl_status		= "OFF"
 }
 `
 

tencentcloud/services/cdb/service_tencentcloud_mysql.go

@@ -3319,3 +3319,28 @@ func (me *MysqlService) DeleteMysqlDatabaseById(ctx context.Context, instanceId
 
 	return
 }
+
+func (me *MysqlService) DescribeMysqlSslById(ctx context.Context, instanceId string) (ssl *cdb.DescribeSSLStatusResponseParams, errRet error) {
+	logId := tccommon.GetLogId(ctx)
+
+	request := cdb.NewDescribeSSLStatusRequest()
+	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())
+		}
+	}()
+
+	ratelimit.Check(request.GetAction())
+
+	response, err := me.client.UseMysqlClient().DescribeSSLStatus(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	ssl = response.Response
+	return
+}