Add volume_size support for gaussdb mysql (#1201)

This adds support for specifying/updating volume size of prePaid
gaussdb mysql instance.

docs/resources/gaussdb_mysql_instance.md

@@ -95,6 +95,9 @@ The following arguments are supported:
 
 * `force_import` - (Optional, Bool) If specified, try to import the instance instead of creating if the name already existed.
 
+* `volume_size` - (Optional, Int) Specifies the volume size of the instance. The new storage space must be greater than
+  the current storage and must be a multiple of 10 GB. Only valid when in prePaid mode.
+
 * `charging_mode` - (Optional, String, ForceNew) The charging mode of the instance.
   Valid values are *prePaid* and *postPaid*, defaults to *postPaid*.
   Changing this creates a new resource.

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/errwrap v1.0.0
 	github.com/hashicorp/go-multierror v1.0.0
 	github.com/hashicorp/terraform-plugin-sdk v1.16.0
-	github.com/huaweicloud/golangsdk v0.0.0-20210602080359-3d6e5cdfc40f
+	github.com/huaweicloud/golangsdk v0.0.0-20210608085437-ebb866377c9f
 	github.com/jen20/awspolicyequivalence v1.1.0
 	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
 	github.com/stretchr/testify v1.4.0

go.sum

@@ -206,10 +206,8 @@ github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/huaweicloud/golangsdk v0.0.0-20210528023633-c90ae4249a71 h1:o2s9CcW277XbOQp0EolTCWHrNdBUHCjuu0aKtAedF/k=
-github.com/huaweicloud/golangsdk v0.0.0-20210528023633-c90ae4249a71/go.mod h1:fcOI5u+0f62JtJd7zkCch/Z57BNC6bhqb32TKuiF4r0=
-github.com/huaweicloud/golangsdk v0.0.0-20210602080359-3d6e5cdfc40f h1:7FSmwn+mnDmezxuOjfDotwmyxQCQOU1waZDLORl7kGc=
-github.com/huaweicloud/golangsdk v0.0.0-20210602080359-3d6e5cdfc40f/go.mod h1:fcOI5u+0f62JtJd7zkCch/Z57BNC6bhqb32TKuiF4r0=
+github.com/huaweicloud/golangsdk v0.0.0-20210608085437-ebb866377c9f h1:uvvd7F4iujOwAP0E0W7H91IrgBt5KI0xE7A6HCwGTj0=
+github.com/huaweicloud/golangsdk v0.0.0-20210608085437-ebb866377c9f/go.mod h1:fcOI5u+0f62JtJd7zkCch/Z57BNC6bhqb32TKuiF4r0=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=

huaweicloud/resource_huaweicloud_gaussdb_mysql_instance.go

@@ -87,6 +87,10 @@ func resourceGaussDBInstance() *schema.Resource {
 				Optional: true,
 				Default:  1,
 			},
+			"volume_size": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 			"time_zone": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -308,6 +312,13 @@ func resourceGaussDBInstanceCreate(d *schema.ResourceData, meta interface{}) err
 		createOpts.MasterAZ = v.(string)
 	}
 
+	if hasFilledOpt(d, "volume_size") {
+		volume := &instances.VolumeOpt{
+			Size: d.Get("volume_size").(int),
+		}
+		createOpts.Volume = volume
+	}
+
 	// PrePaid
 	if d.Get("charging_mode") == "prePaid" {
 		if err := validatePrePaidChargeInfo(d); err != nil {
@@ -433,6 +444,7 @@ func resourceGaussDBInstanceRead(d *schema.ResourceData, meta interface{}) error
 	// set nodes
 	flavor := ""
 	slave_count := 0
+	volume_size := 0
 	nodesList := make([]map[string]interface{}, 0, 1)
 	for _, raw := range instance.Nodes {
 		node := map[string]interface{}{
@@ -445,6 +457,9 @@ func resourceGaussDBInstanceRead(d *schema.ResourceData, meta interface{}) error
 		if len(raw.PrivateIps) > 0 {
 			node["private_read_ip"] = raw.PrivateIps[0]
 		}
+		if raw.Volume.Size > 0 {
+			volume_size = raw.Volume.Size
+		}
 		nodesList = append(nodesList, node)
 		if raw.Type == "slave" && raw.Status == "ACTIVE" {
 			slave_count += 1
@@ -455,6 +470,7 @@ func resourceGaussDBInstanceRead(d *schema.ResourceData, meta interface{}) error
 	}
 	d.Set("nodes", nodesList)
 	d.Set("read_replicas", slave_count)
+	d.Set("volume_size", volume_size)
 	if flavor != "" {
 		log.Printf("[DEBUG] Node Flavor: %s", flavor)
 		d.Set("flavor", flavor)
@@ -589,6 +605,19 @@ func resourceGaussDBInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 		}
 	}
 
+	if d.HasChange("volume_size") {
+		extendOpts := instances.ExtendVolumeOpts{
+			Size:      d.Get("volume_size").(int),
+			IsAutoPay: "true",
+		}
+		log.Printf("[DEBUG] Extending Volume: %#v", extendOpts)
+
+		err = instances.ExtendVolume(client, d.Id(), extendOpts).ExtractErr()
+		if err != nil {
+			return fmt.Errorf("Error extending volume: %s", err)
+		}
+	}
+
 	if d.HasChange("backup_strategy") {
 		var updateOpts backups.UpdateOpts
 		backupRaw := d.Get("backup_strategy").([]interface{})

vendor/modules.txt

@@ -267,7 +267,7 @@ github.com/hashicorp/terraform-svchost/auth
 github.com/hashicorp/terraform-svchost/disco
 # github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d
 github.com/hashicorp/yamux
-# github.com/huaweicloud/golangsdk v0.0.0-20210602080359-3d6e5cdfc40f
+# github.com/huaweicloud/golangsdk v0.0.0-20210608085437-ebb866377c9f
 ## explicit
 github.com/huaweicloud/golangsdk
 github.com/huaweicloud/golangsdk/internal