Merge pull request #665 from tencentcloudstack/chore/set-appid-to-env

chore: env define and format code

Author: Kagashino

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.59.1 (September 15, 2021)
+
+BUGFIXES:
+
+* Resource `tencentcloud/resource_tc_instance.go` remove last_update_status judge
+* Resource `tencentcloud/resource_tc_instance.go` fix DescribeInstanceById return LatestOperationState
+* Resource `tencentcloud/resource_tc_clb_attachment.go` clb_attachment check instances before unbind target groups
+
+CHORE:
+
+* Define `TENCENTCLOUD_APPID` Environment variable for testing appid.
+* Format code style
+
 ## 1.58.5 (September 7, 2021)
 
 ENHANCEMENTS:

README.md

@@ -82,8 +82,24 @@ log.Println("[DEBUG] the message and some import values: %v", importantValues)
 ### Test
 
 The quicker way for development and debug is writing test cases.
-How to trigger running the test cases, please refer the `test.sh` script.
-How to write test cases, check the `xxx_test.go` files.
+
+Config environment variables:
+```
+export TF_ACC=true
+```
+
+Config your appid for COS bucket testing
+```
+export TENCENTCLOUD_APPID=1234567890
+```
+
+This example show how to test single test function:
+```
+cd tencentcloud
+go test -i; go test -test.run TestAccTencentCloudNatGateway_basic -v
+```
+
+To write test cases, check the `xxx_test.go` files for more reference.
 
 ### Avoid ``terrafrom init``
 

tencentcloud/basic_test.go

@@ -1,13 +1,15 @@
 package tencentcloud
 
+import "os"
+
 /*
 ---------------------------------------------------
 If you want to run through the test cases,
 the following must be changed to your resource id.
 ---------------------------------------------------
 */
 
-const appid string = "1259649581"
+var appid string = os.Getenv("TENCENTCLOUD_APPID")
 
 const (
 	defaultRegion      = "ap-guangzhou"

tencentcloud/data_source_tc_cos_buckets.go

@@ -169,8 +169,8 @@ func dataSourceTencentCloudCosBuckets() *schema.Resource {
 							},
 						},
 						"origin_pull_rules": {
-							Type: schema.TypeList,
-							Computed: true,
+							Type:        schema.TypeList,
+							Computed:    true,
 							Description: "Bucket Origin-Pull rules.",
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
@@ -180,38 +180,38 @@ func dataSourceTencentCloudCosBuckets() *schema.Resource {
 										Description: "Priority of origin-pull rules, do not set the same value for multiple rules.",
 									},
 									"sync_back_to_source": {
-										Type:		 schema.TypeBool,
-										Optional: 	 true,
-										Default: 	 false,
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Default:     false,
 										Description: "If `true`, COS will not return 3XX status code when pulling data from an origin server. Currently available zone: ap-beijing, ap-shanghai, ap-singapore, ap-mumbai.",
 									},
 									"prefix": {
-										Type:		 schema.TypeString,
-										Optional: 	 true,
-										Default:	 "",
+										Type:        schema.TypeString,
+										Optional:    true,
+										Default:     "",
 										Description: "Triggers the origin-pull rule when the requested file name matches this prefix.",
 									},
 									"protocol": {
-										Type:		 schema.TypeString,
-										Optional: 	 true,
-										Default:	 "",
+										Type:        schema.TypeString,
+										Optional:    true,
+										Default:     "",
 										Description: "the protocol used for COS to access the specified origin server. The available value include `HTTP`, `HTTPS` and `FOLLOW`.",
 									},
 									"host": {
-										Type:		 schema.TypeString,
-										Required: 	 true,
+										Type:        schema.TypeString,
+										Required:    true,
 										Description: "Allows only a domain name or IP address. You can optionally append a port number to the address.",
 									},
 									"follow_query_string": {
-										Type:		 schema.TypeBool,
-										Optional: 	 true,
-										Default:	 true,
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Default:     true,
 										Description: "Specifies whether to pass through COS request query string when accessing the origin server.",
 									},
 									"follow_redirection": {
-										Type:		 schema.TypeBool,
-										Optional: 	 true,
-										Default:	 true,
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Default:     true,
 										Description: "Specifies whether to follow 3XX redirect to another origin server to pull data from.",
 									},
 									//"copy_origin_data": {
@@ -221,13 +221,13 @@ func dataSourceTencentCloudCosBuckets() *schema.Resource {
 									//	Description: "",
 									//},
 									"follow_http_headers": {
-										Type:		 schema.TypeList,
+										Type:        schema.TypeList,
 										Optional:    true,
 										Description: "Specifies the pass through headers when accessing the origin server.",
 										Elem:        &schema.Schema{Type: schema.TypeString},
 									},
 									"custom_http_headers": {
-										Type:		 schema.TypeMap,
+										Type:        schema.TypeMap,
 										Optional:    true,
 										Description: "Specifies the custom headers that you can add for COS to access your origin server.",
 									},
@@ -245,35 +245,35 @@ func dataSourceTencentCloudCosBuckets() *schema.Resource {
 							},
 						},
 						"origin_domain_rules": {
-							Type: schema.TypeList,
-							Computed: true,
+							Type:        schema.TypeList,
+							Computed:    true,
 							Description: "Bucket origin domain rules.",
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"domain": {
-										Type:		 schema.TypeString,
-										Required: 	 true,
+										Type:        schema.TypeString,
+										Required:    true,
 										Description: "Specify domain host.",
 									},
 									"type": {
-										Type:		 schema.TypeString,
-										Optional: 	 true,
-										Default: "REST",
+										Type:        schema.TypeString,
+										Optional:    true,
+										Default:     "REST",
 										Description: "Specify origin domain type, available values: `REST`, `WEBSITE`, `ACCELERATE`, default: `REST`.",
 									},
 									"status": {
-										Type:		 schema.TypeString,
-										Optional: 	 true,
-										Default: 	 "ENABLED",
-										Description: "Domain status, default: `ENABLED`.",
+										Type:         schema.TypeString,
+										Optional:     true,
+										Default:      "ENABLED",
+										Description:  "Domain status, default: `ENABLED`.",
 										ValidateFunc: validateAllowedStringValue([]string{"ENABLED", "DISABLED"}),
 									},
 								},
 							},
 						},
 						"acl_body": {
-							Type: schema.TypeString,
-							Computed: true,
+							Type:        schema.TypeString,
+							Computed:    true,
 							Description: "Bucket acl configurations.",
 						},
 						"tags": {