Merge remote-tracking branch 'clb/master'

Author: ttomzhou

CHANGELOG.md

@@ -9,6 +9,20 @@ DEPRECATED:
 
 * Resource: `tencentcloud_kubernetes_as_scaling_group` replaced by `tencentcloud_kubernetes_node_pool`.
 
+ENHANCEMENTS:
+
+* Resource `tencentcloud_ccn` add `charge_type` to support billing mode setting.
+* Resource `tencentcloud_ccn` add `bandwidth_limit_type` to support the speed limit type setting.
+* Resource `tencentcloud_ccn_bandwidth_limit` add `dst_region` to support destination area restriction setting.
+* Resource `tencentcloud_cdn_domain` add `range_origin_switch` to support range back to source configuration.
+* Resource `tencentcloud_cdn_domain` add `rule_cache` to support advanced path cache configuration.
+* Resource `tencentcloud_cdn_domain` add `request_header` to support request header configuration.
+* Data Source `tencentcloud_ccn_instances` add `charge_type` to support billing mode.
+* Data Source `tencentcloud_ccn_instances` add `bandwidth_limit_type` to support the speed limit type.
+* Data Source `tencentcloud_ccn_bandwidth_limit` add `dst_region` to support destination area restriction.
+* Data Source `tencentcloud_cdn_domains` add `range_origin_switch` to support range back to source configuration.
+* Data Source `tencentcloud_cdn_domains` add `rule_cache` to support advanced path cache configuration.
+* Data Source `tencentcloud_cdn_domains` add `request_header` to support request header configuration.
 
 ## 1.51.1 (December 22, 2020)
 

examples/tencentcloud-cdn/main.tf

@@ -2,6 +2,25 @@ resource "tencentcloud_cdn_domain" "foo" {
   domain       = "xxxx.com"
   service_type = "web"
   area         = "mainland"
+  range_origin_switch = "off"
+
+  rule_cache{
+  	cache_time = 10000
+  	no_cache_switch="on"
+  	re_validate="on"
+  }
+
+  request_header{
+  	switch = "on"
+
+  	header_rules {
+  		header_mode = "add"
+  		header_name = "tf-header-name"
+  		header_value = "tf-header-value"
+  		rule_type = "all"
+  		rule_paths = ["*"]
+  	}
+  }
 
   origin {
     origin_type          = "ip"

tencentcloud/data_source_tc_ccn_bandwidth_limits.go

@@ -66,6 +66,11 @@ func dataSourceTencentCloudCcnBandwidthLimits() *schema.Resource {
 							Computed:    true,
 							Description: "Limitation of bandwidth.",
 						},
+						"dst_region": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Destination area restriction.",
+						},
 					},
 				},
 			},
@@ -85,7 +90,7 @@ func dataSourceTencentCloudCcnBandwidthLimitsRead(d *schema.ResourceData, meta i
 		ccnId = d.Get("ccn_id").(string)
 	)
 
-	var infos, err = service.DescribeCcnRegionBandwidthLimits(ctx, ccnId)
+	var infos, err = service.GetCcnRegionBandwidthLimits(ctx, ccnId)
 	if err != nil {
 		return err
 	}
@@ -94,8 +99,9 @@ func dataSourceTencentCloudCcnBandwidthLimitsRead(d *schema.ResourceData, meta i
 
 	for _, item := range infos {
 		var infoMap = make(map[string]interface{})
-		infoMap["region"] = item.region
-		infoMap["bandwidth_limit"] = item.limit
+		infoMap["region"] = item.Region
+		infoMap["bandwidth_limit"] = item.BandwidthLimit
+		infoMap["dst_region"] = item.DstRegion
 		infoList = append(infoList, infoMap)
 	}
 	if err := d.Set("limits", infoList); err != nil {

tencentcloud/data_source_tc_ccn_bandwidth_limits_test.go

@@ -6,27 +6,50 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceTencentCloudCcnV3BandwidthLimitsBasic(t *testing.T) {
+func TestAccDataSourceTencentCloudCcnV3BandwidthLimitsOuter(t *testing.T) {
 	keyName := "data.tencentcloud_ccn_bandwidth_limits.limit"
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: TestAccDataSourceTencentCloudCcnBandwidthLimits,
+				Config: TestAccDataSourceTencentCloudCcnOuterBandwidthLimits,
 
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckTencentCloudDataSourceID(keyName),
 					resource.TestCheckResourceAttrSet(keyName, "ccn_id"),
-					resource.TestCheckResourceAttrSet(keyName, "limits.#"),
+					resource.TestCheckResourceAttr(keyName, "limits.#", "1"),
+					resource.TestCheckResourceAttr(keyName, "limits.0.region", "ap-shanghai"),
+					resource.TestCheckResourceAttr(keyName, "limits.0.bandwidth_limit", "500"),
 				),
 			},
 		},
 	})
 }
 
-const TestAccDataSourceTencentCloudCcnBandwidthLimits = `
+func TestAccDataSourceTencentCloudCcnV3BandwidthLimitsInter(t *testing.T) {
+	keyName := "data.tencentcloud_ccn_bandwidth_limits.limit"
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: TestAccDataSourceTencentCloudCcnInterBandwidthLimits,
 
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID(keyName),
+					resource.TestCheckResourceAttrSet(keyName, "ccn_id"),
+					resource.TestCheckResourceAttr(keyName, "limits.#", "1"),
+					resource.TestCheckResourceAttr(keyName, "limits.0.region", "ap-shanghai"),
+					resource.TestCheckResourceAttr(keyName, "limits.0.dst_region", "ap-beijing"),
+					resource.TestCheckResourceAttr(keyName, "limits.0.bandwidth_limit", "500"),
+				),
+			},
+		},
+	})
+}
+
+const TestAccDataSourceTencentCloudCcnOuterBandwidthLimits = `
 variable "other_region1" {
   default = "ap-shanghai"
 }
@@ -37,13 +60,41 @@ resource tencentcloud_ccn main {
   qos         = "AG"
 }
 
+resource tencentcloud_ccn_bandwidth_limit limit1 {
+  ccn_id          = tencentcloud_ccn.main.id
+  region          = var.other_region1
+  bandwidth_limit = 500
+}
+
 data tencentcloud_ccn_bandwidth_limits limit {
-  ccn_id = tencentcloud_ccn.main.id
+  ccn_id = tencentcloud_ccn_bandwidth_limit.limit1.ccn_id
+}
+`
+
+const TestAccDataSourceTencentCloudCcnInterBandwidthLimits = `
+variable "other_region1" {
+  default = "ap-shanghai"
+}
+
+variable "other_region2" {
+  default = "ap-beijing"
+}
+
+resource tencentcloud_ccn main {
+  name                 = "ci-temp-test-ccn"
+  description          = "ci-temp-test-ccn-des"
+  qos                  = "AG"
+  bandwidth_limit_type = "INTER_REGION_LIMIT"
 }
 
 resource tencentcloud_ccn_bandwidth_limit limit1 {
   ccn_id          = tencentcloud_ccn.main.id
   region          = var.other_region1
+  dst_region      = var.other_region2
   bandwidth_limit = 500
 }
+
+data tencentcloud_ccn_bandwidth_limits limit {
+  ccn_id = tencentcloud_ccn_bandwidth_limit.limit1.ccn_id
+}
 `

tencentcloud/data_source_tc_ccn_instances.go

@@ -84,6 +84,16 @@ func dataSourceTencentCloudCcnInstances() *schema.Resource {
 							Computed:    true,
 							Description: "States of instance. The available value include 'ISOLATED'(arrears) and 'AVAILABLE'.",
 						},
+						"charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Billing mode.",
+						},
+						"bandwidth_limit_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The speed limit type.",
+						},
 						"attachment_list": {
 							Type:        schema.TypeList,
 							Computed:    true,
@@ -178,6 +188,8 @@ func dataSourceTencentCloudCcnInstancesRead(d *schema.ResourceData, meta interfa
 		infoMap["qos"] = item.qos
 		infoMap["state"] = strings.ToUpper(item.state)
 		infoMap["create_time"] = item.createTime
+		infoMap["charge_type"] = item.chargeType
+		infoMap["bandwidth_limit_type"] = item.bandWithLimitType
 		infoList = append(infoList, infoMap)
 
 		instances, err := service.DescribeCcnAttachedInstances(ctx, item.ccnId)

tencentcloud/data_source_tc_ccn_instances_test.go

@@ -25,6 +25,8 @@ func TestAccDataSourceTencentCloudCcnV3InstancesBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.ccn_id"),
 					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.qos"),
 					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.state"),
+					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.charge_type"),
+					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.bandwidth_limit_type"),
 					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.attachment_list.#"),
 					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.create_time"),
 
@@ -36,6 +38,8 @@ func TestAccDataSourceTencentCloudCcnV3InstancesBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(keyName, "instance_list.0.ccn_id"),
 					resource.TestCheckResourceAttrSet(keyName, "instance_list.0.qos"),
 					resource.TestCheckResourceAttrSet(keyName, "instance_list.0.state"),
+					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.charge_type"),
+					resource.TestCheckResourceAttrSet(keyId, "instance_list.0.bandwidth_limit_type"),
 					resource.TestCheckResourceAttrSet(keyName, "instance_list.0.attachment_list.#"),
 					resource.TestCheckResourceAttrSet(keyName, "instance_list.0.create_time"),
 				),