Merge pull request #1885 from tencentcloudstack/fix/sg-rule-set

fix/sg-rule-set

Author: lyu571

.changelog/1885.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_cos_bucket: Update the validation rules for the `bucket` parameter
+```
+
+```release-note:enhancement
+resource/tencentcloud_security_group_rule_set: Add default values for the protocol and port fields.
+```

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))
 	}