Skip to content

Commit f093b8b

Browse files
FTNT-HQCMFTNT-HQCM
committed
init/updateFortiManagerTerraform: 1.16.0
Signed-off-by: FTNT-HQCM <hq-devops-admin@fortinet.com>
1 parent ca17205 commit f093b8b

234 files changed

Lines changed: 24009 additions & 76 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: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,42 @@
1-
## 1.16.0 (Unreleased)
1+
## 1.17.0 (Unreleased)
2+
3+
## 1.16.0 (Mar 07, 2026)
4+
5+
IMPROVEMENTS:
6+
* Fix issue of missing pkg_folder_path after import the resource;
7+
* Support FortiProxy APIs;
8+
9+
FEATURES:
10+
* **New Resource:** `fortimanager_object_firewall_profileprotocoloptions_proxyredirect`
11+
* **New Resource:** `fortimanager_object_firewall_proxyaddress6`
12+
* **New Resource:** `fortimanager_object_firewall_proxyaddress6_headergroup`
13+
* **New Resource:** `fortimanager_object_firewall_proxyaddress6_tagging`
14+
* **New Resource:** `fortimanager_object_firewall_proxyaddrgrp6`
15+
* **New Resource:** `fortimanager_object_firewall_proxyaddrgrp6_tagging`
16+
* **New Resource:** `fortimanager_object_firewall_shapingprofile_classes`
17+
* **New Resource:** `fortimanager_object_firewall_shapingprofile_classes_move`
18+
* **New Resource:** `fortimanager_object_firewall_sslsshprofile_sslclientcertificate`
19+
* **New Resource:** `fortimanager_object_icap_remoteserver`
20+
* **New Resource:** `fortimanager_object_icap_remoteservergroup`
21+
* **New Resource:** `fortimanager_object_icap_remoteservergroup_serverlist`
22+
* **New Resource:** `fortimanager_object_imageanalyzer_profile`
23+
* **New Resource:** `fortimanager_object_isolator_profile`
24+
* **New Resource:** `fortimanager_object_isolator_profile_entries`
25+
* **New Resource:** `fortimanager_object_isolator_profile_entries_move`
26+
* **New Resource:** `fortimanager_object_user_oidc`
27+
* **New Resource:** `fortimanager_object_webproxy_explicitproxy`
28+
* **New Resource:** `fortimanager_object_webproxy_redirectprofile`
29+
* **New Resource:** `fortimanager_object_webproxy_redirectprofile_entries`
30+
* **New Resource:** `fortimanager_object_webproxy_redirectprofile_entries_move`
31+
* **New Resource:** `fortimanager_object_webfilter_domainlist`
32+
* **New Resource:** `fortimanager_object_webfilter_domainlist_entries`
33+
* **New Resource:** `fortimanager_object_webfilter_urllist`
34+
* **New Resource:** `fortimanager_object_webfilter_urllist_entries`
35+
* **New Resource:** `fortimanager_object_ztna_serviceconnector`
36+
* **New Resource:** `fortimanager_object_ztna_trafficforwardproxy_urlroute`
37+
* **New Resource:** `fortimanager_packages_firewall_responseshapingpolicy`
38+
* **New Resource:** `fortimanager_packages_firewall_responseshapingpolicy_move`
39+
* **New Resource:** `fortimanager_systemp_log_syslogd_setting_logtemplates`
240

341
## 1.15.0 (Nov 12, 2025)
442

‎fmg/provider.go‎

Lines changed: 31 additions & 0 deletions
Large diffs are not rendered by default.

‎fmg/resource_dvm_cmd_add_device.go‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ func resourceDvmCmdAddDevice() *schema.Resource {
8585
Type: schema.TypeString,
8686
Optional: true,
8787
},
88-
"metafields_map": &schema.Schema{
89-
Type: schema.TypeMap,
90-
Optional: true,
91-
Elem: &schema.Schema{Type: schema.TypeString},
92-
},
9388
"mgmt_mode": &schema.Schema{
9489
Type: schema.TypeString,
9590
Optional: true,
@@ -161,15 +156,10 @@ func resourceDvmCmdAddDeviceUpdate(d *schema.ResourceData, m interface{}) error
161156
c := m.(*FortiClient).Client
162157
c.Retries = 1
163158

164-
deviceVersion, err := c.GetDeviceVersion()
165-
if err != nil {
166-
log.Printf("Could not get device version: %v", err)
167-
}
168-
169159
paradict := make(map[string]string)
170160
wsParams := make(map[string]string)
171161

172-
obj, err := getObjectDvmCmdAddDevice(d, deviceVersion)
162+
obj, err := getObjectDvmCmdAddDevice(d)
173163
if err != nil {
174164
return fmt.Errorf("Error updating DvmCmdAddDevice resource while getting object: %v", err)
175165
}
@@ -253,11 +243,6 @@ func flattenDvmCmdAddDeviceDevice(v interface{}, d *schema.ResourceData, pre str
253243
result["metafields"] = flattenDvmCmdAddDeviceDeviceMetaFields(i["meta fields"], d, pre_append)
254244
}
255245

256-
pre_append = pre + ".0." + "metafields_map"
257-
if _, ok := i["meta fields"]; ok {
258-
result["metafields_map"] = flattenDvmCmdAddDeviceDeviceMetaFieldsMap(i["meta fields"], d, pre_append)
259-
}
260-
261246
pre_append = pre + ".0." + "mgmt_mode"
262247
if _, ok := i["mgmt_mode"]; ok {
263248
result["mgmt_mode"] = flattenDvmCmdAddDeviceDeviceMgmtMode(i["mgmt_mode"], d, pre_append)
@@ -302,10 +287,6 @@ func flattenDvmCmdAddDeviceDevice(v interface{}, d *schema.ResourceData, pre str
302287
return lastresult
303288
}
304289

305-
func flattenDvmCmdAddDeviceDeviceAdmPass(v interface{}, d *schema.ResourceData, pre string) interface{} {
306-
return v
307-
}
308-
309290
func flattenDvmCmdAddDeviceDeviceAdmUsr(v interface{}, d *schema.ResourceData, pre string) interface{} {
310291
return v
311292
}
@@ -338,10 +319,6 @@ func flattenDvmCmdAddDeviceDeviceMetaFields(v interface{}, d *schema.ResourceDat
338319
return v
339320
}
340321

341-
func flattenDvmCmdAddDeviceDeviceMetaFieldsMap(v interface{}, d *schema.ResourceData, pre string) interface{} {
342-
return v
343-
}
344-
345322
func flattenDvmCmdAddDeviceDeviceMgmtMode(v interface{}, d *schema.ResourceData, pre string) interface{} {
346323
return v
347324
}
@@ -515,7 +492,7 @@ func expandDvmCmdAddDeviceAdom(d *schema.ResourceData, v interface{}, pre string
515492
return v, nil
516493
}
517494

518-
func expandDvmCmdAddDeviceDevice(d *schema.ResourceData, v interface{}, pre string, deviceVersion string) (interface{}, error) {
495+
func expandDvmCmdAddDeviceDevice(d *schema.ResourceData, v interface{}, pre string) (interface{}, error) {
519496
l := v.([]interface{})
520497
if len(l) == 0 || l[0] == nil {
521498
return nil, nil
@@ -559,34 +536,14 @@ func expandDvmCmdAddDeviceDevice(d *schema.ResourceData, v interface{}, pre stri
559536
}
560537
pre_append = pre + ".0." + "metafields"
561538
if _, ok := d.GetOk(pre_append); ok || d.HasChange(pre_append) {
562-
requiredVersion := map[string][]string{
563-
"operations": []string{"<"},
564-
"versions": []string{"6.4.7"},
565-
}
566-
if versionMatch, err := checkVersionMatch(deviceVersion, requiredVersion); !versionMatch {
567-
err := fmt.Errorf("Argument 'metafields' %s.", err)
568-
return nil, err
569-
}
570539
result["meta fields"], _ = expandDvmCmdAddDeviceDeviceMetaFields(d, i["metafields"], pre_append)
571540
}
572-
pre_append = pre + ".0." + "metafields_map"
573-
if _, ok := d.GetOk(pre_append); ok {
574-
requiredVersion := map[string][]string{
575-
"operations": []string{">", "="},
576-
"versions": []string{"6.4.7"},
577-
}
578-
if versionMatch, err := checkVersionMatch(deviceVersion, requiredVersion); !versionMatch {
579-
err := fmt.Errorf("Argument 'metafields_map' %s.", err)
580-
return nil, err
581-
}
582-
result["meta fields"], _ = expandDvmCmdAddDeviceDeviceMetaFieldsMap(d, i["metafields_map"], pre_append)
583-
}
584541
pre_append = pre + ".0." + "mgmt_mode"
585542
if _, ok := d.GetOk(pre_append); ok || d.HasChange(pre_append) {
586543
result["mgmt_mode"], _ = expandDvmCmdAddDeviceDeviceMgmtMode(d, i["mgmt_mode"], pre_append)
587544
}
588545
pre_append = pre + ".0." + "mr"
589-
if _, ok := d.GetOkExists(pre_append); ok || d.HasChange(pre_append) {
546+
if _, ok := d.GetOk(pre_append); ok || d.HasChange(pre_append) {
590547
result["mr"], _ = expandDvmCmdAddDeviceDeviceMr(d, i["mr"], pre_append)
591548
}
592549
pre_append = pre + ".0." + "name"
@@ -653,10 +610,6 @@ func expandDvmCmdAddDeviceDeviceMetaFields(d *schema.ResourceData, v interface{}
653610
return v, nil
654611
}
655612

656-
func expandDvmCmdAddDeviceDeviceMetaFieldsMap(d *schema.ResourceData, v interface{}, pre string) (interface{}, error) {
657-
return v, nil
658-
}
659-
660613
func expandDvmCmdAddDeviceDeviceMgmtMode(d *schema.ResourceData, v interface{}, pre string) (interface{}, error) {
661614
return v, nil
662615
}
@@ -735,7 +688,7 @@ func expandDvmCmdAddDeviceGroupsVdom(d *schema.ResourceData, v interface{}, pre
735688
return v, nil
736689
}
737690

738-
func getObjectDvmCmdAddDevice(d *schema.ResourceData, deviceVersion string) (*map[string]interface{}, error) {
691+
func getObjectDvmCmdAddDevice(d *schema.ResourceData) (*map[string]interface{}, error) {
739692
obj := make(map[string]interface{})
740693

741694
if v, ok := d.GetOk("fmgadom"); ok || d.HasChange("fmgadom") {
@@ -748,7 +701,7 @@ func getObjectDvmCmdAddDevice(d *schema.ResourceData, deviceVersion string) (*ma
748701
}
749702

750703
if v, ok := d.GetOk("device"); ok || d.HasChange("device") {
751-
t, err := expandDvmCmdAddDeviceDevice(d, v, "device", deviceVersion)
704+
t, err := expandDvmCmdAddDeviceDevice(d, v, "device")
752705
if err != nil {
753706
return &obj, err
754707
} else if t != nil {

‎fmg/resource_object_antivirus_profile.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ func resourceObjectAntivirusProfile() *schema.Resource {
132132
"malware_stream": &schema.Schema{
133133
Type: schema.TypeString,
134134
Optional: true,
135+
Computed: true,
135136
},
136137
"options": &schema.Schema{
137138
Type: schema.TypeSet,
@@ -474,6 +475,7 @@ func resourceObjectAntivirusProfile() *schema.Resource {
474475
"malware_stream": &schema.Schema{
475476
Type: schema.TypeString,
476477
Optional: true,
478+
Computed: true,
477479
},
478480
"options": &schema.Schema{
479481
Type: schema.TypeSet,
@@ -561,6 +563,7 @@ func resourceObjectAntivirusProfile() *schema.Resource {
561563
"malware_stream": &schema.Schema{
562564
Type: schema.TypeString,
563565
Optional: true,
566+
Computed: true,
564567
},
565568
"options": &schema.Schema{
566569
Type: schema.TypeSet,
@@ -740,6 +743,7 @@ func resourceObjectAntivirusProfile() *schema.Resource {
740743
"malware_stream": &schema.Schema{
741744
Type: schema.TypeString,
742745
Optional: true,
746+
Computed: true,
743747
},
744748
"options": &schema.Schema{
745749
Type: schema.TypeSet,
@@ -847,6 +851,7 @@ func resourceObjectAntivirusProfile() *schema.Resource {
847851
"malware_stream": &schema.Schema{
848852
Type: schema.TypeString,
849853
Optional: true,
854+
Computed: true,
850855
},
851856
"options": &schema.Schema{
852857
Type: schema.TypeSet,
@@ -973,6 +978,7 @@ func resourceObjectAntivirusProfile() *schema.Resource {
973978
"malware_stream": &schema.Schema{
974979
Type: schema.TypeString,
975980
Optional: true,
981+
Computed: true,
976982
},
977983
"options": &schema.Schema{
978984
Type: schema.TypeSet,

‎fmg/resource_object_antivirus_profile_cifs.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ func resourceObjectAntivirusProfileCifs() *schema.Resource {
9595
"malware_stream": &schema.Schema{
9696
Type: schema.TypeString,
9797
Optional: true,
98+
Computed: true,
9899
},
99100
"options": &schema.Schema{
100101
Type: schema.TypeSet,

‎fmg/resource_object_antivirus_profile_http.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ func resourceObjectAntivirusProfileHttp() *schema.Resource {
104104
"malware_stream": &schema.Schema{
105105
Type: schema.TypeString,
106106
Optional: true,
107+
Computed: true,
107108
},
108109
"options": &schema.Schema{
109110
Type: schema.TypeSet,

‎fmg/resource_object_antivirus_profile_imap.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func resourceObjectAntivirusProfileImap() *schema.Resource {
105105
"malware_stream": &schema.Schema{
106106
Type: schema.TypeString,
107107
Optional: true,
108+
Computed: true,
108109
},
109110
"options": &schema.Schema{
110111
Type: schema.TypeSet,

‎fmg/resource_object_antivirus_profile_nntp.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ func resourceObjectAntivirusProfileNntp() *schema.Resource {
9595
"malware_stream": &schema.Schema{
9696
Type: schema.TypeString,
9797
Optional: true,
98+
Computed: true,
9899
},
99100
"options": &schema.Schema{
100101
Type: schema.TypeSet,

‎fmg/resource_object_antivirus_profile_pop3.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func resourceObjectAntivirusProfilePop3() *schema.Resource {
105105
"malware_stream": &schema.Schema{
106106
Type: schema.TypeString,
107107
Optional: true,
108+
Computed: true,
108109
},
109110
"options": &schema.Schema{
110111
Type: schema.TypeSet,

‎fmg/resource_object_antivirus_profile_smtp.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func resourceObjectAntivirusProfileSmtp() *schema.Resource {
105105
"malware_stream": &schema.Schema{
106106
Type: schema.TypeString,
107107
Optional: true,
108+
Computed: true,
108109
},
109110
"options": &schema.Schema{
110111
Type: schema.TypeSet,

0 commit comments

Comments
 (0)