fix cos bucket name validator

Author: oliverpei

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 1.49.2 (Unreleased)
+
+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

@@ -225,11 +225,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-]+$`

website/docs/r/cdn_domain.html.markdown

@@ -99,15 +99,15 @@ The `client_certificate_config` object supports the following:
 
 The `force_redirect` object supports the following:
 
-* `redirect_status_code` - (Optional) Access forced jump code. Valid values are `301` and `302`. When `switch` setting `off`, this property does not need to be set or set to `302`. Default value is `302`.
-* `redirect_type` - (Optional) Access forced jump type. Valid values are `http` and `https`. `http` means force http redirect, `https` means force http redirect. When `switch` setting `off`, this property does not need to be set or set to `http`. Default value is `http`.
-* `switch` - (Optional) Access forced jump configuration switch. Valid values are `on` and `off`. Default value is `off`.
+* `redirect_status_code` - (Optional) Forced redirect status code. Valid values are `301` and `302`. When `switch` setting `off`, this property does not need to be set or set to `302`. Default value is `302`.
+* `redirect_type` - (Optional) Forced redirect type. Valid values are `http` and `https`. `http` means a forced redirect from HTTPS to HTTP, `https` means a forced redirect from HTTP to HTTPS. When `switch` setting `off`, this property does not need to be set or set to `http`. Default value is `http`.
+* `switch` - (Optional) Forced redirect configuration switch. Valid values are `on` and `off`. Default value is `off`.
 
 The `https_config` object supports the following:
 
 * `https_switch` - (Required) HTTPS configuration switch. Valid values are `on` and `off`.
 * `client_certificate_config` - (Optional) Client certificate configuration information.
-* `force_redirect` - (Optional) Access protocol mandatory jump configuration. It's a list and consist of at most one item.
+* `force_redirect` - (Optional) Configuration of forced HTTP or HTTPS redirects.
 * `http2_switch` - (Optional) HTTP2 configuration switch. Valid values are `on` and `off`. and default value is `off`.
 * `ocsp_stapling_switch` - (Optional) OCSP configuration switch. Valid values are `on` and `off`. and default value is `off`.
 * `server_certificate_config` - (Optional) Server certificate configuration information.