init/updateFortiOSTerraform: 1.19.1

Signed-off-by: FTNT-HQCM <[email protected]>

CHANGELOG.md

@@ -1,6 +1,23 @@
 ## 1.20.0 (Unreleased)
 
 
+## 1.19.1 (Apr 29, 2024)
+BUG FIXES:
+
+* Fix issue of merged argument element contains comma;
+* Fix length limitation issue of merged argument;
+* Fix issue of vdomparam cause force replacement even using the same vdom value;
+* Fix data type error of API return empty string for integer data type;
+
+IMPROVEMENTS:
+
+* Support FortiOS version 6.4.15, 7.0.14, 7.0.15, 7.2.7, 7.2.8, 7.4.3;
+* Update version check functionality;
+
+FEATURES:
+
+* **New Data source:** `fortios_system_license_fortiflex`
+
 ## 1.19.0 (Jan 29, 2024)
 BUG FIXES:
 

README.md

@@ -1,10 +1,10 @@
-# Terraform Provider
+# FortiOS Terraform Provider
 
 - Website: https://www.terraform.io
 - [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)
 - Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
 
-<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px">
+<img src="https://www.datocms-assets.com/2885/1629941242-logo-terraform-main.svg" width="600px">
 
 ## Requirements
 

fortios/client.go

@@ -5,6 +5,7 @@ import (
 	"crypto/x509"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -274,7 +275,7 @@ func createFortiOSClient(fClient *FortiClient, c *Config) error {
 
 	err = fc.UpdateDeviceVersion()
 	if err != nil {
-		return fmt.Errorf("Can not update device version: %v", err)
+		log.Printf("[Warning] Can not update device version: %v", err)
 	}
 
 	fClient.Client = fc

fortios/config.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"reflect"
 	"regexp"
 	"sort"
 	"strconv"
@@ -179,17 +180,17 @@ func convintflist2str(v interface{}) interface{} {
 	return res
 }
 
-func i2ss2arrFortiAPIUpgrade(v string, new_version_map map[string][]string) bool {
+func checkVersionMatch(v string, new_version_map map[string][]string) (bool, error) {
 	v1, err := version.NewVersion(v)
 	if err != nil {
-		return false
+		return false, err
 	}
 
 	for operator, version_list := range new_version_map {
 		if operator == "=" {
 			for _, cur_version := range version_list {
 				if cur_version == v {
-					return true
+					return true, nil
 				}
 			}
 		} else if operator == ">=" {
@@ -198,20 +199,24 @@ func i2ss2arrFortiAPIUpgrade(v string, new_version_map map[string][]string) bool
 				continue
 			}
 			if v1.GreaterThanOrEqual(min_version) {
-				return true
+				return true, nil
 			}
 		} else if operator == "<=" {
 			max_version, err := version.NewVersion(version_list[0])
 			if err != nil {
 				continue
 			}
 			if v1.LessThanOrEqual(max_version) {
-				return true
+				return true, nil
 			}
 		}
 	}
-
-	return false
+	var supported_version_list []string
+	for operator, version_list := range new_version_map {
+		supported_version_list = append(supported_version_list, operator+strings.Join(version_list, ","))
+	}
+	err = fmt.Errorf("requires FortiOS version: %s, your device version is: %s.", strings.Join(supported_version_list, ""), v)
+	return false, err
 }
 
 func intBetweenWithZero(min, max int) schema.SchemaValidateFunc {
@@ -250,3 +255,7 @@ func remove_quote(v interface{}) interface{} {
 	}
 	return v
 }
+
+func bZero(v interface{}) bool {
+	return reflect.ValueOf(v).IsZero()
+}

fortios/data_source_router_bgp.go

@@ -2004,7 +2004,7 @@ func dataSourceRouterBgpRead(d *schema.ResourceData, m interface{}) error {
 	return nil
 }
 
-func dataSourceFlattenRouterBgpAs_String(v interface{}, d *schema.ResourceData, pre string) interface{} {
+func dataSourceFlattenRouterBgpAsString(v interface{}, d *schema.ResourceData, pre string) interface{} {
 	return v
 }
 
@@ -6418,7 +6418,7 @@ func dataSourceFlattenRouterBgpVrfLeak6TargetInterface(v interface{}, d *schema.
 func dataSourceRefreshObjectRouterBgp(d *schema.ResourceData, o map[string]interface{}) error {
 	var err error
 
-	if err = d.Set("as_string", dataSourceFlattenRouterBgpAs_String(o["as"], d, "as_string")); err != nil {
+	if err = d.Set("as_string", dataSourceFlattenRouterBgpAsString(o["as"], d, "as_string")); err != nil {
 		if !fortiAPIPatch(o["as"]) {
 			return fmt.Errorf("Error reading as_string: %v", err)
 		}