Merge pull request #169 from oliverpei/master

support reserved instance

Author: likexian

CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.20.2 (Unreleased)
+## 1.21.0 (Unreleased)
+
+FEATURES:
+
+* **New Data Source**: `tencentcloud_reserved_instance_configs`
+* **New Data Source**: `tencentcloud_reserved_instances`
+* **New Resource**: `tencentcloud_reserved_instance`
 
 ENHANCEMENTS:
 

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/hashicorp/terraform v0.12.3
 	github.com/likexian/gokit v0.0.0-20190604165112-68b8a4ba758c
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/tencentcloud/tencentcloud-sdk-go v3.0.87-0.20190912121957-c0615982c83b+incompatible
+	github.com/tencentcloud/tencentcloud-sdk-go v3.0.89-0.20191011161912-cf7a17a053dc+incompatible
 	github.com/terraform-providers/terraform-provider-template v1.0.0
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zqfan/tencentcloud-sdk-go v0.0.0-0.20181105105106-4c76f78ff2e6

go.sum

@@ -444,8 +444,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod h1:BSTlc8jOjh0niykqEGVXOLXdi9o0r0kR8tCYiMvjFgw=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.87-0.20190912121957-c0615982c83b+incompatible h1:sDNLz6GOccksu6f0BQGCvIrgVNVEsEMPWlavN/OOwRc=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.87-0.20190912121957-c0615982c83b+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.89-0.20191011161912-cf7a17a053dc+incompatible h1:h17QeWh1jk/uNz+ITJYiIzoSnOsMBH8Y81a+u28xwRc=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.89-0.20191011161912-cf7a17a053dc+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
 github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod h1:2aQ6n/BtChAl1y2S60vebhyJyZXBsuAI5G4+lHrT1Ew=
 github.com/terraform-providers/terraform-provider-template v1.0.0 h1:g2pyFaAJu369iAb7qGWmVwtQ15/35lRAfW91Je8wLjE=
 github.com/terraform-providers/terraform-provider-template v1.0.0/go.mod h1:/J+B8me5DCMa0rEBH5ic2aKPjhtpWNeScmxFJWxB1EU=

tencentcloud/data_source_tc_reserved_instance_configs.go

@@ -0,0 +1,162 @@
+/*
+Use this data source to query reserved instances configuration.
+
+Example Usage
+
+```hcl
+data "tencentcloud_reserved_instance_configs" "config" {
+  availability_zone = "na-siliconvalley-1"
+}
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"log"
+	"strconv"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/schema"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+)
+
+func dataSourceTencentCloudReservedInstanceConfigs() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudReservedInstanceConfigsRead,
+
+		Schema: map[string]*schema.Schema{
+			"availability_zone": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The available zone that the reserved instance locates at.",
+			},
+			"duration": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				ValidateFunc: validateAllowedIntValue([]int{31536000, 94608000}),
+				Description:  "Validity period of the reserved instance. Valid values are 31536000(1 year) and 94608000(3 years).",
+			},
+			"instance_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The type of reserved instance.",
+			},
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+
+			// computed
+			"config_list": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "An information list of reserved instance configuration. Each element contains the following attributes:",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"config_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Configuration ID of the purchasable reserved instance.",
+						},
+						"availability_zone": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Availability zone of the purchasable reserved instance.",
+						},
+						"instance_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Instance type of the reserved instance.",
+						},
+						"duration": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Validity period of the reserved instance.",
+						},
+						"price": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Purchase price of the reserved instance.",
+						},
+						"currency_code": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Settlement currency of the reserved instance, which is a standard currency code as listed in ISO 4217.",
+						},
+						"platform": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Platform of the reserved instance.",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudReservedInstanceConfigsRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_reserved_instance_configs.read")()
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), "logId", logId)
+	cvmService := CvmService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+
+	filter := make(map[string]string)
+	if v, ok := d.GetOk("availability_zone"); ok {
+		filter["zone"] = v.(string)
+	}
+	if v, ok := d.GetOk("duration"); ok {
+		filter["duration"] = strconv.Itoa(v.(int))
+	}
+	if v, ok := d.GetOk("instance_type"); ok {
+		filter["instance-type"] = v.(string)
+	}
+
+	var configs []*cvm.ReservedInstancesOffering
+	var errRet error
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		configs, errRet = cvmService.DescribeReservedInstanceConfigs(ctx, filter)
+		if errRet != nil {
+			return retryError(errRet, "InternalError")
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	configList := make([]map[string]interface{}, 0, len(configs))
+	ids := make([]string, 0, len(configs))
+	for _, config := range configs {
+		mapping := map[string]interface{}{
+			"config_id":         config.ReservedInstancesOfferingId,
+			"availability_zone": config.Zone,
+			"instance_type":     config.InstanceType,
+			"duration":          config.Duration,
+			"price":             config.FixedPrice,
+			"currency_code":     config.CurrencyCode,
+			"platform":          config.ProductDescription,
+		}
+		configList = append(configList, mapping)
+		ids = append(ids, *config.ReservedInstancesOfferingId)
+	}
+
+	d.SetId(dataResourceIdsHash(ids))
+	err = d.Set("config_list", configList)
+	if err != nil {
+		log.Printf("[CRITAL]%s provider set config list fail, reason:%s\n ", logId, err.Error())
+		return err
+	}
+
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if err := writeToFile(output.(string), configList); err != nil {
+			return err
+		}
+	}
+	return nil
+}

tencentcloud/data_source_tc_reserved_instance_configs_test.go

@@ -0,0 +1,28 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccTencentCloudReservedInstanceConfigsDataSource(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccReservedInstanceConfigsDataSource,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.tencentcloud_reserved_instance_configs.configs", "config_list.#"),
+				),
+			},
+		},
+	})
+}
+
+const testAccReservedInstanceConfigsDataSource = `
+data "tencentcloud_reserved_instance_configs" "configs" {
+  availability_zone = "ap-guangzhou-2"
+}
+`

tencentcloud/data_source_tc_reserved_instances.go

@@ -0,0 +1,161 @@
+/*
+Use this data source to query reserved instances.
+
+Example Usage
+
+```hcl
+data "tencentcloud_reserved_instances" "instances" {
+  availability_zone = "na-siliconvalley-1"
+  instance_type = "S2.MEDIUM8"
+}
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"log"
+
+	"github.com/hashicorp/terraform/helper/resource"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+)
+
+func dataSourceTencentCloudReservedInstances() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudReservedInstancesRead,
+
+		Schema: map[string]*schema.Schema{
+			"reserved_instance_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "ID of the reserved instance to be query.",
+			},
+			"availability_zone": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The available zone that the reserved instance locates at.",
+			},
+			"instance_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The type of reserved instance.",
+			},
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+
+			// computed
+			"reserved_instance_list": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "An information list of reserved instance. Each element contains the following attributes:",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"reserved_instance_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "ID of the reserved instance.",
+						},
+						"instance_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The type of reserved instance.",
+						},
+						"instance_count": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Number of reserved instance.",
+						},
+						"availability_zone": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Availability zone of the reserved instance.",
+						},
+						"start_time": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Start time of the reserved instance.",
+						},
+						"end_time": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Expiry time of the reserved instance.",
+						},
+						"status": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Status of the reserved instance.",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudReservedInstancesRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_reserved_instances.read")
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), "logId", logId)
+	cvmService := CvmService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+
+	filter := make(map[string]string)
+	if v, ok := d.GetOk("reserved_instance_id"); ok {
+		filter["reserved-instances-id"] = v.(string)
+	}
+	if v, ok := d.GetOk("availability_zone"); ok {
+		filter["zone"] = v.(string)
+	}
+	if v, ok := d.GetOk("instance_type"); ok {
+		filter["instance-type"] = v.(string)
+	}
+
+	var instances []*cvm.ReservedInstances
+	var errRet error
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		instances, errRet = cvmService.DescribeReservedInstanceByFilter(ctx, filter)
+		if errRet != nil {
+			return retryError(errRet, "InternalError")
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	instanceList := make([]map[string]interface{}, 0, len(instances))
+	ids := make([]string, 0, len(instances))
+	for _, instance := range instances {
+		mapping := map[string]interface{}{
+			"reserved_instance_id": instance.ReservedInstancesId,
+			"instance_type":        instance.InstanceType,
+			"instance_count":       instance.InstanceCount,
+			"availability_zone":    instance.Zone,
+			"start_time":           instance.StartTime,
+			"end_time":             instance.EndTime,
+			"status":               instance.State,
+		}
+		instanceList = append(instanceList, mapping)
+		ids = append(ids, *instance.ReservedInstancesId)
+	}
+	d.SetId(dataResourceIdsHash(ids))
+	err = d.Set("reserved_instance_list", instanceList)
+	if err != nil {
+		log.Printf("[CRITAL]%s provider set reserved instance list fail, reason:%s\n ", logId, err.Error())
+		return err
+	}
+
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if err := writeToFile(output.(string), instanceList); err != nil {
+			return err
+		}
+	}
+	return nil
+}