Skip to content

Commit 445e747

Browse files
gitmknhellertang
andauthored
feat: support teo (#2154)
* feat: support teo * fix: modify teo * fix: modify certificate * fix: modify sum * fix: modify test * fix: delete teo const * fix: modify test * fix: modfiy test * fix: modify acceleration domain * fix: add examples * fix: modfiy example * fix: modify doc * fix: modify zone * fix: modify zone * fix: modify doc * fix: modify plan zone * update doc * fix: modify certificate * feat: add chagnelog * update changelog --------- Co-authored-by: hellertang <hellertang@tencent.com>
1 parent b186bef commit 445e747

39 files changed

+4467
-2708
lines changed

.changelog/2154.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
```release-note:new-resource
2+
tencentcloud_teo_ownership_verify
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_teo_certificate_config
7+
```
8+
9+
```release-note:new-resource
10+
tencentcloud_teo_acceleration_domain
11+
```
12+
13+
```release-note:enhancement
14+
resource/tencentcloud_teo_zone: Support create zone with existing plan
15+
```

examples/tencentcloud-teo/main.tf

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
terraform {
2+
required_providers {
3+
tencentcloud = {
4+
source = "tencentcloudstack/tencentcloud"
5+
# 通过version指定版本
6+
# version = "1.79.10"
7+
}
8+
}
9+
}
10+
11+
# TEO
12+
provider "tencentcloud" {
13+
region = "ap-guangzhou"
14+
15+
secret_id = ""
16+
secret_key = ""
17+
18+
}
19+
20+
# Domain
21+
provider "tencentcloud" {
22+
alias = "tfdomain"
23+
region = "ap-guangzhou"
24+
secret_id = ""
25+
secret_key = ""
26+
}
27+
28+
29+
variable "zone_name" {
30+
default = "tf-teo.com"
31+
}
32+
33+
# cname
34+
resource "tencentcloud_teo_zone" "zone" {
35+
area = "overseas"
36+
alias_zone_name = "tftest"
37+
paused = false
38+
plan_id = "edgeone-2kfv1h391n6w"
39+
tags = {
40+
"createdBy" = "terraform"
41+
}
42+
type = "partial"
43+
zone_name = var.zone_name
44+
}
45+
46+
resource "tencentcloud_dnspod_record" "demo" {
47+
provider = tencentcloud.tfdomain
48+
49+
domain = var.zone_name
50+
record_type = tencentcloud_teo_zone.zone.ownership_verification.0.dns_verification.0.record_type
51+
record_line = "默认"
52+
value = tencentcloud_teo_zone.zone.ownership_verification.0.dns_verification.0.record_value
53+
sub_domain = tencentcloud_teo_zone.zone.ownership_verification.0.dns_verification.0.subdomain
54+
55+
}
56+
57+
resource "tencentcloud_teo_ownership_verify" "ownership_verify" {
58+
domain = var.zone_name
59+
60+
depends_on = [tencentcloud_dnspod_record.demo]
61+
}
62+
63+
variable "sub_domain" {
64+
default = "aaa"
65+
}
66+
67+
resource "tencentcloud_teo_acceleration_domain" "acceleration_domain" {
68+
zone_id = tencentcloud_teo_zone.zone.id
69+
domain_name = "${var.sub_domain}.${var.zone_name}"
70+
71+
origin_info {
72+
origin = "150.109.8.1"
73+
origin_type = "IP_DOMAIN"
74+
}
75+
76+
depends_on = [tencentcloud_teo_ownership_verify.ownership_verify]
77+
}
78+
79+
resource "tencentcloud_dnspod_record" "acceleration_domain_record" {
80+
provider = tencentcloud.tfdomain
81+
82+
domain = var.zone_name
83+
record_type = "CNAME"
84+
record_line = "默认"
85+
value = "${tencentcloud_teo_acceleration_domain.acceleration_domain.domain_name}.eo.dnse0.com."
86+
sub_domain = var.sub_domain
87+
88+
}
89+
90+
resource "tencentcloud_teo_certificate_config" "certificate" {
91+
host = tencentcloud_teo_acceleration_domain.acceleration_domain.domain_name
92+
mode = "eofreecert"
93+
zone_id = tencentcloud_teo_zone.zone.id
94+
95+
depends_on = [tencentcloud_dnspod_record.acceleration_domain_record]
96+
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ require (
8686
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533
8787
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.713
8888
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
89-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.730
89+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758
9090
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.759
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.755

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.751/go.mod
874874
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.754/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
875875
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.755/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
876876
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.756/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
877+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.758 h1:T7Ry6y9RFScNo6Ji2b60mUe/9h3h8LkBsJfXOq+D3Jk=
878+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.758/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
877879
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.759 h1:flWgFybB3MYWFxwRO4yXbdiPT3SNwjSLuXCXsfs6kN4=
878880
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.759/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
879881
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -966,6 +968,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
966968
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
967969
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.730 h1:isKxaxmOUKjXXRZZ6lmoy7WhqKLZcEKpRWU1adsIpm8=
968970
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.730/go.mod h1:vA9wf067VO5kkEjUgViUw/VA0ALUXE/wbSI1baeuHpI=
971+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758 h1:PRxMkSm3MX0vuWQSRO7pY0bwT8M2PEZW2BnKpZdjzK0=
972+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758/go.mod h1:GKX+ZVvPOgussCe/4hAreiglWRa5w9PTDKoxedZ3Wc4=
969973
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.759 h1:frH1xtZwfswnLG84y3FjJLgJBgGewG/A3OYVUN5vYus=
970974
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.759/go.mod h1:+YUTVPhy9Lk8SutYIj4pKpO33HpdFMLs0Y3Cg1a+6qQ=
971975
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M6uA8Y/FC1b88TFxvRManGW+i62Isqg1lW8HjHDvU=

tencentcloud/basic_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -815,16 +815,6 @@ locals {
815815

816816
// End of MongoDB
817817

818-
// TEO
819-
820-
const (
821-
defaultZoneName = "tf-teo-t.xyz"
822-
defaultZoneId = "zone-2a1u0y616jz6"
823-
applicationProxyId = "sid-2f8xqhmf32dt"
824-
)
825-
826-
// End of TEO
827-
828818
// TCM
829819

830820
const (

tencentcloud/provider.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,8 +1181,10 @@ TencentCloud EdgeOne(TEO)
11811181
tencentcloud_teo_zone_setting
11821182
tencentcloud_teo_origin_group
11831183
tencentcloud_teo_rule_engine
1184-
tencentcloud_teo_application_proxy
11851184
tencentcloud_teo_application_proxy_rule
1185+
tencentcloud_teo_ownership_verify
1186+
tencentcloud_teo_certificate_config
1187+
tencentcloud_teo_acceleration_domain
11861188
11871189
TencentCloud ServiceMesh(TCM)
11881190
Data Source
@@ -2872,6 +2874,9 @@ func Provider() *schema.Provider {
28722874
"tencentcloud_teo_zone_setting": resourceTencentCloudTeoZoneSetting(),
28732875
"tencentcloud_teo_origin_group": resourceTencentCloudTeoOriginGroup(),
28742876
"tencentcloud_teo_rule_engine": resourceTencentCloudTeoRuleEngine(),
2877+
"tencentcloud_teo_ownership_verify": resourceTencentCloudTeoOwnershipVerify(),
2878+
"tencentcloud_teo_certificate_config": resourceTencentCloudTeoCertificateConfig(),
2879+
"tencentcloud_teo_acceleration_domain": resourceTencentCloudTeoAccelerationDomain(),
28752880
"tencentcloud_teo_application_proxy": resourceTencentCloudTeoApplicationProxy(),
28762881
"tencentcloud_teo_application_proxy_rule": resourceTencentCloudTeoApplicationProxyRule(),
28772882
"tencentcloud_tcm_mesh": resourceTencentCloudTcmMesh(),

0 commit comments

Comments
 (0)