Skip to content

Commit b69a5d4

Browse files
fix/cfw (#2481)
* fix/cfw * fix/cfw --------- Co-authored-by: andrewjiang <104899514+andrew-tx@users.noreply.github.com>
1 parent 651fc5c commit b69a5d4

File tree

12 files changed

+1394
-243
lines changed

12 files changed

+1394
-243
lines changed

.changelog/2481.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_cfw_edge_policy: Add return parameters
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_cfw_nat_policy: Add return parameters
7+
```
8+
9+
```release-note:enhancement
10+
resource/tencentcloud_cfw_vpc_policy: Add return parameters
11+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
4040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch v1.0.843
4141
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627
42-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.759
42+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.841
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
4444
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695
4545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.748

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627 h1:nChNdoC
856856
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627/go.mod h1:lr3IyWgJk4rLWr0vVd8J1Tfs5O+wNcwSZ9ciMhGUrlI=
857857
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.759 h1:xQ7s3VZPLFHRu6m2Vra2qGgsEfC7vu8wkRAf74VMYNI=
858858
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.759/go.mod h1:V0PvdfiaRTBUvtlwHihxTT8dSCl/ZOOZIymMlhknISA=
859+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.841 h1:1GWCoGe7puNJxAtLqV1CqHuZ48zMEkONJc5WEyDNHqk=
860+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.841/go.mod h1:X82Do5gZwZf42fx9uE0DdQjWn0ALF21vhvyITzIhuG8=
859861
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600 h1:qSpp4rEgAzfXhi1rPxes+AJp2mwnsyRGPY/Km1FuYGs=
860862
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600/go.mod h1:xud1dQ7Rc23yC5kS00TYRrvZ/A+94EOkwquaI6xGVac=
861863
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam v1.0.695 h1:FGwsF1/PgY+M92bEC+0NH4tJkI8i0qjrLbZWVjLXOAY=
@@ -942,6 +944,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.833 h1:EE3P
942944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.833/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
943945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.839 h1:VGVFNQDaUpDsPkJrh8I9qOxHZ1yj5sJmg9ngsUvTAHM=
944946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.839/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
947+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.841 h1:SJJR4tLnr0V17uEVS+arAmR1yl8n6dObBZs77SAmXZE=
948+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.841/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
945949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.843 h1:ewSxQuJAqdjE3RqFIaDhM/88lIe10JfUFbS4hMQHK5M=
946950
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.843/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
947951
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.845 h1:fiiVD3+m2gJFQItUomuJ7OpXHKyULTDu0LDZ/iOKI4A=

tencentcloud/services/cfw/resource_tc_cfw_edge_policy.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ func ResourceTencentCloudCfwEdgePolicy() *schema.Resource {
9292
ValidateFunc: tccommon.ValidateAllowedStringValue(POLICY_SCOPE),
9393
Description: "Effective range. serial: serial; side: bypass; all: global, Default is all.",
9494
},
95+
"param_template_id": {
96+
Type: schema.TypeString,
97+
Computed: true,
98+
Description: "Parameter template id.",
99+
},
95100
},
96101
}
97102
}
@@ -270,6 +275,10 @@ func resourceTencentCloudCfwEdgePolicyRead(d *schema.ResourceData, meta interfac
270275
_ = d.Set("scope", edgePolicy.Scope)
271276
}
272277

278+
if edgePolicy.ParamTemplateId != nil {
279+
_ = d.Set("param_template_id", edgePolicy.ParamTemplateId)
280+
}
281+
273282
return nil
274283
}
275284

tencentcloud/services/cfw/resource_tc_cfw_nat_policy.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ func ResourceTencentCloudCfwNatPolicy() *schema.Resource {
8383
Optional: true,
8484
Description: "Description.",
8585
},
86+
"param_template_id": {
87+
Type: schema.TypeString,
88+
Computed: true,
89+
Description: "Parameter template id. Note: This field may return null, indicating that no valid value can be obtained.",
90+
},
8691
},
8792
}
8893
}
@@ -231,6 +236,10 @@ func resourceTencentCloudCfwNatPolicyRead(d *schema.ResourceData, meta interface
231236
_ = d.Set("scope", natPolicy.Scope)
232237
}
233238

239+
if natPolicy.ParamTemplateId != nil {
240+
_ = d.Set("param_template_id", natPolicy.ParamTemplateId)
241+
}
242+
234243
return nil
235244
}
236245

tencentcloud/services/cfw/resource_tc_cfw_vpc_policy.go

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,40 @@ func ResourceTencentCloudCfwVpcPolicy() *schema.Resource {
9494
Computed: true,
9595
Description: "Firewall name.",
9696
},
97+
"beta_list": {
98+
Type: schema.TypeList,
99+
Computed: true,
100+
Description: "Beta mission details. Note: This field may return null, indicating that no valid value can be obtained.",
101+
Elem: &schema.Resource{
102+
Schema: map[string]*schema.Schema{
103+
"task_id": {
104+
Type: schema.TypeInt,
105+
Optional: true,
106+
Description: "Task id. Note: This field may return null, indicating that no valid value can be obtained.",
107+
},
108+
"task_name": {
109+
Type: schema.TypeString,
110+
Optional: true,
111+
Description: "Mission name. Note: This field may return null, indicating that no valid value can be obtained.",
112+
},
113+
"last_time": {
114+
Type: schema.TypeString,
115+
Optional: true,
116+
Description: "Last execution time. Note: This field may return null, indicating that no valid value can be obtained.",
117+
},
118+
},
119+
},
120+
},
121+
"param_template_id": {
122+
Type: schema.TypeString,
123+
Computed: true,
124+
Description: "Parameter template id. Note: This field may return null, indicating that no valid value can be obtained.",
125+
},
126+
"param_template_name": {
127+
Type: schema.TypeString,
128+
Computed: true,
129+
Description: "Parameter template Name. Note: This field may return null, indicating that no valid value can be obtained.",
130+
},
97131
},
98132
}
99133
}
@@ -257,6 +291,37 @@ func resourceTencentCloudCfwVpcPolicyRead(d *schema.ResourceData, meta interface
257291
_ = d.Set("fw_group_name", vpcPolicy.FwGroupName)
258292
}
259293

294+
if vpcPolicy.BetaList != nil {
295+
betaListList := []interface{}{}
296+
for _, betaList := range vpcPolicy.BetaList {
297+
betaListMap := map[string]interface{}{}
298+
299+
if betaList.TaskId != nil {
300+
betaListMap["task_id"] = betaList.TaskId
301+
}
302+
303+
if betaList.TaskName != nil {
304+
betaListMap["task_name"] = betaList.TaskName
305+
}
306+
307+
if betaList.LastTime != nil {
308+
betaListMap["last_time"] = betaList.LastTime
309+
}
310+
311+
betaListList = append(betaListList, betaListMap)
312+
}
313+
314+
_ = d.Set("beta_list", betaListList)
315+
}
316+
317+
if vpcPolicy.ParamTemplateId != nil {
318+
_ = d.Set("param_template_id", vpcPolicy.ParamTemplateId)
319+
}
320+
321+
if vpcPolicy.ParamTemplateName != nil {
322+
_ = d.Set("param_template_name", vpcPolicy.ParamTemplateName)
323+
}
324+
260325
return nil
261326
}
262327

0 commit comments

Comments
 (0)