Skip to content

Commit fc19026

Browse files
andrew-txandrew-tx
committed
refact(cdwdoris): add instanceid param
1 parent cb26146 commit fc19026

8 files changed

+67
-778
lines changed

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_instance.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_instance.md

Lines changed: 11 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,26 @@
1-
Provides a resource to create a cdwdoris instance
1+
Provides a resource to create a cdwdoris cdwdoris_instance
22

33
Example Usage
44

5-
Create a POSTPAID instance
6-
75
```hcl
8-
# availability zone
9-
variable "availability_zone" {
10-
default = "ap-guangzhou-6"
11-
}
12-
13-
# create vpc
14-
resource "tencentcloud_vpc" "vpc" {
15-
name = "vpc"
16-
cidr_block = "172.16.0.0/16"
17-
}
18-
19-
# create subnet
20-
resource "tencentcloud_subnet" "subnet" {
21-
availability_zone = var.availability_zone
22-
name = "subnet"
23-
vpc_id = tencentcloud_vpc.vpc.id
24-
cidr_block = "172.16.0.0/24"
25-
is_multicast = false
26-
}
27-
28-
# create security group
29-
resource "tencentcloud_security_group" "example" {
30-
name = "tf-example"
31-
description = "security group desc."
32-
33-
tags = {
34-
"createBy" = "Terraform"
6+
resource "tencentcloud_cdwdoris_instance" "cdwdoris_instance" {
7+
fe_spec = {
358
}
36-
}
37-
38-
# create POSTPAID instance
39-
resource "tencentcloud_cdwdoris_instance" "example" {
40-
zone = var.availability_zone
41-
user_vpc_id = tencentcloud_vpc.vpc.id
42-
user_subnet_id = tencentcloud_subnet.subnet.id
43-
product_version = "2.1"
44-
instance_name = "tf-example"
45-
doris_user_pwd = "Password@test"
46-
ha_flag = false
47-
case_sensitive = 0
48-
enable_multi_zones = false
49-
workload_group_status = "open"
50-
51-
security_group_ids = [
52-
tencentcloud_security_group.example.id
53-
]
54-
55-
charge_properties {
56-
charge_type = "POSTPAID_BY_HOUR"
9+
be_spec = {
5710
}
58-
59-
fe_spec {
60-
spec_name = "S_4_16_P"
61-
count = 3
62-
disk_size = 200
11+
charge_properties = {
6312
}
64-
65-
be_spec {
66-
spec_name = "S_4_16_P"
67-
count = 3
68-
disk_size = 200
13+
tags = {
6914
}
70-
71-
tags {
72-
tag_key = "createBy"
73-
tag_value = "Terraform"
15+
user_multi_zone_infos = {
7416
}
7517
}
7618
```
7719

78-
Create a POSTPAID instance
20+
Import
7921

80-
```hcl
81-
# availability zone
82-
variable "availability_zone" {
83-
default = "ap-guangzhou-6"
84-
}
22+
cdwdoris cdwdoris_instance can be imported using the id, e.g.
8523

86-
# create vpc
87-
resource "tencentcloud_vpc" "vpc" {
88-
name = "vpc"
89-
cidr_block = "172.16.0.0/16"
90-
}
91-
92-
# create subnet
93-
resource "tencentcloud_subnet" "subnet" {
94-
availability_zone = var.availability_zone
95-
name = "subnet"
96-
vpc_id = tencentcloud_vpc.vpc.id
97-
cidr_block = "172.16.0.0/24"
98-
is_multicast = false
99-
}
100-
101-
# create security group
102-
resource "tencentcloud_security_group" "example" {
103-
name = "tf-example"
104-
description = "security group desc."
105-
106-
tags = {
107-
"createBy" = "Terraform"
108-
}
109-
}
110-
111-
# create PREPAID instance
112-
resource "tencentcloud_cdwdoris_instance" "example" {
113-
zone = var.availability_zone
114-
user_vpc_id = tencentcloud_vpc.vpc.id
115-
user_subnet_id = tencentcloud_subnet.subnet.id
116-
product_version = "2.1"
117-
instance_name = "tf-example"
118-
doris_user_pwd = "Password@test"
119-
ha_flag = false
120-
case_sensitive = 0
121-
enable_multi_zones = false
122-
workload_group_status = "close"
123-
124-
security_group_ids = [
125-
tencentcloud_security_group.example.id
126-
]
127-
128-
charge_properties {
129-
charge_type = "PREPAID"
130-
time_span = 1
131-
time_unit = "m"
132-
}
133-
134-
fe_spec {
135-
spec_name = "S_4_16_P"
136-
count = 3
137-
disk_size = 200
138-
}
139-
140-
be_spec {
141-
spec_name = "S_4_16_P"
142-
count = 3
143-
disk_size = 200
144-
}
145-
146-
tags {
147-
tag_key = "createBy"
148-
tag_value = "Terraform"
149-
}
150-
}
24+
```
25+
terraform import tencentcloud_cdwdoris_instance.cdwdoris_instance cdwdoris_instance_id
15126
```

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_instance_test.go

Lines changed: 17 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cdwdoris_test
1+
package cdwdoris
22

33
import (
44
"testing"
@@ -8,88 +8,36 @@ import (
88
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
99
)
1010

11-
// go test -i; go test -test.run TestAccTencentCloudNeedFixCdwdorisInstanceResource_basic -v
12-
func TestAccTencentCloudNeedFixCdwdorisInstanceResource_basic(t *testing.T) {
11+
func TestAccTencentCloudCdwdorisInstanceResource_basic(t *testing.T) {
1312
t.Parallel()
1413
resource.Test(t, resource.TestCase{
1514
PreCheck: func() {
1615
tcacctest.AccPreCheck(t)
1716
},
1817
Providers: tcacctest.AccProviders,
19-
Steps: []resource.TestStep{
20-
{
21-
Config: testAccCdwdorisInstance,
22-
Check: resource.ComposeTestCheckFunc(
23-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "id"),
24-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "zone"),
25-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "user_vpc_id"),
26-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "user_subnet_id"),
27-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "product_version"),
28-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "instance_name"),
29-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "doris_user_pwd"),
30-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "ha_flag"),
31-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "ha_type"),
32-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "case_sensitive"),
33-
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.example", "enable_multi_zones"),
34-
),
35-
},
36-
},
18+
Steps: []resource.TestStep{{
19+
Config: testAccCdwdorisInstance,
20+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_instance.cdwdoris_instance", "id")),
21+
}, {
22+
ResourceName: "tencentcloud_cdwdoris_instance.cdwdoris_instance",
23+
ImportState: true,
24+
ImportStateVerify: true,
25+
}},
3726
})
3827
}
3928

4029
const testAccCdwdorisInstance = `
41-
# availability zone
42-
variable "availability_zone" {
43-
default = "ap-guangzhou-6"
44-
}
45-
46-
# create vpc
47-
resource "tencentcloud_vpc" "vpc" {
48-
name = "vpc"
49-
cidr_block = "172.16.0.0/16"
50-
}
51-
52-
# create subnet
53-
resource "tencentcloud_subnet" "subnet" {
54-
availability_zone = var.availability_zone
55-
name = "subnet"
56-
vpc_id = tencentcloud_vpc.vpc.id
57-
cidr_block = "172.16.0.0/24"
58-
is_multicast = false
59-
}
6030
61-
# create POSTPAID instance
62-
resource "tencentcloud_cdwdoris_instance" "example" {
63-
zone = var.availability_zone
64-
user_vpc_id = tencentcloud_vpc.vpc.id
65-
user_subnet_id = tencentcloud_subnet.subnet.id
66-
product_version = "2.1"
67-
instance_name = "tf-example"
68-
doris_user_pwd = "Password@test"
69-
ha_flag = true
70-
ha_type = 1
71-
case_sensitive = 0
72-
enable_multi_zones = false
73-
74-
charge_properties {
75-
charge_type = "POSTPAID_BY_HOUR"
31+
resource "tencentcloud_cdwdoris_instance" "cdwdoris_instance" {
32+
fe_spec = {
7633
}
77-
78-
fe_spec {
79-
spec_name = "S_4_16_P"
80-
count = 3
81-
disk_size = 200
34+
be_spec = {
8235
}
83-
84-
be_spec {
85-
spec_name = "S_4_16_P"
86-
count = 3
87-
disk_size = 200
36+
charge_properties = {
8837
}
89-
90-
tags {
91-
tag_key = "createBy"
92-
tag_value = "Terraform"
38+
tags = {
39+
}
40+
user_multi_zone_infos = {
9341
}
9442
}
9543
`

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_user.md

Lines changed: 4 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,10 @@
1-
Provides a resource to create a cdwdoris user
1+
Provides a resource to create a cdwdoris cdwdoris_user
22

33
Example Usage
44

55
```hcl
6-
# availability zone
7-
variable "availability_zone" {
8-
default = "ap-guangzhou-6"
9-
}
10-
11-
# create vpc
12-
resource "tencentcloud_vpc" "vpc" {
13-
name = "vpc"
14-
cidr_block = "172.16.0.0/16"
15-
}
16-
17-
# create subnet
18-
resource "tencentcloud_subnet" "subnet" {
19-
availability_zone = var.availability_zone
20-
name = "subnet"
21-
vpc_id = tencentcloud_vpc.vpc.id
22-
cidr_block = "172.16.0.0/24"
23-
is_multicast = false
24-
}
25-
26-
# create instance
27-
resource "tencentcloud_cdwdoris_instance" "example" {
28-
zone = var.availability_zone
29-
user_vpc_id = tencentcloud_vpc.vpc.id
30-
user_subnet_id = tencentcloud_subnet.subnet.id
31-
product_version = "2.1"
32-
instance_name = "tf-example"
33-
doris_user_pwd = "Password@test"
34-
ha_flag = false
35-
case_sensitive = 0
36-
enable_multi_zones = false
37-
workload_group_status = "open"
38-
39-
charge_properties {
40-
charge_type = "POSTPAID_BY_HOUR"
41-
}
42-
43-
fe_spec {
44-
spec_name = "S_4_16_P"
45-
count = 3
46-
disk_size = 200
47-
}
48-
49-
be_spec {
50-
spec_name = "S_4_16_P"
51-
count = 3
52-
disk_size = 200
53-
}
54-
55-
tags {
56-
tag_key = "createBy"
57-
tag_value = "Terraform"
58-
}
59-
}
60-
61-
# create user
62-
resource "tencentcloud_cdwdoris_user" "example" {
63-
user_info {
64-
instance_id = tencentcloud_cdwdoris_instance.example.id
65-
username = "example"
66-
password = "Password@test"
67-
describe = "test demo."
6+
resource "tencentcloud_cdwdoris_user" "cdwdoris_user" {
7+
user_info = {
688
}
699
}
7010
```
@@ -74,5 +14,5 @@ Import
7414
cdwdoris cdwdoris_user can be imported using the id, e.g.
7515

7616
```
77-
terraform import tencentcloud_cdwdoris_user.example cdwdoris-rhbflamd#example
17+
terraform import tencentcloud_cdwdoris_user.cdwdoris_user cdwdoris_user_id
7818
```

0 commit comments

Comments
 (0)