init/updateFortiOSTerraform: 1.17.0

Signed-off-by: -HQCM <hq-devops-admin@fortinet.com>

Author: FTNT-HQCM

.goreleaser.yml

@@ -4,6 +4,7 @@ before:
   hooks:
     # this is just an example and not a requirement for provider building/publishing
     - go mod tidy
+project_name: terraform-provider-fortios
 builds:
 - env:
     # goreleaser does not work with CGO, it could also complicate

CHANGELOG.md

@@ -1,6 +1,42 @@
-## 1.17.0 (Unreleased)
+## 1.18.0 (Unreleased)
 
 
+## 1.17.0 (Jun 22, 2023)
+BUG FIXES:
+
+* Fix issue of can't update admin user (#248);
+* Fix issue of no option to not use HTTP proxy (#253);
+* Fix crash issue with insufficient permissions (#257);
+* Fix type change issue (#258)
+* Fix issue of configuration been destroyed after second apply (#265);
+* Fix range issue (#284)
+* Remove extra quotes in the conversion of argument from block to string;
+* Fix duplicate argument issue; 
+
+IMPROVEMENTS:
+
+* Support FortiOS v6.4.11, v6.4.12, v7.0.7, v7.0.8, v7.0.9, v7.0.10, v7.0.11, v7.2.3, v7.2.4, v7.4.0;
+* Update mergeable arguments with type changes; 
+* Update version check function;
+* Add variable get_all_tables to determine whether get all table or complex items when refresh the state file;
+* Support username/password login;
+
+FEATURES:
+
+* **New Resource:** `fortios_antivirus_exemptlist`
+* **New Resource:** `fortios_endpointcontrol_fctemsoverride`
+* **New Resource:** `fortios_firewall_internetservicesubapp`
+* **New Resource:** `fortios_router_extcommunitylist`
+* **New Resource:** `fortios_switchcontrolleracl_ingress`
+* **New Resource:** `fortios_switchcontrolleracl_group`
+* **New Resource:** `fortios_system_deviceupgrade`
+* **New Resource:** `fortios_system_evpn`
+* **New Resource:** `fortios_system_fabricvpn`
+* **New Resource:** `fortios_system_pcpserver`
+* **New Resource:** `fortios_system_sdnproxy`
+* **New Resource:** `fortios_system_ssofortigatecloudadmin`
+* **New Resource:** `fortios_vpn_kmipserver`
+
 ## 1.16.0 (Oct 7, 2022)
 BUG FIXES:
 

fortios/client.go

@@ -11,14 +11,16 @@ import (
 	"time"
 
 	fmgclient "github.com/fortinetdev/forti-sdk-go/fortimanager/sdkcore"
-	"github.com/fortinetdev/forti-sdk-go/fortios/auth"
-	forticlient "github.com/fortinetdev/forti-sdk-go/fortios/sdkcore"
+	"github.com/terraform-providers/terraform-provider-fortios/sdk/auth"
+	forticlient "github.com/terraform-providers/terraform-provider-fortios/sdk/sdkcore"
 )
 
 // Config gets the authentication information from the given metadata
 type Config struct {
 	Hostname        string
 	Token           string
+	Username        string
+	Password        string
 	Insecure        *bool
 	CABundle        string
 	CABundleContent string
@@ -102,7 +104,7 @@ func bFortiManagerHostnameExist(c *Config) bool {
 func createFortiOSClient(fClient *FortiClient, c *Config) error {
 	config := &tls.Config{}
 
-	auth := auth.NewAuth(c.Hostname, c.Token, c.CABundle, c.CABundleContent, c.PeerAuth, c.CaCert, c.ClientCert, c.ClientKey, c.Vdom, c.HTTPProxy)
+	auth := auth.NewAuth(c.Hostname, c.Token, c.Username, c.Password, c.CABundle, c.CABundleContent, c.PeerAuth, c.CaCert, c.ClientCert, c.ClientKey, c.Vdom, c.HTTPProxy)
 
 	if auth.Hostname == "" {
 		_, err := auth.GetEnvHostname()
@@ -118,6 +120,26 @@ func createFortiOSClient(fClient *FortiClient, c *Config) error {
 		}
 	}
 
+	if auth.Username == "" {
+		_, err := auth.GetEnvUsername()
+		if err != nil {
+			return fmt.Errorf("Error reading Username")
+		}
+	}
+
+	if auth.Password == "" {
+		_, err := auth.GetEnvPassword()
+		if err != nil {
+			return fmt.Errorf("Error reading Password")
+		}
+	}
+
+	if auth.Token == "" {
+		if auth.Username == "" || auth.Password == "" {
+			return fmt.Errorf("Please provider a valid API Token or Username and Password.")
+		}
+	}
+
 	if auth.CABundle == "" {
 		auth.GetEnvCABundle()
 	}
@@ -146,7 +168,7 @@ func createFortiOSClient(fClient *FortiClient, c *Config) error {
 			return fmt.Errorf("Error reading ClientKey")
 		}
 	}
-	if auth.HTTPProxy == "" {
+	if auth.HTTPProxy == "ENV" {
 		_, err := auth.GetEnvHTTPProxy()
 		if err != nil {
 			return fmt.Errorf("Error reading HTTP proxy")
@@ -245,6 +267,16 @@ func createFortiOSClient(fClient *FortiClient, c *Config) error {
 		return fmt.Errorf("connection error: %v", err)
 	}
 
+	err = fc.CheckUP()
+	if err != nil {
+		return err
+	}
+
+	err = fc.UpdateDeviceVersion()
+	if err != nil {
+		return fmt.Errorf("Can not update device version: %v", err)
+	}
+
 	fClient.Client = fc
 
 	return nil

fortios/config.go

@@ -179,21 +179,36 @@ func convintflist2str(v interface{}) interface{} {
 	return res
 }
 
-func i2ss2arrFortiAPIUpgrade(v string, splitv string) bool {
-	splitv = strings.ReplaceAll(splitv, "v", "")
-
+func i2ss2arrFortiAPIUpgrade(v string, new_version_map map[string][]string) bool {
 	v1, err := version.NewVersion(v)
 	if err != nil {
 		return false
 	}
 
-	v2, err := version.NewVersion(splitv)
-	if err != nil {
-		return false
-	}
-
-	if v1.GreaterThanOrEqual(v2) {
-		return true
+	for operator, version_list := range new_version_map {
+		if operator == "=" {
+			for _, cur_version := range version_list {
+				if cur_version == v {
+					return true
+				}
+			}
+		} else if operator == ">=" {
+			min_version, err := version.NewVersion(version_list[0])
+			if err != nil {
+				continue
+			}
+			if v1.GreaterThanOrEqual(min_version) {
+				return true
+			}
+		} else if operator == "<=" {
+			max_version, err := version.NewVersion(version_list[0])
+			if err != nil {
+				continue
+			}
+			if v1.LessThanOrEqual(max_version) {
+				return true
+			}
+		}
 	}
 
 	return false

fortios/data_source_firewall_address.go

@@ -44,6 +44,10 @@ func dataSourceFirewallAddress() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"route_tag": &schema.Schema{
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"sub_type": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -160,6 +164,22 @@ func dataSourceFirewallAddress() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"hw_vendor": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"hw_model": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"os": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"sw_version": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"comment": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -310,6 +330,10 @@ func dataSourceFlattenFirewallAddressType(v interface{}, d *schema.ResourceData,
 	return v
 }
 
+func dataSourceFlattenFirewallAddressRouteTag(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
 func dataSourceFlattenFirewallAddressSubType(v interface{}, d *schema.ResourceData, pre string) interface{} {
 	return v
 }
@@ -481,6 +505,22 @@ func dataSourceFlattenFirewallAddressTagType(v interface{}, d *schema.ResourceDa
 	return v
 }
 
+func dataSourceFlattenFirewallAddressHwVendor(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
+func dataSourceFlattenFirewallAddressHwModel(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
+func dataSourceFlattenFirewallAddressOs(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
+func dataSourceFlattenFirewallAddressSwVersion(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
 func dataSourceFlattenFirewallAddressComment(v interface{}, d *schema.ResourceData, pre string) interface{} {
 	return v
 }
@@ -670,6 +710,12 @@ func dataSourceRefreshObjectFirewallAddress(d *schema.ResourceData, o map[string
 		}
 	}
 
+	if err = d.Set("route_tag", dataSourceFlattenFirewallAddressRouteTag(o["route-tag"], d, "route_tag")); err != nil {
+		if !fortiAPIPatch(o["route-tag"]) {
+			return fmt.Errorf("Error reading route_tag: %v", err)
+		}
+	}
+
 	if err = d.Set("sub_type", dataSourceFlattenFirewallAddressSubType(o["sub-type"], d, "sub_type")); err != nil {
 		if !fortiAPIPatch(o["sub-type"]) {
 			return fmt.Errorf("Error reading sub_type: %v", err)
@@ -820,6 +866,30 @@ func dataSourceRefreshObjectFirewallAddress(d *schema.ResourceData, o map[string
 		}
 	}
 
+	if err = d.Set("hw_vendor", dataSourceFlattenFirewallAddressHwVendor(o["hw-vendor"], d, "hw_vendor")); err != nil {
+		if !fortiAPIPatch(o["hw-vendor"]) {
+			return fmt.Errorf("Error reading hw_vendor: %v", err)
+		}
+	}
+
+	if err = d.Set("hw_model", dataSourceFlattenFirewallAddressHwModel(o["hw-model"], d, "hw_model")); err != nil {
+		if !fortiAPIPatch(o["hw-model"]) {
+			return fmt.Errorf("Error reading hw_model: %v", err)
+		}
+	}
+
+	if err = d.Set("os", dataSourceFlattenFirewallAddressOs(o["os"], d, "os")); err != nil {
+		if !fortiAPIPatch(o["os"]) {
+			return fmt.Errorf("Error reading os: %v", err)
+		}
+	}
+
+	if err = d.Set("sw_version", dataSourceFlattenFirewallAddressSwVersion(o["sw-version"], d, "sw_version")); err != nil {
+		if !fortiAPIPatch(o["sw-version"]) {
+			return fmt.Errorf("Error reading sw_version: %v", err)
+		}
+	}
+
 	if err = d.Set("comment", dataSourceFlattenFirewallAddressComment(o["comment"], d, "comment")); err != nil {
 		if !fortiAPIPatch(o["comment"]) {
 			return fmt.Errorf("Error reading comment: %v", err)

fortios/data_source_firewall_address6.go

@@ -40,6 +40,10 @@ func dataSourceFirewallAddress6() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"route_tag": &schema.Schema{
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"macaddr": &schema.Schema{
 				Type:     schema.TypeList,
 				Computed: true,
@@ -251,6 +255,10 @@ func dataSourceFlattenFirewallAddress6Type(v interface{}, d *schema.ResourceData
 	return v
 }
 
+func dataSourceFlattenFirewallAddress6RouteTag(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
 func dataSourceFlattenFirewallAddress6Macaddr(v interface{}, d *schema.ResourceData, pre string) []map[string]interface{} {
 	if v == nil {
 		return nil
@@ -564,6 +572,12 @@ func dataSourceRefreshObjectFirewallAddress6(d *schema.ResourceData, o map[strin
 		}
 	}
 
+	if err = d.Set("route_tag", dataSourceFlattenFirewallAddress6RouteTag(o["route-tag"], d, "route_tag")); err != nil {
+		if !fortiAPIPatch(o["route-tag"]) {
+			return fmt.Errorf("Error reading route_tag: %v", err)
+		}
+	}
+
 	if err = d.Set("macaddr", dataSourceFlattenFirewallAddress6Macaddr(o["macaddr"], d, "macaddr")); err != nil {
 		if !fortiAPIPatch(o["macaddr"]) {
 			return fmt.Errorf("Error reading macaddr: %v", err)