init/updateFortiSwitchTerraform: 1.1.6

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

Author: FTNT-HQCM

.go-version

@@ -1 +1 @@
-1.21.1
+1.25.0

.goreleaser.yml

@@ -6,35 +6,35 @@ before:
     - go mod tidy
 project_name: terraform-provider-fortiswitch
 builds:
-- env:
-    # goreleaser does not work with CGO, it could also complicate
-    # usage by users in CI/CD systems like Terraform Cloud where
-    # they are unable to install libraries.
-    - CGO_ENABLED=0
-  mod_timestamp: '{{ .CommitTimestamp }}'
-  flags:
-    - -trimpath
-  ldflags:
-    - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
-  goos:
-    - freebsd
-    - windows
-    - linux
-    - darwin
-  goarch:
-    - amd64
-    - '386'
-    - arm
-    - arm64
-  ignore:
-    - goos: darwin
-      goarch: '386'
-  binary: '{{ .ProjectName }}_v{{ .Version }}'
+  - env:
+      # goreleaser does not work with CGO, it could also complicate
+      # usage by users in CI/CD systems like Terraform Cloud where
+      # they are unable to install libraries.
+      - CGO_ENABLED=0
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    flags:
+      - -trimpath
+    ldflags:
+      - "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}"
+    goos:
+      - freebsd
+      - windows
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - "386"
+      - arm
+      - arm64
+    ignore:
+      - goos: darwin
+        goarch: "386"
+    binary: "{{ .ProjectName }}_v{{ .Version }}"
 archives:
-- format: zip
-  name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
+  - format: zip
+    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
 checksum:
-  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+  name_template: "{{ .ProjectName }}_{{ .Version }}_SHA256SUMS"
   algorithm: sha256
 signs:
   - artifacts: checksum
@@ -52,4 +52,4 @@ release:
   # Visit your project's GitHub Releases page to publish this release.
   draft: true
 changelog:
-  skip: true
+  disable: true

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 1.1.6 (Unreleased)
+## 1.1.7 (Unreleased)
+
+## 1.1.6 (Sep 10, 2025)
+
+IMPROVEMENTS:
+
+* Support new version 7.6.3 and 7.6.4.
+* Upgrade the Go version and all associated dependencies.
 
 ## 1.1.5 (June 20, 2025)
 

fortiswitch/data_source_router_accesslist.go

@@ -90,7 +90,7 @@ func dataSourceRouterAccessListRead(d *schema.ResourceData, m interface{}) error
 
 	if o == nil {
 		d.SetId("")
-		return fmt.Errorf("Error describing RouterAccessList: resource not found")
+		return nil
 	}
 
 	err = dataSourceRefreshObjectRouterAccessList(d, o)

fortiswitch/data_source_router_accesslist6.go

@@ -86,7 +86,7 @@ func dataSourceRouterAccessList6Read(d *schema.ResourceData, m interface{}) erro
 
 	if o == nil {
 		d.SetId("")
-		return fmt.Errorf("Error describing RouterAccessList6:  resource not found")
+		return nil
 	}
 
 	err = dataSourceRefreshObjectRouterAccessList6(d, o)

fortiswitch/data_source_system_global.go

@@ -260,6 +260,10 @@ func dataSourceSystemGlobal() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"radsec_coa_port": &schema.Schema{
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"dst": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -578,6 +582,10 @@ func dataSourceFlattenSystemGlobalRadiusCoaPort(v interface{}, d *schema.Resourc
 	return v
 }
 
+func dataSourceFlattenSystemGlobalRadsecCoaPort(v interface{}, d *schema.ResourceData, pre string) interface{} {
+	return v
+}
+
 func dataSourceFlattenSystemGlobalDst(v interface{}, d *schema.ResourceData, pre string) interface{} {
 	return v
 }
@@ -987,6 +995,12 @@ func dataSourceRefreshObjectSystemGlobal(d *schema.ResourceData, o map[string]in
 		}
 	}
 
+	if err = d.Set("radsec_coa_port", dataSourceFlattenSystemGlobalRadsecCoaPort(o["radsec-coa-port"], d, "radsec_coa_port")); err != nil {
+		if !fortiAPIPatch(o["radsec-coa-port"]) {
+			return fmt.Errorf("Error reading radsec_coa_port: %v", err)
+		}
+	}
+
 	if err = d.Set("dst", dataSourceFlattenSystemGlobalDst(o["dst"], d, "dst")); err != nil {
 		if !fortiAPIPatch(o["dst"]) {
 			return fmt.Errorf("Error reading dst: %v", err)

fortiswitch/resource_router_isis.go

@@ -2231,7 +2231,7 @@ func expandRouterIsisLogNeighbourChanges(d *schema.ResourceData, v interface{},
 func getObjectRouterIsis(d *schema.ResourceData, setArgNil bool, sv string) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("default_information_metric6"); ok {
+	if v, ok := d.GetOkExists("default_information_metric6"); ok {
 		if setArgNil {
 			obj["default-information-metric6"] = nil
 		} else {
@@ -2539,7 +2539,7 @@ func getObjectRouterIsis(d *schema.ResourceData, setArgNil bool, sv string) (*ma
 		}
 	}
 
-	if v, ok := d.GetOk("default_information_metric"); ok {
+	if v, ok := d.GetOkExists("default_information_metric"); ok {
 		if setArgNil {
 			obj["default-information-metric"] = nil
 		} else {

fortiswitch/resource_router_policy.go

@@ -21,7 +21,7 @@ import (
 
 func resourceRouterPolicy() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceRouterPolicyUpdate,
+		Create: resourceRouterPolicyCreate,
 		Read:   resourceRouterPolicyRead,
 		Update: resourceRouterPolicyUpdate,
 		Delete: resourceRouterPolicyDelete,
@@ -266,7 +266,7 @@ func resourceRouterPolicyUpdate(d *schema.ResourceData, m interface{}) error {
 
 	log.Printf(strconv.Itoa(c.Retries))
 	if o["mkey"] != nil && o["mkey"] != "" {
-		d.SetId(o["mkey"].(string))
+		d.SetId(strconv.Itoa(int(o["mkey"].(float64))))
 	} else {
 		d.SetId("RouterPolicy")
 	}

fortiswitch/resource_switchacl_egress.go

@@ -166,6 +166,12 @@ func resourceSwitchAclEgress() *schema.Resource {
 							Optional: true,
 							Computed: true,
 						},
+						"remark_cos": &schema.Schema{
+							Type:         schema.TypeInt,
+							ValidateFunc: validation.IntBetween(0, 7),
+							Optional:     true,
+							Computed:     true,
+						},
 					},
 				},
 			},
@@ -514,6 +520,12 @@ func flattenSwitchAclEgressAction(v interface{}, d *schema.ResourceData, pre str
 		result["outer_vlan_tag"] = flattenSwitchAclEgressActionOuterVlanTag(i["outer-vlan-tag"], d, pre_append, sv)
 	}
 
+	pre_append = pre + ".0." + "remark_cos"
+	if _, ok := i["remark-cos"]; ok {
+
+		result["remark_cos"] = flattenSwitchAclEgressActionRemarkCos(i["remark-cos"], d, pre_append, sv)
+	}
+
 	lastresult := []map[string]interface{}{result}
 	return lastresult
 }
@@ -553,6 +565,13 @@ func flattenSwitchAclEgressActionOuterVlanTag(v interface{}, d *schema.ResourceD
 	return v
 }
 
+func flattenSwitchAclEgressActionRemarkCos(v interface{}, d *schema.ResourceData, pre string, sv string) interface{} {
+	if v == "" || v == "none" || reflect.DeepEqual(v, []interface{}{}) {
+		return nil
+	}
+	return v
+}
+
 func flattenSwitchAclEgressInterface(v interface{}, d *schema.ResourceData, pre string, sv string) interface{} {
 	return v
 }
@@ -840,6 +859,11 @@ func expandSwitchAclEgressAction(d *schema.ResourceData, v interface{}, pre stri
 
 		result["outer-vlan-tag"], _ = expandSwitchAclEgressActionOuterVlanTag(d, i["outer_vlan_tag"], pre_append, sv)
 	}
+	pre_append = pre + ".0." + "remark_cos"
+	if _, ok := d.GetOk(pre_append); ok {
+
+		result["remark-cos"], _ = expandSwitchAclEgressActionRemarkCos(d, i["remark_cos"], pre_append, sv)
+	}
 
 	return result, nil
 }
@@ -876,6 +900,10 @@ func expandSwitchAclEgressActionOuterVlanTag(d *schema.ResourceData, v interface
 	return v, nil
 }
 
+func expandSwitchAclEgressActionRemarkCos(d *schema.ResourceData, v interface{}, pre string, sv string) (interface{}, error) {
+	return v, nil
+}
+
 func expandSwitchAclEgressInterface(d *schema.ResourceData, v interface{}, pre string, sv string) (interface{}, error) {
 	return v, nil
 }

fortiswitch/resource_system_automationaction.go

@@ -35,7 +35,6 @@ func resourceSystemAutomationAction() *schema.Resource {
 				Type:         schema.TypeString,
 				ValidateFunc: validation.StringLenBetween(0, 123),
 				Optional:     true,
-				Sensitive:    true,
 			},
 			"alicloud_account_id": &schema.Schema{
 				Type:         schema.TypeString,
@@ -84,7 +83,6 @@ func resourceSystemAutomationAction() *schema.Resource {
 				Type:         schema.TypeString,
 				ValidateFunc: validation.StringLenBetween(0, 123),
 				Optional:     true,
-				Sensitive:    true,
 			},
 			"port": &schema.Schema{
 				Type:         schema.TypeInt,
@@ -216,7 +214,6 @@ func resourceSystemAutomationAction() *schema.Resource {
 				Type:         schema.TypeString,
 				ValidateFunc: validation.StringLenBetween(0, 59),
 				Optional:     true,
-				Sensitive:    true,
 			},
 			"name": &schema.Schema{
 				Type:         schema.TypeString,