Skip to content

Commit 53503d3

Browse files
committed
add
1 parent 8a8fb50 commit 53503d3

File tree

8 files changed

+3687
-2342
lines changed

8 files changed

+3687
-2342
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ require (
4545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.748
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.860
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
48-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932
48+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.950
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.950
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

go.sum

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544 h1:
860860
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544/go.mod h1:c37rIdL3LrJXYwrfp9c8L4MabTqKIZUe1xvnWhN75oc=
861861
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860 h1:IU20AhNd0fEbgFzTTGB8cdMkUCrgB0FsLd0puC4QDzU=
862862
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860/go.mod h1:RP3NkBvKio1dFmCNKozHX9qmef57sUCfsTcE0FnCvjk=
863+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.950 h1:Kn+PdQVL2rolp8sy7PGNnocG37omPxDAUSPnVNmt+m4=
864+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.950/go.mod h1:KH1QFeKGUpNF6pon3jyKM7PkqbLhJkJr1liAFPVjcjo=
863865
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.414/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
864866
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.486/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
865867
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.524/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
@@ -924,17 +926,18 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888 h1:FqVc
924926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
925927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910 h1:u+rAnHhLixQaNYy8vtnuClj4kYWs77VAHEbi9jl8k/4=
926928
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=
928929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912 h1:BDqRmR+2vLLHqKWYdgfUl0CDr9+augDBOEOEScLyQ80=
929930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
931932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920 h1:Kmm4rJrdI7D29IMOTT2oNp70h0TGsZ3obaekS8hvYkU=
933934
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=
936935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.921 h1:xB4iO1xX84bVhHIizPC27txPJIN7cmKYvZmuSiGShxM=
937936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.921/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932 h1:MB1+Ll6JxWTpZw/v0dMRvMEJhlcDKxK/JMQ8O5owRVc=
938+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.950 h1:gsBG5scMDYykLzPSj9aXCTxVjWE5lt+y6VwNAROf7Fw=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.950/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
938941
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
939942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
940943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=

tencentcloud/services/cls/resource_tc_cls_topic.go

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,60 @@ func ResourceTencentCloudClsTopic() *schema.Resource {
8282
Optional: true,
8383
Description: "Log Topic Description.",
8484
},
85+
"is_web_tracking": {
86+
Type: schema.TypeBool,
87+
Optional: true,
88+
Computed: true,
89+
Description: "No authentication switch. False: closed; True: Enable. The default is false. After activation, anonymous access to the log topic will be supported for specified operations.",
90+
},
91+
"extends": {
92+
Type: schema.TypeList,
93+
Optional: true,
94+
MaxItems: 1,
95+
Description: "Log Subject Extension Information.",
96+
Elem: &schema.Resource{
97+
Schema: map[string]*schema.Schema{
98+
"anonymous_access": {
99+
Type: schema.TypeString,
100+
Optional: true,
101+
Description: "Log topic authentication free configuration information.",
102+
Elem: &schema.Resource{
103+
Schema: map[string]*schema.Schema{
104+
"operations": {
105+
Type: schema.TypeList,
106+
Optional: true,
107+
Description: "Operation list, supporting trackLog (JS/HTTP upload log) and realtimeProducer (kafka protocol upload log).",
108+
},
109+
"conditions": {
110+
Type: schema.TypeList,
111+
Optional: true,
112+
Description: "Operation list, supporting trackLog (JS/HTTP upload log) and realtimeProducer (kafka protocol upload log).",
113+
Elem: &schema.Resource{
114+
Schema: map[string]*schema.Schema{
115+
"attributes": {
116+
Type: schema.TypeString,
117+
Optional: true,
118+
Description: "Condition attribute, currently only VpcID is supported.",
119+
},
120+
"rule": {
121+
Type: schema.TypeInt,
122+
Optional: true,
123+
Description: "Conditional rule, 1: equal, 2: not equal.",
124+
},
125+
"condition_value": {
126+
Type: schema.TypeString,
127+
Optional: true,
128+
Description: "The value of the corresponding conditional attribute.",
129+
},
130+
},
131+
},
132+
},
133+
},
134+
},
135+
},
136+
},
137+
},
138+
},
85139
},
86140
}
87141
}
@@ -144,6 +198,49 @@ func resourceTencentCloudClsTopicCreate(d *schema.ResourceData, meta interface{}
144198
request.Describes = helper.String("")
145199
}
146200

201+
if v, ok := d.GetOkExists("is_web_tracking"); ok {
202+
request.IsWebTracking = helper.Bool(v.(bool))
203+
}
204+
205+
if v, ok := d.GetOk("extends"); ok {
206+
topicExtendInfoList := make([]*cls.TopicExtendInfo, 0)
207+
for _, item := range v.([]interface{}) {
208+
topicExtendInfo := cls.TopicExtendInfo{}
209+
tmpMap := item.(map[string]interface{})
210+
anonymousInfo := cls.AnonymousInfo{}
211+
if v, ok := tmpMap["operations"]; ok {
212+
valuesSet := v.(*schema.Set).List()
213+
anonymousInfo.Operations = helper.InterfacesStringsPoint(valuesSet)
214+
}
215+
216+
if v, ok := tmpMap["conditions"]; ok {
217+
conditionInfoList := make([]*cls.ConditionInfo, 0)
218+
for _, condition := range v.([]interface{}) {
219+
conditionInfo := cls.ConditionInfo{}
220+
conditionMap := condition.(map[string]interface{})
221+
if v, ok := conditionMap["attributes"]; ok {
222+
conditionInfo.Attributes = helper.String(v.(string))
223+
}
224+
225+
if v, ok := conditionMap["rule"]; ok {
226+
conditionInfo.Rule = helper.IntUint64(v.(int))
227+
}
228+
229+
if v, ok := conditionMap["condition_value"]; ok {
230+
conditionInfo.ConditionValue = helper.String(v.(string))
231+
}
232+
}
233+
234+
anonymousInfo.Conditions = conditionInfoList
235+
}
236+
237+
topicExtendInfo.AnonymousAccess = &anonymousInfo
238+
topicExtendInfoList = append(topicExtendInfoList, &topicExtendInfo)
239+
}
240+
241+
request.Extends = topicExtendInfoList[0]
242+
}
243+
147244
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
148245
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClsClient().CreateTopic(request)
149246
if e != nil {
@@ -209,6 +306,7 @@ func resourceTencentCloudClsTopicRead(d *schema.ResourceData, meta interface{})
209306
_ = d.Set("period", topic.Period)
210307
_ = d.Set("hot_period", topic.HotPeriod)
211308
_ = d.Set("describes", topic.Describes)
309+
_ = d.Set("is_web_tracking", topic.IsWebTracking)
212310

213311
return nil
214312
}

0 commit comments

Comments
 (0)