feat:remove cos storage-class validation (#1434)

* feat:remove cos storageclass validation

* add changelog

* adjust e2e case name

* adjust e2e case name

* adjust storage_class desc by office website

Author: lyu571

.changelog/1434.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_cos_bucket: enhance the storage_class of lifecycle
+```
+
+```release-note:enhancement
+resource/tencentcloud_cos_bucket_object: enhance the storage_class of lifecycle
+```

tencentcloud/resource_tc_cos_bucket.go

@@ -253,20 +253,6 @@ import (
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
-const (
-	tencentCloudCosStorageClassStandard   = "STANDARD"
-	tencentCloudCosStorageClassStandardIA = "STANDARD_IA"
-	tencentCloudCosStorageClassArchive    = "ARCHIVE"
-)
-
-var (
-	availableCosStorageClass = []string{
-		tencentCloudCosStorageClassStandard,
-		tencentCloudCosStorageClassStandardIA,
-		tencentCloudCosStorageClassArchive,
-	}
-)
-
 func originPullRules() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -603,10 +589,9 @@ func resourceTencentCloudCosBucket() *schema.Resource {
 										Description:  "Specifies the number of days after object creation when the specific rule action takes effect.",
 									},
 									"storage_class": {
-										Type:         schema.TypeString,
-										Required:     true,
-										ValidateFunc: validateAllowedStringValue(availableCosStorageClass),
-										Description:  "Specifies the storage class to which you want the object to transition. Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.",
+										Type:        schema.TypeString,
+										Required:    true,
+										Description: "Specifies the storage class to which you want the object to transition. Available values include `STANDARD_IA`, `MAZ_STANDARD_IA`, `INTELLIGENT_TIERING`, `MAZ_INTELLIGENT_TIERING`, `ARCHIVE`, `DEEP_ARCHIVE`. For more information, please refer to: https://cloud.tencent.com/document/product/436/33417.",
 									},
 								},
 							},
@@ -653,10 +638,9 @@ func resourceTencentCloudCosBucket() *schema.Resource {
 										Description:  "Number of days after non current object creation when the specific rule action takes effect.",
 									},
 									"storage_class": {
-										Type:         schema.TypeString,
-										Required:     true,
-										ValidateFunc: validateAllowedStringValue(availableCosStorageClass),
-										Description:  "Specifies the storage class to which you want the non current object to transition. Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.",
+										Type:        schema.TypeString,
+										Required:    true,
+										Description: "Specifies the storage class to which you want the non current object to transition. Available values include `STANDARD_IA`, `MAZ_STANDARD_IA`, `INTELLIGENT_TIERING`, `MAZ_INTELLIGENT_TIERING`, `ARCHIVE`, `DEEP_ARCHIVE`. For more information, please refer to: https://cloud.tencent.com/document/product/436/33417.",
 									},
 								},
 							},

tencentcloud/resource_tc_cos_bucket_object.go

@@ -117,11 +117,10 @@ func resourceTencentCloudCosBucketObject() *schema.Resource {
 				Description: "A standard MIME type describing the format of the object data.",
 			},
 			"storage_class": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Computed:     true,
-				ValidateFunc: validateAllowedStringValue(availableCosStorageClass),
-				Description:  "Object storage type, Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.",
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Object storage type, Available values include `STANDARD_IA`, `MAZ_STANDARD_IA`, `INTELLIGENT_TIERING`, `MAZ_INTELLIGENT_TIERING`, `ARCHIVE`, `DEEP_ARCHIVE`. For more information, please refer to: https://cloud.tencent.com/document/product/436/33417.",
 			},
 			"etag": {
 				Type:        schema.TypeString,

tencentcloud/resource_tc_cos_bucket_object_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccTencentCloudCosBucketObject_source(t *testing.T) {
+func TestAccTencentCloudCosBucketObjectResource_source(t *testing.T) {
 	t.Parallel()
 
 	tmpFile, err := ioutil.TempFile("", "tf-test-cos-object")
@@ -50,7 +50,7 @@ func TestAccTencentCloudCosBucketObject_source(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucketObject_content(t *testing.T) {
+func TestAccTencentCloudCosBucketObjectResource_content(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -70,7 +70,7 @@ func TestAccTencentCloudCosBucketObject_content(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucketObject_tags(t *testing.T) {
+func TestAccTencentCloudCosBucketObjectResource_tags(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -90,7 +90,7 @@ func TestAccTencentCloudCosBucketObject_tags(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucketObject_storageClass(t *testing.T) {
+func TestAccTencentCloudCosBucketObjectResource_storageClass(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -109,7 +109,7 @@ func TestAccTencentCloudCosBucketObject_storageClass(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucketObject_acl(t *testing.T) {
+func TestAccTencentCloudCosBucketObjectResource_acl(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{

tencentcloud/resource_tc_cos_bucket_test.go

@@ -66,7 +66,7 @@ func testSweepCosBuckets(region string) error {
 	return nil
 }
 
-func TestAccTencentCloudCosBucket_basic(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_basic(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -101,7 +101,7 @@ func TestAccTencentCloudCosBucket_basic(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_ACL(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_ACL(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -136,7 +136,7 @@ func TestAccTencentCloudCosBucket_ACL(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_tags(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_tags(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -170,7 +170,7 @@ func TestAccTencentCloudCosBucket_tags(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_cors(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_cors(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -219,7 +219,7 @@ func TestAccTencentCloudCosBucket_cors(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_lifecycle(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_lifecycle(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -271,7 +271,7 @@ func TestAccTencentCloudCosBucket_lifecycle(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_website(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_website(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -308,7 +308,7 @@ func TestAccTencentCloudCosBucket_website(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_MAZ(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_MAZ(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -333,7 +333,7 @@ func TestAccTencentCloudCosBucket_MAZ(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudCosBucket_originPull(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_originPull(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{
@@ -451,7 +451,7 @@ func TestAccTencentCloudCosBucket_originDomain(t *testing.T) {
 }
 */
 
-func TestAccTencentCloudCosBucket_replication(t *testing.T) {
+func TestAccTencentCloudCosBucketResource_replication(t *testing.T) {
 	t.Parallel()
 
 	resource.Test(t, resource.TestCase{

website/docs/r/cos_bucket.html.markdown

@@ -285,7 +285,7 @@ The `non_current_expiration` object supports the following:
 
 The `non_current_transition` object supports the following:
 
-* `storage_class` - (Required, String) Specifies the storage class to which you want the non current object to transition. Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.
+* `storage_class` - (Required, String) Specifies the storage class to which you want the non current object to transition. Available values include `STANDARD_IA`, `MAZ_STANDARD_IA`, `INTELLIGENT_TIERING`, `MAZ_INTELLIGENT_TIERING`, `ARCHIVE`, `DEEP_ARCHIVE`. For more information, please refer to: https://cloud.tencent.com/document/product/436/33417.
 * `non_current_days` - (Optional, Int) Number of days after non current object creation when the specific rule action takes effect.
 
 The `origin_domain_rules` object supports the following:
@@ -316,7 +316,7 @@ The `replica_rules` object supports the following:
 
 The `transition` object supports the following:
 
-* `storage_class` - (Required, String) Specifies the storage class to which you want the object to transition. Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.
+* `storage_class` - (Required, String) Specifies the storage class to which you want the object to transition. Available values include `STANDARD_IA`, `MAZ_STANDARD_IA`, `INTELLIGENT_TIERING`, `MAZ_INTELLIGENT_TIERING`, `ARCHIVE`, `DEEP_ARCHIVE`. For more information, please refer to: https://cloud.tencent.com/document/product/436/33417.
 * `date` - (Optional, String) Specifies the date after which you want the corresponding action to take effect.
 * `days` - (Optional, Int) Specifies the number of days after object creation when the specific rule action takes effect.
 

website/docs/r/cos_bucket_object.html.markdown

@@ -52,7 +52,7 @@ The following arguments are supported:
 * `content` - (Optional, String) Literal string value to use as the object content, which will be uploaded as UTF-8-encoded text.
 * `etag` - (Optional, String) The ETag generated for the object (an MD5 sum of the object content).
 * `source` - (Optional, String) The path to the source file being uploaded to the bucket.
-* `storage_class` - (Optional, String) Object storage type, Available values include `STANDARD`, `STANDARD_IA` and `ARCHIVE`.
+* `storage_class` - (Optional, String) Object storage type, Available values include `STANDARD_IA`, `MAZ_STANDARD_IA`, `INTELLIGENT_TIERING`, `MAZ_INTELLIGENT_TIERING`, `ARCHIVE`, `DEEP_ARCHIVE`. For more information, please refer to: https://cloud.tencent.com/document/product/436/33417.
 * `tags` - (Optional, Map) Tag of the object.
 
 ## Attributes Reference