fix: support ro-mysql cross-zone purchase and query remoteRoZones (#918)

* fix: support ro-mysql cross-zone purchase and query remoteRoZones

* fix: tke unit test

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

tencentcloud/basic_test.go

@@ -134,6 +134,9 @@ const CommonPresetMysql = `
 variable "availability_zone" {
   default = "` + defaultAZone + `"
 }
+variable "region" {
+  default = "` + defaultRegion + `"
+}
 
 data "tencentcloud_mysql_instance" "mysql" {
   instance_name = "` + defaultMySQLName + `"

tencentcloud/data_source_tc_mysql_zone_config.go

@@ -126,6 +126,12 @@ func TencentMysqlZoneConfig() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Zone information about second slave instance.",
 		},
+		"remote_ro_zones": {
+			Type:        schema.TypeList,
+			Elem:        &schema.Schema{Type: schema.TypeString},
+			Computed:    true,
+			Description: "Zone information about remote ro instance.",
+		},
 		"sells": {Type: schema.TypeList,
 			Computed:    true,
 			Description: "A list of supported instance types for sell:",
@@ -250,9 +256,9 @@ func dataSourceTencentMysqlZoneConfigRead(d *schema.ResourceData, meta interface
 		zoneConfig["disaster_recovery_zones"] = disasterRecoveryZones
 
 		var (
-			slaveDeployModes                                  []int
-			firstSlaveZones, secondSlaveZones, engineVersions []string
-			sells                                             []interface{}
+			slaveDeployModes                                                 []int
+			firstSlaveZones, secondSlaveZones, engineVersions, remoteRoZones []string
+			sells                                                            []interface{}
 		)
 		if sellItem.ZoneConf != nil {
 			for _, mode := range sellItem.ZoneConf.DeployMode {
@@ -264,10 +270,14 @@ func dataSourceTencentMysqlZoneConfigRead(d *schema.ResourceData, meta interface
 			for _, zoneName := range sellItem.ZoneConf.BackupZone {
 				secondSlaveZones = append(secondSlaveZones, *zoneName)
 			}
+			for _, zoneName := range sellItem.RemoteRoZone {
+				remoteRoZones = append(remoteRoZones, *zoneName)
+			}
 		}
 		zoneConfig["slave_deploy_modes"] = slaveDeployModes
 		zoneConfig["first_slave_zones"] = firstSlaveZones
 		zoneConfig["second_slave_zones"] = secondSlaveZones
+		zoneConfig["remote_ro_zones"] = remoteRoZones
 
 		for _, mysqlConfigs := range sellItem.SellType {
 			for _, strPtr := range mysqlConfigs.EngineVersion {

tencentcloud/data_source_tc_mysql_zone_config_test.go

@@ -29,6 +29,7 @@ func TestAccDataSourceMysqlZoneConfig_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.slave_deploy_modes.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.first_slave_zones.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.second_slave_zones.#"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.remote_ro_zones.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.sells.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.sells.0.mem_size"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.test", "list.0.sells.0.min_volume_size"),
@@ -53,6 +54,7 @@ func TestAccDataSourceMysqlZoneConfig_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.slave_deploy_modes.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.first_slave_zones.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.second_slave_zones.#"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.remote_ro_zones.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.sells.#"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.sells.0.mem_size"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_zone_config.testWithRegion", "list.0.sells.0.min_volume_size"),

tencentcloud/resource_tc_kubernetes_cluster_test.go

@@ -39,7 +39,6 @@ func TestAccTencentCloudTkeResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testTkeClusterResourceKey, "cluster_external_endpoint"),
 					resource.TestCheckResourceAttr(testTkeClusterResourceKey, "labels.test1", "test1"),
 					resource.TestCheckResourceAttr(testTkeClusterResourceKey, "labels.test2", "test2"),
-					resource.TestCheckResourceAttr(testTkeClusterResourceKey, "unschedulable", "0"),
 				),
 			},
 			{
@@ -155,14 +154,15 @@ data "tencentcloud_vpc_subnets" "vpc" {
 }
 
 resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
-  vpc_id                                     = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id
+  vpc_id                                     = "vpc-rkojp4kn"
   cluster_cidr                               = var.cluster_cidr
   cluster_max_pod_num                        = 32
   cluster_name                               = "test"
   cluster_desc                               = "test cluster desc"
   cluster_max_service_num                    = 32
   cluster_internet                           = true
   cluster_version                            = "1.18.4"
+  cluster_os                                 = "tlinux2.2(tkernel3)x86_64"
   managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
   worker_config {
     count                      = 1
@@ -173,7 +173,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
     internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
     internet_max_bandwidth_out = 100
     public_ip_assigned         = true
-    subnet_id                  = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id
+    subnet_id                  = "subnet-fmcdf57e"
     img_id                     = "img-rkiynh11"
 
     data_disk {
@@ -189,7 +189,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
     enhanced_monitor_service  = false
     user_data                 = "dGVzdA=="
     password                  = "ZZXXccvv1212"
-	cam_role_name			= "CVM_QcsRole"
+	cam_role_name			= "TKE_TEST"
   }
 
   cluster_deploy_type = "MANAGED_CLUSTER"

tencentcloud/resource_tc_mysql_readonly_instance.go

@@ -52,6 +52,12 @@ func resourceTencentCloudMysqlReadonlyInstance() *schema.Resource {
 			ForceNew:    true,
 			Description: "Zone information, this parameter defaults to, the system automatically selects an Availability Zone.",
 		},
+		"master_region": {
+			Type:        schema.TypeString,
+			ForceNew:    true,
+			Optional:    true,
+			Description: "The zone information of the primary instance is required when you purchase a disaster recovery instance.",
+		},
 	}
 
 	basic := TencentMsyqlBasicInfo()
@@ -102,6 +108,11 @@ func mysqlCreateReadonlyInstancePayByMonth(ctx context.Context, d *schema.Resour
 		zone := v.(string)
 		request.Zone = &zone
 	}
+	if v, ok := d.GetOk("master_region"); ok {
+		masterRegion := v.(string)
+		request.MasterRegion = &masterRegion
+	}
+
 	autoRenewFlag := int64(d.Get("auto_renew_flag").(int))
 	request.AutoRenewFlag = &autoRenewFlag
 
@@ -166,6 +177,10 @@ func mysqlCreateReadonlyInstancePayByUse(ctx context.Context, d *schema.Resource
 		zone := v.(string)
 		request.Zone = &zone
 	}
+	if v, ok := d.GetOk("master_region"); ok {
+		masterRegion := v.(string)
+		request.MasterRegion = &masterRegion
+	}
 
 	response, err := meta.(*TencentCloudClient).apiV3Conn.UseMysqlClient().CreateDBInstanceHour(request)
 	if err != nil {
@@ -309,6 +324,7 @@ func resourceTencentCloudMysqlReadonlyInstanceRead(d *schema.ResourceData, meta
 		}
 		_ = d.Set("master_instance_id", *mysqlInfo.MasterInfo.InstanceId)
 		_ = d.Set("zone", *mysqlInfo.Zone)
+		_ = d.Set("master_region", *mysqlInfo.MasterInfo.Region)
 
 		return nil
 	})

tencentcloud/resource_tc_mysql_readonly_instance_test.go

@@ -133,6 +133,7 @@ resource "tencentcloud_mysql_readonly_instance" "mysql_readonly" {
   volume_size        = 200
   instance_name      = "mysql-readonly-test"
   intranet_port      = 3360
+  master_region = var.region
   zone = var.availability_zone
   tags = {
     test = "test-tf"
@@ -151,6 +152,7 @@ resource "tencentcloud_mysql_readonly_instance" "mysql_readonly" {
   volume_size        = 200
   instance_name      = "mysql-readonly-test"
   intranet_port      = 3360
+  master_region = var.region
   zone = var.availability_zone
   tags = {
     test = "test-tf"
@@ -170,48 +172,11 @@ resource "tencentcloud_mysql_readonly_instance" "mysql_readonly" {
   volume_size        = 200
   instance_name      = "%s"
   intranet_port      = %s 
+  master_region = var.region
   zone = var.availability_zone
   tags = {
     test = "test-tf"
   }
 }
 	`, mysqlTestCase, instance_name, instranet_port)
 }
-
-func testAccMysqlReadonlyInstancePrepaid(mysqlTestCase string) string {
-	return fmt.Sprintf(`
-%s
-resource "tencentcloud_mysql_readonly_instance" "mysql_readonly_prepaid" {
-  master_instance_id = local.mysql_id
-  mem_size           = 2000
-  cpu                = 1
-  volume_size        = 200
-  instance_name      = "mysql-readonly-test"
-  intranet_port      = 3360
-  pay_type = 0
-  force_delete = true
-  tags = {
-    test = "test-tf"
-  }
-}
-	`, mysqlTestCase)
-}
-
-func testAccMysqlReadonlyInstancePrepaid_update(mysqlTestCase string, renewFlag int) string {
-	return fmt.Sprintf(`
-%s
-resource "tencentcloud_mysql_readonly_instance" "mysql_readonly_prepaid" {
-  master_instance_id = local.mysql_id
-  mem_size           = 2000
-  volume_size        = 200
-  instance_name      = "mysql-readonly-test"
-  intranet_port      = 3360
-  auto_renew_flag    = %d
-  tags = {
-    test = "test-tf"
-  }
-  pay_type = 0
-  force_delete = true
-}
-	`, mysqlTestCase, renewFlag)
-}

website/docs/d/mysql_zone_config.html.markdown

@@ -39,6 +39,7 @@ In addition to all arguments above, the following attributes are exported:
   * `is_support_disaster_recovery` - Indicates whether recovery is supported: `0` - No; `1` - Yes.
   * `is_support_vpc` - Indicates whether VPC is supported: `0` - No; `1` - Yes.
   * `name` - The name of available zone which is equal to a specific datacenter.
+  * `remote_ro_zones` - Zone information about remote ro instance.
   * `second_slave_zones` - Zone information about second slave instance.
   * `sells` - A list of supported instance types for sell:
     * `max_volume_size` - Maximum disk size (in GB).

website/docs/r/mysql_readonly_instance.html.markdown

@@ -46,6 +46,7 @@ The following arguments are supported:
 * `cpu` - (Optional) CPU cores.
 * `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.
 * `intranet_port` - (Optional) Public access port. Valid value ranges: [1024~65535]. The default value is `3306`.
+* `master_region` - (Optional, ForceNew) The zone information of the primary instance is required when you purchase a disaster recovery instance.
 * `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `charge_type` instead. Pay type of instance. Valid values: `0`, `1`. `0`: prepaid, `1`: postpaid.
 * `period` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `prepaid_period` instead. Period of instance. NOTES: Only supported prepaid instance.
 * `prepaid_period` - (Optional) Period of instance. NOTES: Only supported prepaid instance.