feat: support mysql ssl

Author: gitmkn

tencentcloud/services/cdb/resource_tc_mysql_dr_instance.go

@@ -205,6 +205,7 @@ func ResourceTencentCloudMysqlDrInstance() *schema.Resource {
 			},
 			"ssl_status": {
 				Optional:    true,
+				Computed:    true,
 				Type:        schema.TypeString,
 				Description: "Whether to enable SSL. `ON` means enabled, `OFF` means not enabled. Default: `OFF`.",
 			},

tencentcloud/services/cdb/resource_tc_mysql_instance.go

@@ -173,11 +173,6 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Switch the method of accessing new instances, default is `0`. Supported values include: `0` - switch immediately, `1` - switch in time window.",
 		},
-		"ssl_status": {
-			Optional:    true,
-			Type:        schema.TypeString,
-			Description: "Whether to enable SSL. `ON` means enabled, `OFF` means not enabled. Default: `OFF`.",
-		},
 		// Computed values
 		"intranet_ip": {
 			Type:        schema.TypeString,
@@ -206,12 +201,6 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Indicates whether GTID is enable. `0` - Not enabled; `1` - Enabled.",
 		},
-
-		"ssl_url": {
-			Computed:    true,
-			Type:        schema.TypeString,
-			Description: "The certificate download link. Example value: http://testdownload.url.",
-		},
 	}
 }
 
@@ -292,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": {
@@ -304,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()
@@ -1295,7 +1296,7 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		}
 	}
 
-	if d.HasChange("ssl_status") {
+	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

tencentcloud/services/cdb/resource_tc_mysql_readonly_instance.go

@@ -259,12 +259,6 @@ func resourceTencentCloudMysqlReadonlyInstanceCreate(d *schema.ResourceData, met
 		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)
@@ -382,27 +376,6 @@ func resourceTencentCloudMysqlReadonlyInstanceRead(d *schema.ResourceData, meta
 	_ = d.Set("status", mysqlInfo.Status)
 	_ = d.Set("task_status", mysqlInfo.TaskStatus)
 
-	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
 }
 

website/docs/r/mysql_dr_instance.html.markdown

@@ -67,6 +67,7 @@ The following arguments are supported:
 * `security_groups` - (Optional, Set: [`String`]) Security groups to use.
 * `slave_deploy_mode` - (Optional, Int) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.
 * `slave_sync_mode` - (Optional, Int) Data replication mode. 0 - Async replication; 1 - Semisync replication; 2 - Strongsync replication.
+* `ssl_status` - (Optional, String) Whether to enable SSL. `ON` means enabled, `OFF` means not enabled. Default: `OFF`.
 * `subnet_id` - (Optional, String) Private network ID. If `vpc_id` is set, this value is required.
 * `tags` - (Optional, Map) Instance tags.
 * `vpc_id` - (Optional, String) ID of VPC, which can be modified once every 24 hours and can't be removed.
@@ -77,6 +78,7 @@ In addition to all arguments above, the following attributes are exported:
 
 * `id` - ID of the resource.
 * `intranet_ip` - instance intranet IP.
+* `ssl_url` - The certificate download link. Example value: http://testdownload.url.
 
 
 ## Import

website/docs/r/mysql_instance.html.markdown

@@ -162,6 +162,7 @@ The following arguments are supported:
 * `security_groups` - (Optional, Set: [`String`]) Security groups to use.
 * `slave_deploy_mode` - (Optional, Int) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.
 * `slave_sync_mode` - (Optional, Int) Data replication mode. 0 - Async replication; 1 - Semisync replication; 2 - Strongsync replication.
+* `ssl_status` - (Optional, String) Whether to enable SSL. `ON` means enabled, `OFF` means not enabled. Default: `OFF`.
 * `subnet_id` - (Optional, String) Private network ID. If `vpc_id` is set, this value is required.
 * `tags` - (Optional, Map) Instance tags.
 * `upgrade_subversion` - (Optional, Int) Whether it is a kernel subversion upgrade, supported values: 1 - upgrade the kernel subversion; 0 - upgrade the database engine version. Only need to fill in when upgrading kernel subversion and engine version.
@@ -178,6 +179,7 @@ In addition to all arguments above, the following attributes are exported:
 * `internet_port` - Access port for public access.
 * `intranet_ip` - instance intranet IP.
 * `locked` - Indicates whether the instance is locked. Valid values: `0`, `1`. `0` - No; `1` - Yes.
+* `ssl_url` - The certificate download link. Example value: http://testdownload.url.
 * `status` - Instance status. Valid values: `0`, `1`, `4`, `5`. `0` - Creating; `1` - Running; `4` - Isolating; `5` - Isolated.
 * `task_status` - Indicates which kind of operations is being executed.