Skip to content

Commit 1a166c9

Browse files
SevenEarthSevenEarth
committed
add
1 parent 97ba2a1 commit 1a166c9

File tree

9 files changed

+3307
-2491
lines changed

9 files changed

+3307
-2491
lines changed

‎go.mod

Lines changed: 3 additions & 3 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.920
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932
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
@@ -88,7 +88,7 @@ require (
8888
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcm v1.0.547
8989
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.696
9090
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533
91-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825
91+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.932
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
@@ -111,6 +111,7 @@ require (
111111
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860
112112
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.798
113113
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831
114+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920
114115
github.com/wI2L/jsondiff v0.3.0
115116
k8s.io/apimachinery v0.22.4
116117
)
@@ -304,7 +305,6 @@ require (
304305
github.com/subosito/gotenv v1.4.1 // indirect
305306
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
306307
github.com/tdakkota/asciicheck v0.2.0 // indirect
307-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920 // indirect
308308
github.com/tetafro/godot v1.4.11 // indirect
309309
github.com/tidwall/gjson v1.17.0 // indirect
310310
github.com/tidwall/match v1.1.1 // indirect

‎go.sum

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,15 +922,17 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.860/go.mod
922922
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.873/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
923923
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888 h1:FqVcZ+POUhckq6ZRlwOR819fsXp49YyizpmWZJYAAGg=
924924
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
925-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
926925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910 h1:u+rAnHhLixQaNYy8vtnuClj4kYWs77VAHEbi9jl8k/4=
927926
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=
928928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912 h1:BDqRmR+2vLLHqKWYdgfUl0CDr9+augDBOEOEScLyQ80=
929929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
931931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920 h1:Kmm4rJrdI7D29IMOTT2oNp70h0TGsZ3obaekS8hvYkU=
933933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
934+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932 h1:MB1+Ll6JxWTpZw/v0dMRvMEJhlcDKxK/JMQ8O5owRVc=
935+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
934936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
935937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
936938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1025,6 +1027,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533 h1:r6HQh
10251027
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533/go.mod h1:5sIIchyV9sXIVAqsD3UWts+qQJ0qoc55sL2WuiY8Ugs=
10261028
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825 h1:jIAqpu+EeiKK1U0Sb7l1I6hMATYyXtv7IU8ZWNHPrgM=
10271029
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825/go.mod h1:aaOidZKQTtM6vVgs5pnHryaLj9f+egPBpdQEylQxka4=
1030+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.932 h1:qBMRApryLiQOJ91xEybn3fb6zkWfa9sp8Tdult5Y1vY=
1031+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.932/go.mod h1:k2QG6A7u458viC4nZGM0Z0FNzKqQSJKgfqtxeqkqBDQ=
10281032
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUroO+FAslUmsDWGi8nvczsqZBWVgQwlnyT0Aj8=
10291033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
10301034
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758 h1:PRxMkSm3MX0vuWQSRO7pY0bwT8M2PEZW2BnKpZdjzK0=

‎tencentcloud/services/trocket/resource_tc_tdmq_rocketmq_vip_instance.go

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func ResourceTencentCloudTdmqRocketmqVipInstance() *schema.Resource {
3232
"spec": {
3333
Required: true,
3434
Type: schema.TypeString,
35-
Description: "Instance specification: Basic type: `rocket-vip-basic-1`, Standard type: `rocket-vip-basic-2`, Advanced Type I: `rocket-vip-basic-3`, Advanced Type II: `rocket-vip-basic-4`.",
35+
Description: "Instance specification: Universal type, rocket-vip-basic-0, Basic type: `rocket-vip-basic-1`, Standard type: `rocket-vip-basic-2`, Advanced Type I: `rocket-vip-basic-3`, Advanced Type II: `rocket-vip-basic-4`.",
3636
},
3737
"node_count": {
3838
Required: true,
@@ -77,6 +77,30 @@ func ResourceTencentCloudTdmqRocketmqVipInstance() *schema.Resource {
7777
Type: schema.TypeInt,
7878
Description: "Purchase period, in months.",
7979
},
80+
"ip_rules": {
81+
Optional: true,
82+
Type: schema.TypeList,
83+
Description: "Public IP access control rules.",
84+
Elem: &schema.Resource{
85+
Schema: map[string]*schema.Schema{
86+
"ip_rule": {
87+
Type: schema.TypeString,
88+
Required: true,
89+
Description: "IP address block information.",
90+
},
91+
"allow": {
92+
Type: schema.TypeBool,
93+
Required: true,
94+
Description: "Whether to allow or deny.",
95+
},
96+
"remark": {
97+
Type: schema.TypeString,
98+
Required: true,
99+
Description: "Remark.",
100+
},
101+
},
102+
},
103+
},
80104
},
81105
}
82106
}
@@ -133,6 +157,26 @@ func resourceTencentCloudTdmqRocketmqVipInstanceCreate(d *schema.ResourceData, m
133157
request.TimeSpan = helper.IntInt64(v.(int))
134158
}
135159

160+
if v, ok := d.GetOk("ip_rules"); ok {
161+
for _, item := range v.([]interface{}) {
162+
dMap := item.(map[string]interface{})
163+
ipRule := tdmq.PublicAccessRule{}
164+
if v, ok := dMap["ip_rule"]; ok {
165+
ipRule.IpRule = helper.String(v.(string))
166+
}
167+
168+
if v, ok := dMap["allow"]; ok {
169+
ipRule.Allow = helper.Bool(v.(bool))
170+
}
171+
172+
if v, ok := dMap["remark"]; ok {
173+
ipRule.Remark = helper.String(v.(string))
174+
}
175+
176+
request.IpRules = append(request.IpRules, &ipRule)
177+
}
178+
}
179+
136180
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
137181
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTdmqClient().CreateRocketMQVipInstance(request)
138182
if e != nil {
@@ -248,6 +292,10 @@ func resourceTencentCloudTdmqRocketmqVipInstanceRead(d *schema.ResourceData, met
248292
_ = d.Set("storage_size", storageSize)
249293
}
250294

295+
if rocketmqVipInstances != nil {
296+
_ = d.Set("spec", rocketmqVipInstances.SpecName)
297+
}
298+
251299
return nil
252300
}
253301

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

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

0 commit comments

Comments
 (0)