Skip to content

Commit 79a9d68

Browse files
SevenEarthSevenEarth
committed
add
1 parent 9f04e72 commit 79a9d68

21 files changed

+5500
-1071
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.860
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.945
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -92,7 +92,7 @@ require (
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
9494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916
95-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
95+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.945
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
9898
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860

‎go.sum

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888 h1:FqVc
924924
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
925925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910 h1:u+rAnHhLixQaNYy8vtnuClj4kYWs77VAHEbi9jl8k/4=
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
928927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912 h1:BDqRmR+2vLLHqKWYdgfUl0CDr9+augDBOEOEScLyQ80=
929928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
@@ -933,6 +932,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920 h1:Kmm4
933932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
934933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932 h1:MB1+Ll6JxWTpZw/v0dMRvMEJhlcDKxK/JMQ8O5owRVc=
935934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.945 h1:+8B+2Bit7qPgmjdZPaA5NGjkGnYTzP5DOi/sICubde8=
936+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.945/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
936937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
937938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
938939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1041,6 +1042,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916 h1:/ERZ1hN
10411042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916/go.mod h1:fhRshMGZ9Y+yDte3knOAlXhUQApfhhq5reebRFHi6VA=
10421043
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M6uA8Y/FC1b88TFxvRManGW+i62Isqg1lW8HjHDvU=
10431044
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756/go.mod h1:AJAItBOTaarpDpUF7pNp0tuz2Y6H2oFuMcyKouPs1IE=
1045+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.945 h1:YZyuYwhXARBTyZD4b2TwD8OEf1Gf16JKb27WyI6HjqA=
1046+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.945/go.mod h1:9dJBGOlcveY6tY9HCYMtHOvhe+ttlYcehk7/M5tbr5E=
10441047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=
10451048
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857/go.mod h1:CSGh7HSEzUoY09G67XTABi/aqNy3dSLCSuenb1i5x6k=
10461049
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674 h1:VsMV1/vsgVzespG7jUzraZS/AbAUllVQjmtVAlA9W/M=

‎tencentcloud/acctest/tke_basic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ locals {
8787
}
8888
`
8989

90-
//InstanceType
90+
// InstanceType
9191
const TkeDatasourceInstanceTypeTestCase = DefaultInstanceVariable + `
9292
data "tencentcloud_instance_types" "ins_type" {
9393
filter {

‎tencentcloud/services/apigateway/data_source_tc_api_gateway_api_app_api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ func DataSourceTencentCloudApiGatewayApiAppApi() *schema.Resource {
9595
Description: "API authentication type. Possible values are SECRET (key pair authentication), NONE (authentication-free), and OAUTH.",
9696
},
9797
"api_business_type": {
98-
Type: schema.TypeString,
99-
Computed: true,
98+
Type: schema.TypeString,
99+
Computed: true,
100100
Description: "Type of OAUTH API. Possible values are NORMAL (Business API), OAUTH (Authorization API).",
101101
},
102102
"auth_relation_api_id": {

‎tencentcloud/services/cam/data_source_tc_user_info.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package cam
33
import (
44
"context"
55
"fmt"
6-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
76
"log"
87
"math/rand"
98
"strconv"
109

10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
11+
1112
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1213

1314
cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"

‎tencentcloud/services/cfs/data_source_tc_cfs_available_zone.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ func DataSourceTencentCloudCfsAvailableZone() *schema.Resource {
7171
Elem: &schema.Resource{
7272
Schema: map[string]*schema.Schema{
7373
"sale_status": {
74-
Type: schema.TypeString,
75-
Computed: true,
74+
Type: schema.TypeString,
75+
Computed: true,
7676
Description: " Sale status. Valid values: sale_out (sold out), saling (purchasable), no_saling (non-purchasable).",
7777
},
7878
"protocol": {

‎tencentcloud/services/cos/data_source_tc_cos_bucket_inventorys.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ func DataSourceTencentCloudCosBucketInventorys() *schema.Resource {
7878
},
7979
},
8080
"optional_fields": {
81-
Type: schema.TypeList,
82-
Optional: true,
81+
Type: schema.TypeList,
82+
Optional: true,
8383
Description: "Analysis items to include in the inventory result .",
8484
Elem: &schema.Resource{
8585
Schema: map[string]*schema.Schema{

‎tencentcloud/services/cos/resource_tc_cos_bucket_inventory.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ func ResourceTencentCloudCosBucketInventory() *schema.Resource {
8383
},
8484
},
8585
"optional_fields": {
86-
Type: schema.TypeList,
87-
MaxItems: 1,
88-
Optional: true,
86+
Type: schema.TypeList,
87+
MaxItems: 1,
88+
Optional: true,
8989
Description: "Analysis items to include in the inventory result .",
9090
Elem: &schema.Resource{
9191
Schema: map[string]*schema.Schema{

‎tencentcloud/services/monitor/data_source_tc_monitor_alarm_policy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ func DataSourceTencentCloudMonitorAlarmPolicy() *schema.Resource {
426426
Description: "Statistical period in seconds. The valid values can be queried via DescribeAlarmMetricsNote: this field may return null, indicating that no valid value is obtained.",
427427
},
428428
"operator": {
429-
Type: schema.TypeString,
430-
Computed: true,
429+
Type: schema.TypeString,
430+
Computed: true,
431431
Description: "Statistical period in seconds. The valid values can be queried via DescribeAlarmMetrics.Note: this field may return null, indicating that no valid value is obtained.Operator String No Operatorintelligent = intelligent detection without thresholdeq = equal toge = greater than or equal togt = greater thanle = less than or equal tolt = less thanne = not equal today_increase = day-on-day increaseday_decrease = day-on-day decreaseday_wave = day-on-day fluctuationweek_increase = week-on-week increaseweek_decrease = week-on-week decreaseweek_wave = week-on-week fluctuationcycle_increase = cyclical increasecycle_decrease = cyclical decreasecycle_wave = cyclical fluctuationre = regex matchThe valid values can be queried via DescribeAlarmMetrics.Note: this field may return null, indicating that no valid value is obtained.",
432432
},
433433
"value": {

‎tencentcloud/services/mps/data_source_tc_mps_schedules.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@ func DataSourceTencentCloudMpsSchedules() *schema.Resource {
118118
Description: "The region of the AWS S3 bucket.",
119119
},
120120
"dir": {
121-
Type: schema.TypeString,
122-
Computed: true,
121+
Type: schema.TypeString,
122+
Computed: true,
123123
Description: "The bucket directory bound. It must be an absolute path that starts and ends with `/`, such as `/movie/201907/`. If you do not specify this, the root directory will be bound. .",
124124
},
125125
"formats": {
126126
Type: schema.TypeSet,
127127
Elem: &schema.Schema{
128128
Type: schema.TypeString,
129129
},
130-
Computed: true,
130+
Computed: true,
131131
Description: "The file formats that will trigger the scheme, such as [mp4, flv, mov]. If you do not specify this, the upload of files in any format will trigger the scheme. .",
132132
},
133133
"s3_secret_id": {

‎tencentcloud/services/mps/resource_tc_mps_schedule.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@ func ResourceTencentCloudMpsSchedule() *schema.Resource {
9292
Description: "The region of the AWS S3 bucket.",
9393
},
9494
"dir": {
95-
Type: schema.TypeString,
96-
Optional: true,
95+
Type: schema.TypeString,
96+
Optional: true,
9797
Description: "The bucket directory bound. It must be an absolute path that starts and ends with `/`, such as `/movie/201907/`. If you do not specify this, the root directory will be bound. .",
9898
},
9999
"formats": {
100100
Type: schema.TypeSet,
101101
Elem: &schema.Schema{
102102
Type: schema.TypeString,
103103
},
104-
Optional: true,
104+
Optional: true,
105105
Description: "The file formats that will trigger the scheme, such as [mp4, flv, mov]. If you do not specify this, the upload of files in any format will trigger the scheme. .",
106106
},
107107
"s3_secret_id": {

‎tencentcloud/services/rum/resource_tc_rum_project.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ func ResourceTencentCloudRumProject() *schema.Resource {
6868
},
6969

7070
"desc": {
71-
Type: schema.TypeString,
72-
Optional: true,
71+
Type: schema.TypeString,
72+
Optional: true,
7373
Description: " Description of the created project (optional and up to 1,000 characters).",
7474
},
7575

‎tencentcloud/services/trocket/resource_tc_trocket_rocketmq_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func ResourceTencentCloudTrocketRocketmqInstance() *schema.Resource {
4242
"sku_code": {
4343
Required: true,
4444
Type: schema.TypeString,
45-
Description: "SKU code. Available specifications are as follows: experiment_500, basic_1k, basic_2k, basic_4k, basic_6k.",
45+
Description: "SKU code. Available specifications are as follows: experiment_500, basic_1k, basic_2k, basic_3k, basic_4k, basic_5k, basic_6k, basic_7k, basic_8k, basic_9k, basic_10k, pro_4k, pro_6k, pro_8k, pro_1w, pro_15k, pro_2w, pro_25k, pro_3w, pro_35k, pro_4w, pro_45k, pro_5w, pro_55k, pro_60k, pro_65k, pro_70k, pro_75k, pro_80k, pro_85k, pro_90k, pro_95k, pro_100k, platinum_1w, platinum_2w, platinum_3w, platinum_4w, platinum_5w, platinum_6w, platinum_7w, platinum_8w, platinum_9w, platinum_10w, platinum_12w, platinum_14w, platinum_16w, platinum_18w, platinum_20w, platinum_25w, platinum_30w, platinum_35w, platinum_40w, platinum_45w, platinum_50w, platinum_60w, platinum_70w, platinum_80w, platinum_90w, platinum_100w.",
4646
},
4747

4848
"remark": {

‎tencentcloud/services/trocket/resource_tc_trocket_rocketmq_instance.md

Lines changed: 56 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,74 @@
11
Provides a resource to create a rocketmq 5.x instance
22

3-
~> **NOTE:** It only support create postpaid rocketmq 5.x instance.
3+
~> **NOTE:** It only supports create postpaid rocketmq 5.x instance.
44

55
Example Usage
66

7-
Basic Instance
7+
Create Basic Instance
8+
89
```hcl
9-
resource "tencentcloud_trocket_rocketmq_instance" "rocketmq_instance" {
10-
instance_type = "EXPERIMENT"
11-
name = "rocketmq-instance"
12-
sku_code = "experiment_500"
13-
remark = "remark"
14-
vpc_id = "vpc-xxxxxx"
15-
subnet_id = "subnet-xxxxxx"
10+
# create vpc
11+
resource "tencentcloud_vpc" "vpc" {
12+
name = "vpc"
13+
cidr_block = "10.0.0.0/16"
14+
}
15+
16+
# create vpc subnet
17+
resource "tencentcloud_subnet" "subnet" {
18+
name = "subnet"
19+
vpc_id = tencentcloud_vpc.vpc.id
20+
availability_zone = "ap-guangzhou-6"
21+
cidr_block = "10.0.20.0/28"
22+
is_multicast = false
23+
}
24+
25+
# create rocketmq instance
26+
resource "tencentcloud_trocket_rocketmq_instance" "example" {
27+
name = "tf-example"
28+
instance_type = "PRO"
29+
sku_code = "pro_4k"
30+
remark = "remark"
31+
vpc_id = tencentcloud_vpc.vpc.id
32+
subnet_id = tencentcloud_subnet.subnet.id
1633
tags = {
17-
tag_key = "rocketmq"
34+
tag_key = "rocketmq"
1835
tag_value = "5.x"
1936
}
2037
}
2138
```
2239

23-
Enable Public Instance
40+
Create Enable Public Network Instance
41+
2442
```hcl
25-
resource "tencentcloud_trocket_rocketmq_instance" "rocketmq_instance_public" {
26-
instance_type = "EXPERIMENT"
27-
name = "rocketmq-enable-public-instance"
28-
sku_code = "experiment_500"
29-
remark = "remark"
30-
vpc_id = "vpc-xxxxxx"
31-
subnet_id = "subnet-xxxxxx"
43+
# create vpc
44+
resource "tencentcloud_vpc" "vpc" {
45+
name = "vpc"
46+
cidr_block = "10.0.0.0/16"
47+
}
48+
49+
# create vpc subnet
50+
resource "tencentcloud_subnet" "subnet" {
51+
name = "subnet"
52+
vpc_id = tencentcloud_vpc.vpc.id
53+
availability_zone = "ap-guangzhou-6"
54+
cidr_block = "10.0.20.0/28"
55+
is_multicast = false
56+
}
57+
58+
# create rocketmq instance
59+
resource "tencentcloud_trocket_rocketmq_instance" "example" {
60+
name = "tf-example"
61+
instance_type = "PRO"
62+
sku_code = "pro_4k"
63+
remark = "remark"
64+
vpc_id = tencentcloud_vpc.vpc.id
65+
subnet_id = tencentcloud_subnet.subnet.id
66+
enable_public = true
67+
bandwidth = 10
3268
tags = {
33-
tag_key = "rocketmq"
69+
tag_key = "rocketmq"
3470
tag_value = "5.x"
3571
}
36-
enable_public = true
37-
bandwidth = 1
3872
}
3973
```
4074

@@ -43,5 +77,5 @@ Import
4377
trocket rocketmq_instance can be imported using the id, e.g.
4478

4579
```
46-
terraform import tencentcloud_trocket_rocketmq_instance.rocketmq_instance rocketmq_instance_id
80+
terraform import tencentcloud_trocket_rocketmq_instance.rocketmq_instance rmq-n5qado7m
4781
```

0 commit comments

Comments
 (0)