Skip to content

Commit a9482ef

Browse files
SevenEarthSevenEarth
committed
Merge branch 'master' of github.com:tencentcloudstack/terraform-provider-tencentcloud into fix/sg-rule-set
2 parents 84dc1db + f6adf38 commit a9482ef

30 files changed

+4647
-1294
lines changed

‎.changelog/1868.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
```release-note:new-resource
2+
tencentcloud_tsf_deploy_container_group
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_tsf_deploy_vm_group
7+
```
8+
9+
```release-note:new-resource
10+
tencentcloud_tsf_release_api_group
11+
```
12+
13+
```release-note:new-resource
14+
tencentcloud_tsf_operate_container_group
15+
```
16+
17+
```release-note:new-resource
18+
tencentcloud_tsf_operate_group
19+
```
20+
21+
```release-note:new-resource
22+
tencentcloud_tsf_unit_namespace
23+
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ require (
8383
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.529
8484
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.644
8585
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.650
86-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.661
86+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
8787
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
8888
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.669
8989
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199

‎go.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.670/go.mod
850850
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.672/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
851851
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.673 h1:+QDlxKbbn2n6CbPHcoef/ODa/0yfYoxL5CC2UI96Qi8=
852852
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.673/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
853+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.674 h1:iMsBaE3H5o/wtUqsxqeZfnGfn8vUBYMTrkpTAWk1Btk=
854+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.674/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
853855
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.676 h1:jU+t/PoRS+UhVN9SnIL96rbTSZidDjNKHJVrc/zl80Y=
854856
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.676/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
855857
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -945,6 +947,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.650 h1:gQFdOUL
945947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.650/go.mod h1:cNgQjHihEHq9Z2n6sSe/l7gG6pf7nhWue7e+Iu+wQCc=
946948
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.661 h1:HSmh+b8jidA5B8Ka+caQ6eZA2mgM+aVQQHS6hffs+a4=
947949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.661/go.mod h1:TuZbqKrmzJf1EmO+Rb3hE/9iUQBr/OUtMRhWxsYZ2gs=
950+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.673 h1:DjBzrA+GYAe2VuyH8gMke2WnAz4QKRhlcqELXAe1Cks=
951+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.673/go.mod h1:EE5luGR9aUIPqPBSPk4JALRb1MAlpXvYleI71bTD5cw=
952+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674 h1:VsMV1/vsgVzespG7jUzraZS/AbAUllVQjmtVAlA9W/M=
953+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674/go.mod h1:6+MWxaNR4y+spZHYNntulOyj628owTLuWmEFebJOWdA=
948954
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=
949955
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
950956
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.669 h1:KCU7jNan7oVcTbPElce0YSKr43eyBWpADJhXzzxoeH8=

‎tencentcloud/basic_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,7 @@ const (
999999
defaultTsfGWGroupId = "group-vzd97zpy"
10001000
defaultTsfFileConfigId = "dcfg-f-ab6l9x5y"
10011001
defaultTsfImageId = "img-7r9vq8wd"
1002+
defaultTsfGWNamespaceId = "namespace-vwgo38wy"
10021003
)
10031004

10041005
// End of TSF

‎tencentcloud/provider.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,6 +1409,12 @@ Tencent Service Framework(TSF)
14091409
tencentcloud_tsf_bind_api_group
14101410
tencentcloud_tsf_application_file_config
14111411
tencentcloud_tsf_enable_unit_rule
1412+
tencentcloud_tsf_deploy_container_group
1413+
tencentcloud_tsf_deploy_vm_group
1414+
tencentcloud_tsf_release_api_group
1415+
tencentcloud_tsf_operate_container_group
1416+
tencentcloud_tsf_operate_group
1417+
tencentcloud_tsf_unit_namespace
14121418
14131419
Media Processing Service(MPS)
14141420
Resource
@@ -2630,7 +2636,6 @@ func Provider() *schema.Provider {
26302636
"tencentcloud_tsf_config_template": resourceTencentCloudTsfConfigTemplate(),
26312637
"tencentcloud_tsf_api_rate_limit_rule": resourceTencentCloudTsfApiRateLimitRule(),
26322638
"tencentcloud_tsf_application_release_config": resourceTencentCloudTsfApplicationReleaseConfig(),
2633-
"tencentcloud_tsf_contain_group": resourceTencentCloudTsfContainGroup(),
26342639
"tencentcloud_tsf_lane": resourceTencentCloudTsfLane(),
26352640
"tencentcloud_tsf_lane_rule": resourceTencentCloudTsfLaneRule(),
26362641
"tencentcloud_tsf_group": resourceTencentCloudTsfGroup(),
@@ -2643,6 +2648,12 @@ func Provider() *schema.Provider {
26432648
"tencentcloud_tsf_bind_api_group": resourceTencentCloudTsfBindApiGroup(),
26442649
"tencentcloud_tsf_application_file_config": resourceTencentCloudTsfApplicationFileConfig(),
26452650
"tencentcloud_tsf_enable_unit_rule": resourceTencentCloudTsfEnableUnitRule(),
2651+
"tencentcloud_tsf_deploy_container_group": resourceTencentCloudTsfDeployContainerGroup(),
2652+
"tencentcloud_tsf_deploy_vm_group": resourceTencentCloudTsfDeployVmGroup(),
2653+
"tencentcloud_tsf_release_api_group": resourceTencentCloudTsfReleaseApiGroup(),
2654+
"tencentcloud_tsf_operate_container_group": resourceTencentCloudTsfOperateContainerGroup(),
2655+
"tencentcloud_tsf_operate_group": resourceTencentCloudTsfOperateGroup(),
2656+
"tencentcloud_tsf_unit_namespace": resourceTencentCloudTsfUnitNamespace(),
26462657
"tencentcloud_mps_workflow": resourceTencentCloudMpsWorkflow(),
26472658
"tencentcloud_mps_transcode_template": resourceTencentCloudMpsTranscodeTemplate(),
26482659
"tencentcloud_mps_watermark_template": resourceTencentCloudMpsWatermarkTemplate(),

0 commit comments

Comments
 (0)