Skip to content

Commit bf3c27e

Browse files
SevenEarthSevenEarth
committed
add
1 parent e8e8d55 commit bf3c27e

11 files changed

+310
-57
lines changed

‎tencentcloud/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,7 @@ func Provider() *schema.Provider {
21092109
"tencentcloud_cdc_dedicated_cluster": cdc.ResourceTencentCloudCdcDedicatedCluster(),
21102110
"tencentcloud_cdwdoris_instance": cdwdoris.ResourceTencentCloudCdwdorisInstance(),
21112111
"tencentcloud_cdwdoris_workload_group": cdwdoris.ResourceTencentCloudCdwdorisWorkloadGroup(),
2112-
"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
2112+
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
21132113
},
21142114

21152115
ConfigureFunc: providerConfigure,

‎tencentcloud/provider.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2168,4 +2168,3 @@ CdwDoris
21682168
Resource
21692169
tencentcloud_cdwdoris_instance
21702170
tencentcloud_cdwdoris_workload_group
2171-
tencentcloud_cdwdoris_user

‎tencentcloud/services/cdwdoris/data_source_tc_cdwdoris_instances_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ func TestAccTencentCloudCdwdorisInstancesDataSource_basic(t *testing.T) {
1616
tcacctest.AccPreCheck(t)
1717
},
1818
Providers: tcacctest.AccProviders,
19-
Steps: []resource.TestStep{{
20-
Config: testAccCdwdorisInstancesDataSource,
21-
Check: resource.ComposeTestCheckFunc(
22-
tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_cdwdoris_instances.example"),
23-
),
24-
}},
19+
Steps: []resource.TestStep{
20+
{
21+
Config: testAccCdwdorisInstancesDataSource,
22+
Check: resource.ComposeTestCheckFunc(
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_cdwdoris_instances.example", "id"),
24+
),
25+
},
26+
},
2527
})
2628
}
2729

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_instance.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ resource "tencentcloud_subnet" "subnet" {
2525
is_multicast = false
2626
}
2727
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"
35+
}
36+
}
37+
2838
# create POSTPAID instance
2939
resource "tencentcloud_cdwdoris_instance" "example" {
3040
zone = var.availability_zone
@@ -36,7 +46,11 @@ resource "tencentcloud_cdwdoris_instance" "example" {
3646
ha_flag = false
3747
case_sensitive = 0
3848
enable_multi_zones = false
39-
workload_group_status = true
49+
workload_group_status = "open"
50+
51+
security_group_ids = [
52+
tencentcloud_security_group.example.id
53+
]
4054
4155
charge_properties {
4256
charge_type = "POSTPAID_BY_HOUR"
@@ -84,6 +98,16 @@ resource "tencentcloud_subnet" "subnet" {
8498
is_multicast = false
8599
}
86100
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+
87111
# create PREPAID instance
88112
resource "tencentcloud_cdwdoris_instance" "example" {
89113
zone = var.availability_zone
@@ -95,7 +119,11 @@ resource "tencentcloud_cdwdoris_instance" "example" {
95119
ha_flag = false
96120
case_sensitive = 0
97121
enable_multi_zones = false
98-
workload_group_status = false
122+
workload_group_status = "close"
123+
124+
security_group_ids = [
125+
tencentcloud_security_group.example.id
126+
]
99127
100128
charge_properties {
101129
charge_type = "PREPAID"

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_user.md

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

33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_cdwdoris_user" "cdwdoris_user" {
7-
user_info = {
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."
868
}
969
}
1070
```
@@ -14,5 +74,5 @@ Import
1474
cdwdoris cdwdoris_user can be imported using the id, e.g.
1575

1676
```
17-
terraform import tencentcloud_cdwdoris_user.cdwdoris_user cdwdoris_user_id
77+
terraform import tencentcloud_cdwdoris_user.example cdwdoris-rhbflamd#example
1878
```

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_user_test.go

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

33
import (
44
"testing"
@@ -16,21 +16,158 @@ func TestAccTencentCloudNeedFixCdwdorisUserResource_basic(t *testing.T) {
1616
tcacctest.AccPreCheck(t)
1717
},
1818
Providers: tcacctest.AccProviders,
19-
Steps: []resource.TestStep{{
20-
Config: testAccCdwdorisUser,
21-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_user.cdwdoris_user", "id")),
22-
}, {
23-
ResourceName: "tencentcloud_cdwdoris_user.cdwdoris_user",
24-
ImportState: true,
25-
ImportStateVerify: true,
26-
}},
19+
Steps: []resource.TestStep{
20+
{
21+
Config: testAccCdwdorisUser,
22+
Check: resource.ComposeTestCheckFunc(
23+
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_user.example", "id"),
24+
),
25+
},
26+
{
27+
Config: testAccCdwdorisUserUpdate,
28+
Check: resource.ComposeTestCheckFunc(
29+
resource.TestCheckResourceAttrSet("tencentcloud_cdwdoris_user.example", "id"),
30+
),
31+
},
32+
{
33+
ResourceName: "tencentcloud_cdwdoris_user.example",
34+
ImportState: true,
35+
ImportStateVerify: true,
36+
},
37+
},
2738
})
2839
}
2940

3041
const testAccCdwdorisUser = `
42+
# availability zone
43+
variable "availability_zone" {
44+
default = "ap-guangzhou-6"
45+
}
46+
47+
# create vpc
48+
resource "tencentcloud_vpc" "vpc" {
49+
name = "vpc"
50+
cidr_block = "172.16.0.0/16"
51+
}
52+
53+
# create subnet
54+
resource "tencentcloud_subnet" "subnet" {
55+
availability_zone = var.availability_zone
56+
name = "subnet"
57+
vpc_id = tencentcloud_vpc.vpc.id
58+
cidr_block = "172.16.0.0/24"
59+
is_multicast = false
60+
}
61+
62+
# create instance
63+
resource "tencentcloud_cdwdoris_instance" "example" {
64+
zone = var.availability_zone
65+
user_vpc_id = tencentcloud_vpc.vpc.id
66+
user_subnet_id = tencentcloud_subnet.subnet.id
67+
product_version = "2.1"
68+
instance_name = "tf-example"
69+
doris_user_pwd = "Password@test"
70+
ha_flag = false
71+
case_sensitive = 0
72+
enable_multi_zones = false
73+
workload_group_status = true
74+
75+
charge_properties {
76+
charge_type = "POSTPAID_BY_HOUR"
77+
}
78+
79+
fe_spec {
80+
spec_name = "S_4_16_P"
81+
count = 3
82+
disk_size = 200
83+
}
84+
85+
be_spec {
86+
spec_name = "S_4_16_P"
87+
count = 3
88+
disk_size = 200
89+
}
90+
91+
tags {
92+
tag_key = "createBy"
93+
tag_value = "Terraform"
94+
}
95+
}
96+
97+
# create user
98+
resource "tencentcloud_cdwdoris_user" "example" {
99+
user_info {
100+
instance_id = tencentcloud_cdwdoris_instance.example.id
101+
username = "example"
102+
password = "Password@test"
103+
describe = "test demo."
104+
}
105+
}
106+
`
107+
108+
const testAccCdwdorisUserUpdate = `
109+
# availability zone
110+
variable "availability_zone" {
111+
default = "ap-guangzhou-6"
112+
}
113+
114+
# create vpc
115+
resource "tencentcloud_vpc" "vpc" {
116+
name = "vpc"
117+
cidr_block = "172.16.0.0/16"
118+
}
119+
120+
# create subnet
121+
resource "tencentcloud_subnet" "subnet" {
122+
availability_zone = var.availability_zone
123+
name = "subnet"
124+
vpc_id = tencentcloud_vpc.vpc.id
125+
cidr_block = "172.16.0.0/24"
126+
is_multicast = false
127+
}
128+
129+
# create instance
130+
resource "tencentcloud_cdwdoris_instance" "example" {
131+
zone = var.availability_zone
132+
user_vpc_id = tencentcloud_vpc.vpc.id
133+
user_subnet_id = tencentcloud_subnet.subnet.id
134+
product_version = "2.1"
135+
instance_name = "tf-example"
136+
doris_user_pwd = "Password@test"
137+
ha_flag = false
138+
case_sensitive = 0
139+
enable_multi_zones = false
140+
workload_group_status = true
141+
142+
charge_properties {
143+
charge_type = "POSTPAID_BY_HOUR"
144+
}
145+
146+
fe_spec {
147+
spec_name = "S_4_16_P"
148+
count = 3
149+
disk_size = 200
150+
}
151+
152+
be_spec {
153+
spec_name = "S_4_16_P"
154+
count = 3
155+
disk_size = 200
156+
}
157+
158+
tags {
159+
tag_key = "createBy"
160+
tag_value = "Terraform"
161+
}
162+
}
31163
32-
resource "tencentcloud_cdwdoris_user" "cdwdoris_user" {
33-
user_info = {
164+
# create user
165+
resource "tencentcloud_cdwdoris_user" "example" {
166+
user_info {
167+
instance_id = tencentcloud_cdwdoris_instance.example.id
168+
username = "example"
169+
password = "Password@123"
170+
describe = "test demo update."
34171
}
35172
}
36173
`

‎tencentcloud/services/cdwdoris/resource_tc_cdwdoris_workload_group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "tencentcloud_cdwdoris_instance" "example" {
3636
ha_flag = false
3737
case_sensitive = 0
3838
enable_multi_zones = false
39-
workload_group_status = true
39+
workload_group_status = "open"
4040
4141
charge_properties {
4242
charge_type = "POSTPAID_BY_HOUR"

0 commit comments

Comments
 (0)