fix/sg-rule-set

Author: SevenEarth

tencentcloud/resource_tc_cos_bucket.go

@@ -392,7 +392,7 @@ func resourceTencentCloudCosBucket() *schema.Resource {
 				Required:     true,
 				ForceNew:     true,
 				ValidateFunc: validateCosBucketName,
-				Description:  "The name of a bucket to be created. Bucket format should be [custom name]-[appid], for example `mycos-1258798060`.",
+				Description:  "The name of a bucket to be created. Bucket format should be [custom name]-[appid], for example `mycos-1258798060`.The name cannot start or end with `-`. It only supports English Minuscule and numbers [a-z, 0-9, -] and their combinations. The total number of characters in the name of the complete request field can be up to 60 characters.",
 			},
 			"acl": {
 				Type:     schema.TypeString,

tencentcloud/resource_tc_security_group_rule_set.go

@@ -122,13 +122,13 @@ func resourceTencentCloudSecurityGroupRuleSet() *schema.Resource {
 		"protocol": {
 			Type:        schema.TypeString,
 			Optional:    true,
-			Computed:    true,
+			Default:     "ALL",
 			Description: "Type of IP protocol. Valid values: `TCP`, `UDP` and `ICMP`. Default to all types protocol, and conflicts with `service_template_*`.",
 		},
 		"port": {
 			Type:        schema.TypeString,
 			Optional:    true,
-			Computed:    true,
+			Default:     "ALL",
 			Description: "Range of the port. The available value can be one, multiple or one segment. E.g. `80`, `80,90` and `80-90`. Default to all ports, and conflicts with `service_template_*`.",
 		},
 	}

tencentcloud/validators.go

@@ -243,7 +243,7 @@ func validateCosBucketName(v interface{}, k string) (ws []string, errors []error
 		errors = append(errors, fmt.Errorf("the length of %s must be 1-60: %s", k, value))
 	}
 
-	pattern := `^[a-z0-9]+[a-z0-9-]+[a-z0-9]+-[0-9]{10}$`
+	pattern := `^[a-z0-9]([a-z0-9-]*[a-z0-9])?-[0-9]{10}$`
 	if match, _ := regexp.Match(pattern, []byte(value)); !match {
 		errors = append(errors, fmt.Errorf("%s is not valid, please refer to the official documents: %s", k, value))
 	}

website/docs/r/cos_bucket.html.markdown

@@ -241,7 +241,7 @@ resource "tencentcloud_cos_bucket" "mycos" {
 
 The following arguments are supported:
 
-* `bucket` - (Required, String, ForceNew) The name of a bucket to be created. Bucket format should be [custom name]-[appid], for example `mycos-1258798060`.
+* `bucket` - (Required, String, ForceNew) The name of a bucket to be created. Bucket format should be [custom name]-[appid], for example `mycos-1258798060`.The name cannot start or end with `-`. It only supports English Minuscule and numbers [a-z, 0-9, -] and their combinations. The total number of characters in the name of the complete request field can be up to 60 characters.
 * `acceleration_enable` - (Optional, Bool) Enable bucket acceleration.
 * `acl_body` - (Optional, String) ACL XML body for multiple grant info. NOTE: this argument will overwrite `acl`. Check https://intl.cloud.tencent.com/document/product/436/7737 for more detail.
 * `acl` - (Optional, String) The canned ACL to apply. Valid values: private, public-read, and public-read-write. Defaults to private.