Skip to content

fix: testcase - default vpc and subnet environment and reformat code #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2021
Merged

fix: testcase - default vpc and subnet environment and reformat code #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tencentcloud/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ var appid string = os.Getenv("TENCENTCLOUD_APPID")

const (
defaultRegion = "ap-guangzhou"
defaultVpcId = "vpc-h70b6b49"
defaultVpcId = "vpc-86v957zb"
defaultVpcCidr = "172.16.0.0/16"
defaultVpcCidrLess = "172.16.0.0/18"

defaultAZone = "ap-guangzhou-3"
defaultSubnetId = "subnet-1uwh63so"
defaultSubnetId = "subnet-rdng6k36"
defaultSubnetCidr = "172.16.0.0/20"
defaultSubnetCidrLess = "172.16.0.0/22"

Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_cam_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func resourceTencentCloudCamRole() *schema.Resource {
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
Description: "Indicade whether the CAM role can login or not.",
Description: "Indicates whether the CAM role can login or not.",
},
"create_time": {
Type: schema.TypeString,
Expand Down
7 changes: 4 additions & 3 deletions tencentcloud/resource_tc_ckafka_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ package tencentcloud
import (
"context"
"fmt"
"log"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
ckafka "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka/v20190819"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
"log"
)

func resourceTencentCloudCkafkaInstance() *schema.Resource {
Expand Down Expand Up @@ -180,8 +181,8 @@ func resourceTencentCloudCkafkaInstance() *schema.Resource {
"3 will be used by default.",
},
"default_replication_factor": {
Type: schema.TypeInt,
Required: true,
Type: schema.TypeInt,
Required: true,
Description: "If auto.create.topic.enable is set to true but this value is not set, " +
"2 will be used by default.",
},
Expand Down
6 changes: 3 additions & 3 deletions tencentcloud/resource_tc_clb_customized_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ func resourceTencentCloudClbCustomizedConfig() *schema.Resource {
Description: "Name of Customized Config.",
},
"config_content": {
Type: schema.TypeString,
Required: true,
Description: "Content of Customized Config.",
Type: schema.TypeString,
Required: true,
Description: "Content of Customized Config.",
},
"load_balancer_ids": {
Type: schema.TypeSet,
Expand Down
1 change: 0 additions & 1 deletion tencentcloud/resource_tc_clb_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ resource "tencentcloud_clb_instance" "open_clb1" {
clb_name = "hello"
master_zone_id = "ap-guangzhou-3"
}
~
```

CREATE instance with log
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_kubernetes_auth_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Provide a resource to configure kubernetes cluster authentication info.

~> **NOTE:** Only avaliable for cluster version >= 1.20
~> **NOTE:** Only available for cluster version >= 1.20

Example Usage

Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_nat_gateway_snat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ Import
VPN gateway route can be imported using the id, the id format must be '{nat_gateway_id}#{resource_id}', resource_id range `subnet_id`, `instance_id`, e.g.

SUBNET SNat
```hcl
```
$ terraform import tencentcloud_nat_gateway_snat.my_snat nat-r4ip1cwt#subnet-2ap74y35
```

NETWORKINTERFACT SNat
```hcl
```
$ terraform import tencentcloud_nat_gateway_snat.my_snat nat-r4ip1cwt#ins-da412f5a
```
*/
Expand Down
3 changes: 2 additions & 1 deletion tencentcloud/service_tencentcloud_private_dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package tencentcloud

import (
"context"
"log"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
"log"

privatedns "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns/v20201028"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/cam_role.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The following arguments are supported:

* `document` - (Required) Document of the CAM role. The syntax refers to [CAM POLICY](https://intl.cloud.tencent.com/document/product/598/10604). There are some notes when using this para in terraform: 1. The elements in json claimed supporting two types as `string` and `array` only support type `array`; 2. Terraform does not support the `root` syntax, when appears, it must be replaced with the uin it stands for.
* `name` - (Required, ForceNew) Name of CAM role.
* `console_login` - (Optional, ForceNew) Indicade whether the CAM role can login or not.
* `console_login` - (Optional, ForceNew) Indicates whether the CAM role can login or not.
* `description` - (Optional) Description of the CAM role.

## Attributes Reference
Expand Down
1 change: 0 additions & 1 deletion website/docs/r/clb_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ resource "tencentcloud_clb_instance" "open_clb1" {
clb_name = "hello"
master_zone_id = "ap-guangzhou-3"
}
~
```

CREATE instance with log
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/kubernetes_auth_attachment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: |-

Provide a resource to configure kubernetes cluster authentication info.

~> **NOTE:** Only avaliable for cluster version >= 1.20
~> **NOTE:** Only available for cluster version >= 1.20

## Example Usage

Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/nat_gateway_snat.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ In addition to all arguments above, the following attributes are exported:
VPN gateway route can be imported using the id, the id format must be '{nat_gateway_id}#{resource_id}', resource_id range `subnet_id`, `instance_id`, e.g.

SUBNET SNat
```hcl
```
$ terraform import tencentcloud_nat_gateway_snat.my_snat nat-r4ip1cwt#subnet-2ap74y35
```

NETWORKINTERFACT SNat
```hcl
```
$ terraform import tencentcloud_nat_gateway_snat.my_snat nat-r4ip1cwt#ins-da412f5a
```