Skip to content

Commit 7579286

Browse files
committed
init/updateFortiOSTerraform: 1.19.0
Signed-off-by: -HQCM <hq-devops-admin@fortinet.com>
1 parent b7d37ff commit 7579286

521 files changed

Lines changed: 24248 additions & 8069 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
1-
## 1.19.0 (Unreleased)
1+
## 1.20.0 (Unreleased)
22

33

4+
## 1.19.0 (Jan 29, 2024)
5+
BUG FIXES:
6+
7+
* Fix issue of remove BGP redistribute route map;
8+
* Set argument of ca to sensitive;
9+
* Fix wrong required arguments on resource firewall_shapingpolicy;
10+
* Fix crash issue of resource firewall_centralsnatmap_sort;
11+
* Fix extra double quotes issue;
12+
* Change doc of resource fortios_system_ha to use its own resource;
13+
14+
IMPROVEMENTS:
15+
16+
* Support FortiOS v7.4.2;
17+
* Update doc for the different description in different FOS versions;
18+
19+
FEATURES:
20+
21+
* **New Data source:** `fortios_diameterfilter_profile`
22+
* **New Data source:** `fortios_dlp_exactdatamatch`
23+
* **New Data source:** `fortios_rule_fmwp`
24+
* **New Data source:** `fortios_user_externalidentityprovider`
25+
* **New Data source:** `fortios_videofilter_keyword`
26+
* **New Data source:** `fortios_vpn_qkd`
27+
428
## 1.18.1 (Nov 14, 2023)
529
BUG FIXES:
630

fortios/config.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,12 @@ func toCertFormat(v interface{}) interface{} {
241241
}
242242
return v
243243
}
244+
245+
func remove_quote(v interface{}) interface{} {
246+
if t, ok := v.(string); ok {
247+
t = strings.ReplaceAll(t, "\"", "")
248+
t = strings.TrimSpace(t)
249+
return t
250+
}
251+
return v
252+
}

fortios/data_source_firewall_policy.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,10 @@ func dataSourceFirewallPolicy() *schema.Resource {
640640
Type: schema.TypeString,
641641
Computed: true,
642642
},
643+
"diameter_filter_profile": &schema.Schema{
644+
Type: schema.TypeString,
645+
Computed: true,
646+
},
643647
"virtual_patch_profile": &schema.Schema{
644648
Type: schema.TypeString,
645649
Computed: true,
@@ -2603,6 +2607,10 @@ func dataSourceFlattenFirewallPolicySctpFilterProfile(v interface{}, d *schema.R
26032607
return v
26042608
}
26052609

2610+
func dataSourceFlattenFirewallPolicyDiameterFilterProfile(v interface{}, d *schema.ResourceData, pre string) interface{} {
2611+
return v
2612+
}
2613+
26062614
func dataSourceFlattenFirewallPolicyVirtualPatchProfile(v interface{}, d *schema.ResourceData, pre string) interface{} {
26072615
return v
26082616
}
@@ -4043,6 +4051,12 @@ func dataSourceRefreshObjectFirewallPolicy(d *schema.ResourceData, o map[string]
40434051
}
40444052
}
40454053

4054+
if err = d.Set("diameter_filter_profile", dataSourceFlattenFirewallPolicyDiameterFilterProfile(o["diameter-filter-profile"], d, "diameter_filter_profile")); err != nil {
4055+
if !fortiAPIPatch(o["diameter-filter-profile"]) {
4056+
return fmt.Errorf("Error reading diameter_filter_profile: %v", err)
4057+
}
4058+
}
4059+
40464060
if err = d.Set("virtual_patch_profile", dataSourceFlattenFirewallPolicyVirtualPatchProfile(o["virtual-patch-profile"], d, "virtual_patch_profile")); err != nil {
40474061
if !fortiAPIPatch(o["virtual-patch-profile"]) {
40484062
return fmt.Errorf("Error reading virtual_patch_profile: %v", err)

fortios/data_source_firewall_proxypolicy.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,10 @@ func dataSourceFirewallProxyPolicy() *schema.Resource {
456456
Type: schema.TypeString,
457457
Computed: true,
458458
},
459+
"diameter_filter_profile": &schema.Schema{
460+
Type: schema.TypeString,
461+
Computed: true,
462+
},
459463
"virtual_patch_profile": &schema.Schema{
460464
Type: schema.TypeString,
461465
Computed: true,
@@ -1535,6 +1539,10 @@ func dataSourceFlattenFirewallProxyPolicySctpFilterProfile(v interface{}, d *sch
15351539
return v
15361540
}
15371541

1542+
func dataSourceFlattenFirewallProxyPolicyDiameterFilterProfile(v interface{}, d *schema.ResourceData, pre string) interface{} {
1543+
return v
1544+
}
1545+
15381546
func dataSourceFlattenFirewallProxyPolicyVirtualPatchProfile(v interface{}, d *schema.ResourceData, pre string) interface{} {
15391547
return v
15401548
}
@@ -1992,6 +2000,12 @@ func dataSourceRefreshObjectFirewallProxyPolicy(d *schema.ResourceData, o map[st
19922000
}
19932001
}
19942002

2003+
if err = d.Set("diameter_filter_profile", dataSourceFlattenFirewallProxyPolicyDiameterFilterProfile(o["diameter-filter-profile"], d, "diameter_filter_profile")); err != nil {
2004+
if !fortiAPIPatch(o["diameter-filter-profile"]) {
2005+
return fmt.Errorf("Error reading diameter_filter_profile: %v", err)
2006+
}
2007+
}
2008+
19952009
if err = d.Set("virtual_patch_profile", dataSourceFlattenFirewallProxyPolicyVirtualPatchProfile(o["virtual-patch-profile"], d, "virtual_patch_profile")); err != nil {
19962010
if !fortiAPIPatch(o["virtual-patch-profile"]) {
19972011
return fmt.Errorf("Error reading virtual_patch_profile: %v", err)

fortios/data_source_firewallservice_custom.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ func dataSourceFirewallServiceCustom() *schema.Resource {
3232
Type: schema.TypeString,
3333
Required: true,
3434
},
35+
"uuid": &schema.Schema{
36+
Type: schema.TypeString,
37+
Computed: true,
38+
},
3539
"proxy": &schema.Schema{
3640
Type: schema.TypeString,
3741
Computed: true,
@@ -203,6 +207,10 @@ func dataSourceFlattenFirewallServiceCustomName(v interface{}, d *schema.Resourc
203207
return v
204208
}
205209

210+
func dataSourceFlattenFirewallServiceCustomUuid(v interface{}, d *schema.ResourceData, pre string) interface{} {
211+
return v
212+
}
213+
206214
func dataSourceFlattenFirewallServiceCustomProxy(v interface{}, d *schema.ResourceData, pre string) interface{} {
207215
return v
208216
}
@@ -380,6 +388,12 @@ func dataSourceRefreshObjectFirewallServiceCustom(d *schema.ResourceData, o map[
380388
}
381389
}
382390

391+
if err = d.Set("uuid", dataSourceFlattenFirewallServiceCustomUuid(o["uuid"], d, "uuid")); err != nil {
392+
if !fortiAPIPatch(o["uuid"]) {
393+
return fmt.Errorf("Error reading uuid: %v", err)
394+
}
395+
}
396+
383397
if err = d.Set("proxy", dataSourceFlattenFirewallServiceCustomProxy(o["proxy"], d, "proxy")); err != nil {
384398
if !fortiAPIPatch(o["proxy"]) {
385399
return fmt.Errorf("Error reading proxy: %v", err)

fortios/data_source_firewallservice_group.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ func dataSourceFirewallServiceGroup() *schema.Resource {
3232
Type: schema.TypeString,
3333
Required: true,
3434
},
35+
"uuid": &schema.Schema{
36+
Type: schema.TypeString,
37+
Computed: true,
38+
},
3539
"member": &schema.Schema{
3640
Type: schema.TypeList,
3741
Computed: true,
@@ -111,6 +115,10 @@ func dataSourceFlattenFirewallServiceGroupName(v interface{}, d *schema.Resource
111115
return v
112116
}
113117

118+
func dataSourceFlattenFirewallServiceGroupUuid(v interface{}, d *schema.ResourceData, pre string) interface{} {
119+
return v
120+
}
121+
114122
func dataSourceFlattenFirewallServiceGroupMember(v interface{}, d *schema.ResourceData, pre string) []map[string]interface{} {
115123
if v == nil {
116124
return nil
@@ -172,6 +180,12 @@ func dataSourceRefreshObjectFirewallServiceGroup(d *schema.ResourceData, o map[s
172180
}
173181
}
174182

183+
if err = d.Set("uuid", dataSourceFlattenFirewallServiceGroupUuid(o["uuid"], d, "uuid")); err != nil {
184+
if !fortiAPIPatch(o["uuid"]) {
185+
return fmt.Errorf("Error reading uuid: %v", err)
186+
}
187+
}
188+
175189
if err = d.Set("member", dataSourceFlattenFirewallServiceGroupMember(o["member"], d, "member")); err != nil {
176190
if !fortiAPIPatch(o["member"]) {
177191
return fmt.Errorf("Error reading member: %v", err)

0 commit comments

Comments
 (0)