Merge pull request #625 from rostachen/master

`tencentcloud_as_scaling_config` add `disk_type_policy`

Author: rostachen

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 1.56.7 (Unreleased)
+## 1.56.8 (Unreleased)
+## 1.56.7 (May 12, 2021)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_as_scaling_config` add `disk_type_policy`.
+* Data Source `tencentcloud_as_scaling_configs` add `disk_type_policy` as result.
+
 ## 1.56.6 (May 7, 2021)
 
 BUG FIXES:

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.137
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.155
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -441,10 +441,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.123 h1:6yOMrmTuKtW1Y8VtWgN5Jt3jUcWnWtRX0gZfD1LxRcc=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.123/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.137 h1:NEV2Dp7NofwDsyT0OpY5W0fEqsgsbKETD5gWI7/Nn/s=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.137/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.155 h1:jFyQ7gV9e3HD4yRqTpN6P3+bZwqlYaAhkb87gTc2zT4=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.155/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/data_source_tc_as_scaling_configs.go

@@ -163,6 +163,11 @@ func dataSourceTencentCloudAsScalingConfigs() *schema.Resource {
 							Computed:    true,
 							Description: "The time when the launch configuration was created.",
 						},
+						"disk_type_policy": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Policy of cloud disk type.",
+						},
 					},
 				},
 			},
@@ -201,7 +206,6 @@ func dataSourceTencentCloudAsScalingConfigRead(d *schema.ResourceData, meta inte
 			"image_id":                   *config.ImageId,
 			"project_id":                 *config.ProjectId,
 			"instance_types":             helper.StringsInterfaces(config.InstanceTypes),
-			"system_disk_type":           *config.SystemDisk.DiskType,
 			"system_disk_size":           *config.SystemDisk.DiskSize,
 			"data_disk":                  flattenDataDiskMappings(config.DataDisks),
 			"internet_charge_type":       *config.InternetAccessible.InternetChargeType,
@@ -215,6 +219,10 @@ func dataSourceTencentCloudAsScalingConfigRead(d *schema.ResourceData, meta inte
 			"instance_tags":              flattenInstanceTagsMapping(config.InstanceTags),
 			"status":                     *config.LaunchConfigurationStatus,
 			"create_time":                *config.CreatedTime,
+			"disk_type_policy":           *config.DiskTypePolicy,
+		}
+		if config.SystemDisk.DiskType != nil {
+			mapping["system_disk_type"] = *config.SystemDisk.DiskType
 		}
 		configurationList = append(configurationList, mapping)
 	}

tencentcloud/extension_as.go

@@ -42,6 +42,16 @@ const (
 	SCALING_GROUP_RETRY_POLICY_INCREMENTAL_INTERVALS = "INCREMENTAL_INTERVALS"
 )
 
+const (
+	SCALING_DISK_TYPE_POLICY_ORIGINAL  = "ORIGINAL"
+	SCALING_DISK_TYPE_POLICY_AUTOMATIC = "AUTOMATIC"
+)
+
+var SCALING_DISK_TYPE_ALLOW_POLICY = []string{
+	SCALING_DISK_TYPE_POLICY_ORIGINAL,
+	SCALING_DISK_TYPE_POLICY_AUTOMATIC,
+}
+
 const (
 	SCALING_GROUP_ADJUSTMENT_TYPE_CHANGE_IN_CAPACITY         = "CHANGE_IN_CAPACITY"
 	SCALING_GROUP_ADJUSTMENT_TYPE_EXACT_CAPACITY             = "EXACT_CAPACITY"

tencentcloud/resource_tc_as_scaling_config.go

@@ -93,7 +93,7 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
 				Optional:     true,
 				Default:      SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
 				ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
-				Description:  "Type of a CVM disk. Valid values: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`.",
+				Description:  "Type of a CVM disk. Valid values: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`. valid when disk_type_policy is ORIGINAL.",
 			},
 			"system_disk_size": {
 				Type:         schema.TypeInt,
@@ -114,7 +114,7 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
 							Optional:     true,
 							Default:      SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
 							ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
-							Description:  "Types of disk. Valid values: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
+							Description:  "Types of disk. Valid values: `CLOUD_PREMIUM` and `CLOUD_SSD`. valid when disk_type_policy is ORIGINAL.",
 						},
 						"disk_size": {
 							Type:        schema.TypeInt,
@@ -197,6 +197,13 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
 				Optional:    true,
 				Description: "A list of tags used to associate different resources.",
 			},
+			"disk_type_policy": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      SCALING_DISK_TYPE_POLICY_ORIGINAL,
+				ValidateFunc: validateAllowedStringValue(SCALING_DISK_TYPE_ALLOW_POLICY),
+				Description:  "Policy of cloud disk type. Valid values: `ORIGINAL` and `AUTOMATIC`. Default is `ORIGINAL`.",
+			},
 
 			// Computed values
 			"status": {
@@ -343,6 +350,10 @@ func resourceTencentCloudAsScalingConfigCreate(d *schema.ResourceData, meta inte
 		}
 	}
 
+	if v, ok := d.GetOk("disk_type_policy"); ok {
+		request.DiskTypePolicy = helper.String(v.(string))
+	}
+
 	response, err := meta.(*TencentCloudClient).apiV3Conn.UseAsClient().CreateLaunchConfiguration(request)
 	if err != nil {
 		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
@@ -385,7 +396,6 @@ func resourceTencentCloudAsScalingConfigRead(d *schema.ResourceData, meta interf
 		_ = d.Set("image_id", *config.ImageId)
 		_ = d.Set("project_id", *config.ProjectId)
 		_ = d.Set("instance_types", helper.StringsInterfaces(config.InstanceTypes))
-		_ = d.Set("system_disk_type", *config.SystemDisk.DiskType)
 		_ = d.Set("system_disk_size", *config.SystemDisk.DiskSize)
 		_ = d.Set("data_disk", flattenDataDiskMappings(config.DataDisks))
 		_ = d.Set("internet_charge_type", *config.InternetAccessible.InternetChargeType)
@@ -397,6 +407,10 @@ func resourceTencentCloudAsScalingConfigRead(d *schema.ResourceData, meta interf
 		_ = d.Set("enhanced_monitor_service", *config.EnhancedService.MonitorService.Enabled)
 		_ = d.Set("user_data", helper.PString(config.UserData))
 		_ = d.Set("instance_tags", flattenInstanceTagsMapping(config.InstanceTags))
+		_ = d.Set("disk_type_policy", *config.DiskTypePolicy)
+		if config.SystemDisk.DiskType != nil {
+			_ = d.Set("system_disk_type", *config.SystemDisk.DiskType)
+		}
 		return nil
 	})
 	if err != nil {
@@ -539,6 +553,10 @@ func resourceTencentCloudAsScalingConfigUpdate(d *schema.ResourceData, meta inte
 		}
 	}
 
+	if v, ok := d.GetOk("disk_type_policy"); ok {
+		request.DiskTypePolicy = helper.String(v.(string))
+	}
+
 	response, err := meta.(*TencentCloudClient).apiV3Conn.UseAsClient().UpgradeLaunchConfiguration(request)
 	if err != nil {
 		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",

tencentcloud/service_tencentcloud_as.go

@@ -526,9 +526,11 @@ func flattenDataDiskMappings(list []*as.DataDisk) []map[string]interface{} {
 	result := make([]map[string]interface{}, 0, len(list))
 	for _, v := range list {
 		disk := map[string]interface{}{
-			"disk_type": *v.DiskType,
 			"disk_size": *v.DiskSize,
 		}
+		if v.DiskType != nil {
+			disk["disk_type"] = *v.DiskType
+		}
 		result = append(result, disk)
 	}
 	return result