Commit 70b69b9

authored

fix(cdb): [128074787] tencentcloud_mysql_readonly_instance optimize code logic (#3560)

* add * add * add * add

1 parent bf019b4 commit 70b69b9Copy full SHA for 70b69b9

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	`+resource/tencentcloud_mysql_readonly_instance: optmize code logic`
	`3`	+```

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {`
`182`	`182`	`"cluster_topology": {`
`183`	`183`	`Type: schema.TypeList,`
`184`	`184`	`Optional: true,`
	`185`	`+ Computed: true,`
`185`	`186`	`MaxItems: 1,`
`186`	`187`	`Description: "Cluster Edition node topology configuration. Note: If you purchased a cluster edition instance, this parameter is required. You need to set the RW and RO node topology of the cluster edition instance. The RO node range is 1-5. Please set at least 1 RO node.",`
`187`	`188`	`Elem: &schema.Resource{`
`@@ -325,7 +326,7 @@ func ResourceTencentCloudMysqlInstance() *schema.Resource {`
`325`	`326`	`Optional: true,`
`326`	`327`	`ValidateFunc: tccommon.ValidateAllowedIntValue([]int{0, 1}),`
`327`	`328`	`Default: 0,`
`328`		`- Description: "Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.",`
	`329`	`+ Description: "Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones. Readonly instance settings are not supported.",`
`329`	`330`	`},`
`330`	`331`	`"first_slave_zone": {`
`331`	`332`	`Type: schema.TypeString,`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,9 @@ func ResourceTencentCloudMysqlReadonlyInstance() *schema.Resource {`
`64`	`64`
`65`	`65`	`Importer: &schema.ResourceImporter{`
`66`	`66`	`State: helper.ImportWithDefaultValue(map[string]interface{}{`
`67`		`- "prepaid_period": 1,`
`68`		`- "force_delete": false,`
	`67`	`+ "prepaid_period": 1,`
	`68`	`+ "force_delete": false,`
	`69`	`+ "slave_deploy_mode": 0,`
`69`	`70`	`}),`
`70`	`71`	`},`
`71`	`72`	`Schema: readonlyInstanceInfo,`
`@@ -410,6 +411,9 @@ func resourceTencentCloudMysqlReadonlyInstanceRead(d *schema.ResourceData, meta`
`410`	`411`	`_ = d.Set("ro_group_id", *roGroup.RoGroupId)`
`411`	`412`	`}`
`412`	`413`
	`414`	`+ // set no used fields to default value to fix diff`
	`415`	`+ _ = d.Set("slave_deploy_mode", 0)`
	`416`	`+`
`413`	`417`	`return nil`
`414`	`418`	`}`
`415`	`419`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ If it is not specified, it defaults to a universal instance.`
`233`	`233`	* `root_password` - (Optional, String) Password of root account. This parameter can be specified when you purchase master instances, but it should be ignored when you purchase read-only instances or disaster recovery instances.
`234`	`234`	* `second_slave_zone` - (Optional, String) Zone information about second slave instance.
`235`	`235`	* `security_groups` - (Optional, Set: [`String`]) Security groups to use.
`236`		-* `slave_deploy_mode` - (Optional, Int) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.
	`236`	+* `slave_deploy_mode` - (Optional, Int) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones. Readonly instance settings are not supported.
`237`	`237`	* `slave_sync_mode` - (Optional, Int) Data replication mode. 0 - Async replication; 1 - Semisync replication; 2 - Strongsync replication.
`238`	`238`	* `subnet_id` - (Optional, String) Private network ID. If `vpc_id` is set, this value is required.
`239`	`239`	* `tags` - (Optional, Map) Instance tags.

Comments

(0)