Merge pull request #2125 from tencentcloudstack/feate/cynosdb-readonly-vpc

feat: support vpc

Author: andrew-tx

.changelog/2125.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_cynosdb_readonly_instance: Support `vpc_id`, `subnet_id` fields.
+```

tencentcloud/resource_tc_cynosdb_readonly_instance.go

@@ -67,6 +67,18 @@ func resourceTencentCloudCynosdbReadonlyInstance() *schema.Resource {
 			Default:     false,
 			Description: "Indicate whether to delete readonly instance directly or not. Default is false. If set true, instance will be deleted instead of staying recycle bin. Note: works for both `PREPAID` and `POSTPAID_BY_HOUR` cluster.",
 		},
+		"vpc_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "ID of the VPC.",
+		},
+		"subnet_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "ID of the subnet within this VPC.",
+		},
 	}
 	basic := TencentCynosdbInstanceBaseInfo()
 	delete(basic, "instance_id")
@@ -108,6 +120,14 @@ func resourceTencentCloudCynosdbReadonlyInstanceCreate(d *schema.ResourceData, m
 	request.Memory = helper.IntInt64(d.Get("instance_memory_size").(int))
 	request.ReadOnlyCount = helper.Int64(1)
 
+	// vpc
+	if v, ok := d.GetOk("vpc_id"); ok {
+		request.VpcId = helper.String(v.(string))
+	}
+	if v, ok := d.GetOk("subnet_id"); ok {
+		request.SubnetId = helper.String(v.(string))
+	}
+
 	var response *cynosdb.AddInstancesResponse
 	var err error
 	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -175,6 +195,12 @@ func resourceTencentCloudCynosdbReadonlyInstanceRead(d *schema.ResourceData, met
 	_ = d.Set("instance_name", instance.InstanceName)
 	_ = d.Set("instance_status", instance.Status)
 	_ = d.Set("instance_storage_size", instance.Storage)
+	if instance.VpcId != nil {
+		_ = d.Set("vpc_id", instance.VpcId)
+	}
+	if instance.SubnetId != nil {
+		_ = d.Set("subnet_id", instance.SubnetId)
+	}
 
 	maintain, err := cynosdbService.DescribeMaintainPeriod(ctx, id)
 	if err != nil {
@@ -245,6 +271,10 @@ func resourceTencentCloudCynosdbReadonlyInstanceUpdate(d *schema.ResourceData, m
 
 	}
 
+	if d.HasChange("vpc_id") || d.HasChange("subnet_id") {
+		return fmt.Errorf("`vpc_id`, `subnet_id` do not support change now.")
+	}
+
 	d.Partial(false)
 
 	return resourceTencentCloudCynosdbReadonlyInstanceRead(d, meta)

tencentcloud/resource_tc_cynosdb_readonly_instance_test.go

@@ -30,6 +30,8 @@ func TestAccTencentCloudCynosdbReadonlyInstanceResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_readonly_instance.foo", "instance_memory_size"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_readonly_instance.foo", "instance_status"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_readonly_instance.foo", "instance_storage_size"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_readonly_instance.foo", "vpc_id", "vpc-4owdpnwr"),
+					resource.TestCheckResourceAttr("tencentcloud_cynosdb_readonly_instance.foo", "subnet_id", "subnet-m4qpx38w"),
 				),
 			},
 			{
@@ -102,7 +104,13 @@ func testAccCheckCynosdbReadonlyInstanceExists(n string) resource.TestCheckFunc
 	}
 }
 
-const testAccCynosdbReadonlyInstance = testAccCynosdbBasic + `
+const readonlyInstanceVar = `
+variable "readonly_subnet" {
+  default = "subnet-m4qpx38w"
+}
+`
+
+const testAccCynosdbReadonlyInstance = testAccCynosdbBasic + readonlyInstanceVar + `
 resource "tencentcloud_cynosdb_cluster" "foo" {
   available_zone               = var.availability_zone
   vpc_id                       = var.my_vpc
@@ -148,6 +156,8 @@ resource "tencentcloud_cynosdb_readonly_instance" "foo" {
   force_delete         = true
   instance_cpu_core    = 1
   instance_memory_size = 2
+  vpc_id               = var.my_vpc
+  subnet_id            = var.readonly_subnet
 
   instance_maintain_duration   = 3600
   instance_maintain_start_time = 10800

tencentcloud/service_tencentcloud_cynosdb.go

@@ -365,6 +365,13 @@ func (me *CynosdbService) DescribeInstanceById(ctx context.Context, instanceId s
 	}
 
 	instanceInfo = response.Response.Detail
+
+	if instanceInfo.VpcId != nil {
+		instanceInfo.VpcId = instances[0].VpcId
+	}
+	if instanceInfo.SubnetId != nil {
+		instanceInfo.SubnetId = instances[0].SubnetId
+	}
 	return
 }
 

website/docs/r/cynosdb_readonly_instance.html.markdown

@@ -47,6 +47,8 @@ The following arguments are supported:
 * `instance_maintain_start_time` - (Optional, Int) Offset time from 00:00, unit in second. For example, 03:00am should be `10800`. `10800` by default.
 * `instance_maintain_weekdays` - (Optional, Set: [`String`]) Weekdays for maintenance. `["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]` by default.
 * `instance_memory_size` - (Optional, Int) Memory capacity of read-write type instance, unit in GB. Required while creating normal cluster. Note: modification of this field will take effect immediately, if want to upgrade on maintenance window, please upgrade from console.
+* `subnet_id` - (Optional, String) ID of the subnet within this VPC.
+* `vpc_id` - (Optional, String) ID of the VPC.
 
 ## Attributes Reference