Merge pull request #562 from oliverpei/master

fix cos bucket name validator

Author: gailwang

CHANGELOG.md

@@ -15,6 +15,10 @@ ENHANCEMENTS:
 
 * Resource `tencentcloud_sercurity_group_rule` add `address_template` and `protocol_template` to support building new security group rule with resource `tencentcloud_address_template` and `tencentcloud_protocol_template`.
 
+BUG FIXES:
+
+* Resource: `tencentcloud_cos_bucket` fix bucket name validator.
+
 ## 1.49.1 (December 01, 2020)
 
 ENHANCEMENTS:

tencentcloud/resource_tc_instance.go

@@ -614,7 +614,8 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		if errRet != nil {
 			return retryError(errRet, InternalError)
 		}
-		if instance != nil && *instance.InstanceState == CVM_STATUS_RUNNING {
+		if instance != nil && (*instance.InstanceState == CVM_STATUS_RUNNING ||
+			*instance.InstanceState == CVM_STATUS_LAUNCH_FAILED) {
 			return nil
 		}
 		return resource.RetryableError(fmt.Errorf("cvm instance status is %s, retry...", *instance.InstanceState))

tencentcloud/validators.go

@@ -226,11 +226,11 @@ func validateAllowedIntValue(ints []int) schema.SchemaValidateFunc {
 	}
 }
 
-// Only support lowercase letters, numbers and "-". It cannot be longer than 40 characters.
+// Only support lowercase letters, numbers and "-". It cannot be longer than 60 characters.
 func validateCosBucketName(v interface{}, k string) (ws []string, errors []error) {
 	value := v.(string)
-	if len(value) > 40 || len(value) < 0 {
-		errors = append(errors, fmt.Errorf("the length of %s must be 1-40: %s", k, value))
+	if len(value) > 60 || len(value) < 0 {
+		errors = append(errors, fmt.Errorf("the length of %s must be 1-60: %s", k, value))
 	}
 
 	pattern := `^[a-z0-9-]+$`