Merge branch 'feat/unsubscribe' into 'master'

feat: 优化包年包月实例的退订逻辑，更新私网连接资源的使用示例

See merge request iaasng/terraform-provider-volcengine!513

common/common_volcengine_error.go

@@ -25,7 +25,7 @@ func ResourceFlowLimitExceededError(err error) bool {
 }
 
 func UnsubscribeProductError(err error) bool {
-	return strings.Contains(err.Error(), "The product code is inconsistent with the instance product")
+	return strings.Contains(err.Error(), "The product code does not match the instance's product")
 }
 
 func UnsubscribeProductConflictError(err error) bool {

common/common_volcengine_version.go

@@ -2,5 +2,5 @@ package common
 
 const (
 	TerraformProviderName    = "terraform-provider-volcengine"
-	TerraformProviderVersion = "0.0.143"
+	TerraformProviderVersion = "0.0.144"
 )

example/dataPrivatelinkVpcEndpointConnections/main.tf

@@ -51,9 +51,16 @@ resource "volcengine_privatelink_vpc_endpoint" "foo" {
   description        = "acc-test"
 }
 
+resource "volcengine_privatelink_vpc_endpoint_zone" "foo" {
+  endpoint_id        = volcengine_privatelink_vpc_endpoint.foo.id
+  subnet_id          = volcengine_subnet.foo.id
+  private_ip_address = "172.16.0.251"
+}
+
 resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
   endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
   service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+  depends_on  = [volcengine_privatelink_vpc_endpoint_zone.foo]
 }
 
 data "volcengine_privatelink_vpc_endpoint_connections" "foo"{

example/privatelinkVpcEndpointConnection/main.tf

@@ -51,7 +51,19 @@ resource "volcengine_privatelink_vpc_endpoint" "foo" {
   description        = "acc-test"
 }
 
+#resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
+#  endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
+#  service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+#}
+
+resource "volcengine_privatelink_vpc_endpoint_zone" "foo" {
+  endpoint_id        = volcengine_privatelink_vpc_endpoint.foo.id
+  subnet_id          = volcengine_subnet.foo.id
+  private_ip_address = "172.16.0.251"
+}
+
 resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
   endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
   service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+  depends_on  = [volcengine_privatelink_vpc_endpoint_zone.foo]
 }

volcengine/clb/clb/resource_volcengine_clb.go

@@ -134,11 +134,10 @@ func ResourceVolcengineClb() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"isp": {
-							Type:         schema.TypeString,
-							Required:     true,
-							ForceNew:     true,
-							ValidateFunc: validation.StringInSlice([]string{"BGP"}, false),
-							Description:  "The ISP of the EIP which automatically associated to CLB, the value can be `BGP`.",
+							Type:        schema.TypeString,
+							Required:    true,
+							ForceNew:    true,
+							Description: "The ISP of the EIP which automatically associated to CLB, the value can be `BGP` or `ChinaMobile` or `ChinaUnicom` or `ChinaTelecom` or `SingleLine_BGP` or `Static_BGP` or `Fusion_BGP`.",
 						},
 						"eip_billing_type": {
 							Type:         schema.TypeString,

volcengine/privatelink/vpc_endpoint_connection/data_source_volcengine_privatelink_vpc_endpoint_connections_test.go

@@ -63,9 +63,16 @@ resource "volcengine_privatelink_vpc_endpoint" "foo" {
   description        = "acc-test"
 }
 
+resource "volcengine_privatelink_vpc_endpoint_zone" "foo" {
+  endpoint_id        = volcengine_privatelink_vpc_endpoint.foo.id
+  subnet_id          = volcengine_subnet.foo.id
+  private_ip_address = "172.16.0.251"
+}
+
 resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
   endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
   service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+  depends_on  = [volcengine_privatelink_vpc_endpoint_zone.foo]
 }
 
 data "volcengine_privatelink_vpc_endpoint_connections" "foo"{

volcengine/privatelink/vpc_endpoint_connection/resource_volcengine_privatelink_vpc_endpoint_connection_test.go

@@ -63,9 +63,16 @@ resource "volcengine_privatelink_vpc_endpoint" "foo" {
   description        = "acc-test"
 }
 
+resource "volcengine_privatelink_vpc_endpoint_zone" "foo" {
+  endpoint_id        = volcengine_privatelink_vpc_endpoint.foo.id
+  subnet_id          = volcengine_subnet.foo.id
+  private_ip_address = "172.16.0.251"
+}
+
 resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
   endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
   service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+  depends_on  = [volcengine_privatelink_vpc_endpoint_zone.foo]
 }
 `
 

volcengine/tos/object/resource_volcengine_tos_object.go

@@ -65,8 +65,8 @@ func ResourceVolcengineTosObject() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				//ForceNew:    true,
-				Description:   "The file path for upload.",
-				ConflictsWith: []string{"content"},
+				Description:  "The file path for upload. Only one of `file_path,content` can be specified.",
+				ExactlyOneOf: []string{"file_path", "content"},
 			},
 			"content_md5": {
 				Type:        schema.TypeString,
@@ -164,11 +164,11 @@ func ResourceVolcengineTosObject() *schema.Resource {
 				Description: "The flag of enable tos version.",
 			},
 			"content": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Computed:      true,
-				ConflictsWith: []string{"file_path"},
-				Description:   "The content the TOS Object when content type is json or text and xml.",
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ExactlyOneOf: []string{"file_path", "content"},
+				Description:  "The content of the TOS Object when content type is json or text and xml. Only one of `file_path,content` can be specified.",
 			},
 		},
 	}

website/docs/d/privatelink_vpc_endpoint_connections.html.markdown

@@ -63,9 +63,16 @@ resource "volcengine_privatelink_vpc_endpoint" "foo" {
   description        = "acc-test"
 }
 
+resource "volcengine_privatelink_vpc_endpoint_zone" "foo" {
+  endpoint_id        = volcengine_privatelink_vpc_endpoint.foo.id
+  subnet_id          = volcengine_subnet.foo.id
+  private_ip_address = "172.16.0.251"
+}
+
 resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
   endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
   service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+  depends_on  = [volcengine_privatelink_vpc_endpoint_zone.foo]
 }
 
 data "volcengine_privatelink_vpc_endpoint_connections" "foo" {

website/docs/r/clb.html.markdown

@@ -136,7 +136,7 @@ When the value of this field is `DualStack`, the type of the CLB must be `privat
 The `eip_billing_config` object supports the following:
 
 * `eip_billing_type` - (Required, ForceNew) The billing type of the EIP which automatically assigned to CLB. And optional choice contains `PostPaidByBandwidth` or `PostPaidByTraffic` or `PrePaid`.When creating a `PrePaid` public CLB, this field must be specified as `PrePaid` simultaneously.When the LoadBalancerBillingType changes from `PostPaid` to `PrePaid`, please manually modify the value of this field to `PrePaid` simultaneously.
-* `isp` - (Required, ForceNew) The ISP of the EIP which automatically associated to CLB, the value can be `BGP`.
+* `isp` - (Required, ForceNew) The ISP of the EIP which automatically associated to CLB, the value can be `BGP` or `ChinaMobile` or `ChinaUnicom` or `ChinaTelecom` or `SingleLine_BGP` or `Static_BGP` or `Fusion_BGP`.
 * `bandwidth` - (Optional) The peek bandwidth of the EIP which automatically assigned to CLB.
 
 The `tags` object supports the following:

website/docs/r/privatelink_vpc_endpoint_connection.html.markdown

@@ -63,9 +63,21 @@ resource "volcengine_privatelink_vpc_endpoint" "foo" {
   description        = "acc-test"
 }
 
+#resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
+#  endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
+#  service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+#}
+
+resource "volcengine_privatelink_vpc_endpoint_zone" "foo" {
+  endpoint_id        = volcengine_privatelink_vpc_endpoint.foo.id
+  subnet_id          = volcengine_subnet.foo.id
+  private_ip_address = "172.16.0.251"
+}
+
 resource "volcengine_privatelink_vpc_endpoint_connection" "foo" {
   endpoint_id = volcengine_privatelink_vpc_endpoint.foo.id
   service_id  = volcengine_privatelink_vpc_endpoint_service.foo.id
+  depends_on  = [volcengine_privatelink_vpc_endpoint_zone.foo]
 }
 ```
 ## Argument Reference

website/docs/r/tos_object.html.markdown

@@ -34,12 +34,13 @@ resource "volcengine_tos_object" "default" {
 ## Argument Reference
 The following arguments are supported:
 * `bucket_name` - (Required, ForceNew) The name of the bucket.
-* `file_path` - (Required) The file path for upload.
 * `object_name` - (Required, ForceNew) The name of the object.
 * `account_acl` - (Optional) The user set of grant full control.
 * `content_md5` - (Optional) The file md5 sum (32-bit hexadecimal string) for upload.
 * `content_type` - (Optional, ForceNew) The content type of the object.
+* `content` - (Optional) The content of the TOS Object when content type is json or text and xml. Only one of `file_path,content` can be specified.
 * `encryption` - (Optional, ForceNew) The encryption of the object.Valid value is AES256.
+* `file_path` - (Optional) The file path for upload. Only one of `file_path,content` can be specified.
 * `public_acl` - (Optional) The public acl control of object.Valid value is private|public-read|public-read-write|authenticated-read|bucket-owner-read.
 * `storage_class` - (Optional, ForceNew) The storage type of the object.Valid value is STANDARD|IA.
 
@@ -52,7 +53,6 @@ The `account_acl` object supports the following:
 ## Attributes Reference
 In addition to all arguments above, the following attributes are exported:
 * `id` - ID of the resource.
-* `content` - The content the TOS Object when content type is json or text and xml.
 * `enable_version` - The flag of enable tos version.
 * `version_ids` - The version ids of the object if exist.