Merge pull request #526 from cyberHermanwang/mysql

modify mysql argument  to support mysql 8.0

Author: gailwang

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ENHANCEMENTS:
 
+* Resource: `tencentcloud_mysql_instance` modify argument `engine_version` to support mysql 8.0.
 * Resource: `tencentcloud_clb_listener_rule` add new argument `forward_type` to support backend protocol([#522](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/522))
 * Resource: `tencentcloud_instance` add new argument `keep_image_login` to support keeping image login.
 

tencentcloud/data_source_tc_mysql_instance.go

@@ -68,8 +68,8 @@ func dataSourceTencentCloudMysqlInstance() *schema.Resource {
 			"engine_version": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validateAllowedStringValue([]string{"5.1", "5.5", "5.6", "5.7"}),
-				Description:  "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7.",
+				ValidateFunc: validateAllowedStringValue([]string{"5.1", "5.5", "5.6", "5.7", "8.0"}),
+				Description:  "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0.",
 			},
 			"init_flag": {
 				Type:         schema.TypeInt,
@@ -159,7 +159,7 @@ func dataSourceTencentCloudMysqlInstance() *schema.Resource {
 						"engine_version": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7.",
+							Description: "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0.",
 						},
 						"cpu_core_count": {
 							Type:        schema.TypeInt,

tencentcloud/extension_mysql.go

@@ -72,7 +72,7 @@ var MysqlDelStates = map[int64]bool{
 //mysql available period value
 var MYSQL_AVAILABLE_PERIOD = []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36}
 
-var MYSQL_SUPPORTS_ENGINE = []string{"5.5", "5.6", "5.7"}
+var MYSQL_SUPPORTS_ENGINE = []string{"5.5", "5.6", "5.7", "8.0"}
 
 //automatic renewal status code
 const (

tencentcloud/resource_tc_mysql_instance.go

@@ -226,8 +226,8 @@ func resourceTencentCloudMysqlInstance() *schema.Resource {
 			ForceNew:     true,
 			Optional:     true,
 			ValidateFunc: validateAllowedStringValue(MYSQL_SUPPORTS_ENGINE),
-			Default:      MYSQL_SUPPORTS_ENGINE[len(MYSQL_SUPPORTS_ENGINE)-1],
-			Description:  "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7, and default is 5.7.",
+			Default:      MYSQL_SUPPORTS_ENGINE[len(MYSQL_SUPPORTS_ENGINE)-2],
+			Description:  "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0, and default is 5.7.",
 		},
 
 		"availability_zone": {

website/docs/d/mysql_instance.html.markdown

@@ -25,7 +25,7 @@ data "tencentcloud_mysql_instance" "database" {
 The following arguments are supported:
 
 * `charge_type` - (Optional) Pay type of instance, valid values are `PREPAID` and `POSTPAID`.
-* `engine_version` - (Optional) The version number of the database engine to use. Supported versions include 5.5/5.6/5.7.
+* `engine_version` - (Optional) The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0.
 * `init_flag` - (Optional) Initialization mark. Available values: 0 - Uninitialized; 1 - Initialized.
 * `instance_name` - (Optional) Name of mysql instance.
 * `instance_role` - (Optional) Instance type. Supported values include: master - master instance, dr - disaster recovery instance, and ro - read-only instance.
@@ -52,7 +52,7 @@ In addition to all arguments above, the following attributes are exported:
   * `dead_line_time` - Expire date of instance. NOTES: Only supported prepay instance.
   * `device_type` - Supported instance model.HA - high available version; Basic - basic version.
   * `dr_instance_ids` - ID list of disaster-recovery type associated with the current instance.
-  * `engine_version` - The version number of the database engine to use. Supported versions include 5.5/5.6/5.7.
+  * `engine_version` - The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0.
   * `init_flag` - Initialization mark. Available values: 0 - Uninitialized; 1 - Initialized.
   * `instance_name` - Name of mysql instance.
   * `instance_role` - Instance type. Supported values include: master - master instance, dr - disaster recovery instance, and ro - read-only instance.

website/docs/r/mysql_instance.html.markdown

@@ -56,7 +56,7 @@ The following arguments are supported:
 * `auto_renew_flag` - (Optional) Auto renew flag. NOTES: Only supported prepaid instance.
 * `availability_zone` - (Optional, ForceNew) Indicates which availability zone will be used.
 * `charge_type` - (Optional, ForceNew) Pay type of instance, valid values are `PREPAID`, `POSTPAID`. Default is `POSTPAID`.
-* `engine_version` - (Optional, ForceNew) The version number of the database engine to use. Supported versions include 5.5/5.6/5.7, and default is 5.7.
+* `engine_version` - (Optional, ForceNew) The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0, and default is 5.7.
 * `first_slave_zone` - (Optional, ForceNew) Zone information about first slave instance.
 * `force_delete` - (Optional) 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. When the main mysql instance set true, this para of the readonly mysql instance will not take effect.
 * `internet_service` - (Optional) Indicates whether to enable the access to an instance from public network: 0 - No, 1 - Yes.