init/updateFortiAnalyzerTerraform: 1.3.3

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

CHANGELOG.md

@@ -1,14 +1,22 @@
 ## 1.4.0 (Unreleased)
 
+## 1.3.3 (May 1, 2024)
+
+IMPROVEMENTS:
+
+* Support FortiAnalyzer v7.0.11, v7.0.12;
+* Change fortianalyzer_system_global_sslciphersuites mkey from cipher to priority;
+* Improve logic of parameters fosid and fazadom;
+
 ## 1.3.2 (Feb 20, 2024)
 
 IMPROVEMENTS:
 
 * Support FortiAnalyzer v7.4.2;
-* Support provider parameter clean_session. Terraform will automaticly logout session.
-* Support provider parameter token. You can use token to login rather than specify username and password.
-* Support provider parameter logsession. By setting it as true, you can save your autogenerated session to the file presession.txt.
-* Support provider parameter presession. You can specify your session rather than specify username and password.
+* Support provider parameter clean_session. Terraform will automaticly logout session;
+* Support provider parameter token. You can use token to login rather than specify username and password;
+* Support provider parameter logsession. By setting it as true, you can save your autogenerated session to the file presession.txt;
+* Support provider parameter presession. You can specify your session rather than specify username and password;
 
 ## 1.3.1 (Nov 27, 2023)
 

faz/provider.go

@@ -146,13 +146,13 @@ func Provider() *schema.Provider {
 			"fortianalyzer_system_certificate_ca":                         resourceSystemCertificateCa(),
 			"fortianalyzer_system_certificate_crl":                        resourceSystemCertificateCrl(),
 			"fortianalyzer_system_certificate_local":                      resourceSystemCertificateLocal(),
-			"fortianalyzer_system_csf_trustedlist":                        resourceSystemCsfTrustedList(),
 			"fortianalyzer_system_certificate_oftp":                       resourceSystemCertificateOftp(),
-			"fortianalyzer_system_csf_fabricconnector":                    resourceSystemCsfFabricConnector(),
 			"fortianalyzer_system_certificate_remote":                     resourceSystemCertificateRemote(),
-			"fortianalyzer_system_csf":                                    resourceSystemCsf(),
 			"fortianalyzer_system_certificate_ssh":                        resourceSystemCertificateSsh(),
 			"fortianalyzer_system_connector":                              resourceSystemConnector(),
+			"fortianalyzer_system_csf":                                    resourceSystemCsf(),
+			"fortianalyzer_system_csf_fabricconnector":                    resourceSystemCsfFabricConnector(),
+			"fortianalyzer_system_csf_trustedlist":                        resourceSystemCsfTrustedList(),
 			"fortianalyzer_system_dns":                                    resourceSystemDns(),
 			"fortianalyzer_system_docker":                                 resourceSystemDocker(),
 			"fortianalyzer_system_fips":                                   resourceSystemFips(),
@@ -193,9 +193,9 @@ func Provider() *schema.Provider {
 			"fortianalyzer_system_log_devicedisable":                      resourceSystemLogDeviceDisable(),
 			"fortianalyzer_system_log_fospolicystats":                     resourceSystemLogFosPolicyStats(),
 			"fortianalyzer_system_log_interfacestats":                     resourceSystemLogInterfaceStats(),
-			"fortianalyzer_system_log_pcapfile":                           resourceSystemLogPcapFile(),
 			"fortianalyzer_system_log_ioc":                                resourceSystemLogIoc(),
 			"fortianalyzer_system_log_maildomain":                         resourceSystemLogMailDomain(),
+			"fortianalyzer_system_log_pcapfile":                           resourceSystemLogPcapFile(),
 			"fortianalyzer_system_log_ratelimit":                          resourceSystemLogRatelimit(),
 			"fortianalyzer_system_log_ratelimit_device":                   resourceSystemLogRatelimitDevice(),
 			"fortianalyzer_system_log_ratelimit_ratelimits":               resourceSystemLogRatelimitRatelimits(),

faz/resource_dvm_cmd_add_device.go

@@ -642,7 +642,7 @@ func expandDvmCmdAddDeviceGroupsVdom(d *schema.ResourceData, v interface{}, pre
 func getObjectDvmCmdAddDevice(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("adom") {
+	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("fazadom") {
 		t, err := expandDvmCmdAddDeviceAdom(d, v, "fazadom")
 		if err != nil {
 			return &obj, err

faz/resource_dvm_cmd_del_device.go

@@ -155,7 +155,7 @@ func expandDvmCmdDelDeviceFlags(d *schema.ResourceData, v interface{}, pre strin
 func getObjectDvmCmdDelDevice(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("adom") {
+	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("fazadom") {
 		t, err := expandDvmCmdDelDeviceAdom(d, v, "fazadom")
 		if err != nil {
 			return &obj, err

faz/resource_dvmdb_group.go

@@ -346,7 +346,7 @@ func getObjectDvmdbGroup(d *schema.ResourceData) (*map[string]interface{}, error
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandDvmdbGroupId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_admin_ldap.go

@@ -688,7 +688,7 @@ func expandSystemAdminLdapUsername(d *schema.ResourceData, v interface{}, pre st
 func getObjectSystemAdminLdap(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("adom") {
+	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("fazadom") {
 		t, err := expandSystemAdminLdapAdom(d, v, "fazadom")
 		if err != nil {
 			return &obj, err

faz/resource_system_admin_user.go

@@ -2626,7 +2626,7 @@ func expandSystemAdminUserWildcard(d *schema.ResourceData, v interface{}, pre st
 func getObjectSystemAdminUser(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("adom") {
+	if v, ok := d.GetOk("fazadom"); ok || d.HasChange("fazadom") {
 		t, err := expandSystemAdminUserAdom(d, v, "fazadom")
 		if err != nil {
 			return &obj, err

faz/resource_system_global_sslciphersuites.go

@@ -35,6 +35,7 @@ func resourceSystemGlobalSslCipherSuites() *schema.Resource {
 			},
 			"priority": &schema.Schema{
 				Type:     schema.TypeInt,
+				ForceNew: true,
 				Optional: true,
 			},
 			"version": &schema.Schema{
@@ -63,7 +64,7 @@ func resourceSystemGlobalSslCipherSuitesCreate(d *schema.ResourceData, m interfa
 		return fmt.Errorf("Error creating SystemGlobalSslCipherSuites resource: %v", err)
 	}
 
-	d.SetId(getStringKey(d, "cipher"))
+	d.SetId(strconv.Itoa(getIntKey(d, "priority")))
 
 	return resourceSystemGlobalSslCipherSuitesRead(d, m)
 }
@@ -87,7 +88,7 @@ func resourceSystemGlobalSslCipherSuitesUpdate(d *schema.ResourceData, m interfa
 
 	log.Printf(strconv.Itoa(c.Retries))
 
-	d.SetId(getStringKey(d, "cipher"))
+	d.SetId(strconv.Itoa(getIntKey(d, "priority")))
 
 	return resourceSystemGlobalSslCipherSuitesRead(d, m)
 }

faz/resource_system_ha_peer.go

@@ -250,7 +250,7 @@ func expandSystemHaPeerStatus(d *schema.ResourceData, v interface{}, pre string)
 func getObjectSystemHaPeer(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemHaPeerId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_ha_privatepeer.go

@@ -251,7 +251,7 @@ func expandSystemHaPrivatePeerStatus(d *schema.ResourceData, v interface{}, pre
 func getObjectSystemHaPrivatePeer(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemHaPrivatePeerId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_ha_vip.go

@@ -228,7 +228,7 @@ func expandSystemHaVipVipInterface(d *schema.ResourceData, v interface{}, pre st
 func getObjectSystemHaVip(d *schema.ResourceData) (*map[string]interface{}, error) {
 	obj := make(map[string]interface{})
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemHaVipId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_localinpolicy.go

@@ -326,7 +326,7 @@ func getObjectSystemLocalInPolicy(d *schema.ResourceData) (*map[string]interface
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLocalInPolicyId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_localinpolicy6.go

@@ -324,7 +324,7 @@ func getObjectSystemLocalInPolicy6(d *schema.ResourceData) (*map[string]interfac
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLocalInPolicy6Id(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_log_devicedisable.go

@@ -223,7 +223,7 @@ func getObjectSystemLogDeviceDisable(d *schema.ResourceData) (*map[string]interf
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLogDeviceDisableId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_log_maildomain.go

@@ -246,7 +246,7 @@ func getObjectSystemLogMailDomain(d *schema.ResourceData) (*map[string]interface
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLogMailDomainId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_log_ratelimit_device.go

@@ -246,7 +246,7 @@ func getObjectSystemLogRatelimitDevice(d *schema.ResourceData) (*map[string]inte
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLogRatelimitDeviceId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_log_ratelimit_ratelimits.go

@@ -246,7 +246,7 @@ func getObjectSystemLogRatelimitRatelimits(d *schema.ResourceData) (*map[string]
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLogRatelimitRatelimitsId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_logfetch_clientprofile.go

@@ -916,7 +916,7 @@ func getObjectSystemLogFetchClientProfile(d *schema.ResourceData) (*map[string]i
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLogFetchClientProfileId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_logforward.go

@@ -1928,7 +1928,7 @@ func getObjectSystemLogForward(d *schema.ResourceData) (*map[string]interface{},
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemLogForwardId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_mail.go

@@ -382,7 +382,7 @@ func getObjectSystemMail(d *schema.ResourceData) (*map[string]interface{}, error
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemMailId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_ntp_ntpserver.go

@@ -321,7 +321,7 @@ func getObjectSystemNtpNtpserver(d *schema.ResourceData) (*map[string]interface{
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemNtpNtpserverId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_sniffer.go

@@ -349,7 +349,7 @@ func getObjectSystemSniffer(d *schema.ResourceData) (*map[string]interface{}, er
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemSnifferId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_snmp_community.go

@@ -749,7 +749,7 @@ func getObjectSystemSnmpCommunity(d *schema.ResourceData) (*map[string]interface
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemSnmpCommunityId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_sql_customindex.go

@@ -270,7 +270,7 @@ func getObjectSystemSqlCustomIndex(d *schema.ResourceData) (*map[string]interfac
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemSqlCustomIndexId(d, v, "fosid")
 		if err != nil {
 			return &obj, err

faz/resource_system_sql_customskipidx.go

@@ -238,7 +238,7 @@ func getObjectSystemSqlCustomSkipidx(d *schema.ResourceData) (*map[string]interf
 		}
 	}
 
-	if v, ok := d.GetOk("fosid"); ok || d.HasChange("id") {
+	if v, ok := d.GetOk("fosid"); ok || d.HasChange("fosid") {
 		t, err := expandSystemSqlCustomSkipidxId(d, v, "fosid")
 		if err != nil {
 			return &obj, err