init/updateFlexVMTerraform: 2.3.4

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

Author: FTNT-HQCM

CHANGELOG.md

@@ -1,10 +1,18 @@
 ## 2.4.0 (Unreleased)
 
+
+## 2.3.4 (December 11, 2024)
+
+IMPROVEMENTS:
+
+* Supported 1 new configuration: `FortiRecon`.
+
+
 ## 2.3.3 (October 7, 2024)
 
 IMPROVEMENTS:
 
-* Supported 1 new configurations: `FortiSIEM Cloud` (`siem_cloud`)
+* Supported 1 new configuration: `FortiSIEM Cloud` (`siem_cloud`)
 * Added `additional_compute_region` to `fortisase` configuration.
 * Improved SDK logic.
 

fortiflexvm/config.go

@@ -11,7 +11,7 @@ import (
 
 var PRODUCT_TYPES = []string{"fgt_vm_bundle", "fmg_vm", "fwb_vm", "fgt_vm_lcs", "fc_ems_op", "faz_vm",
 	"fpc_vm", "fad_vm", "fgt_hw", "fap_hw", "fsw_hw", "fwbc_private", "fwbc_public", "fc_ems_cloud",
-	"fortisase", "fortiedr"}
+	"fortisase", "fortiedr", "fortirecon"}
 
 func fortiAPIPatch(t interface{}) bool {
 	if t == nil {
@@ -61,6 +61,8 @@ func convProductTypeName2Id(p_type string) int {
 		return 205
 	case "FORTIEDR":
 		return 206
+	case "FORTIRECON":
+		return 208
 	case "SIEM_CLOUD":
 		return 209
 	default:
@@ -102,6 +104,8 @@ func convProductTypeId2Name(p_id int) string {
 		return "FORTISASE"
 	case 206:
 		return "FORTIEDR"
+	case 208:
+		return "FORTIRECON"
 	case 209:
 		return "SIEM_CLOUD"
 	default:
@@ -219,6 +223,16 @@ func convConfParsId2NameList(p_id int) (string, string, string) {
 		return "faz_vm", "addons", "list"
 	case 59:
 		return "fortisase", "additional_compute_region", "int"
+	case 61:
+		return "fortirecon", "service_pkg", "string"
+	case 62:
+		return "fortirecon", "asset_num", "int"
+	case 63:
+		return "fortirecon", "network_num", "int"
+	case 64:
+		return "fortirecon", "executive_num", "int"
+	case 65:
+		return "fortirecon", "vendor_num", "int"
 	case 66:
 		return "siem_cloud", "compute_units", "int"
 	case 67:
@@ -418,6 +432,21 @@ func convConfParsNameList2Id(p_type, c_name string) int {
 		default:
 			return 0
 		}
+	case "fortirecon":
+		switch c_name {
+		case "service_pkg":
+			return 61
+		case "asset_num":
+			return 62
+		case "network_num":
+			return 63
+		case "executive_num":
+			return 64
+		case "vendor_num":
+			return 65
+		default:
+			return 0
+		}
 	case "siem_cloud":
 		switch c_name {
 		case "compute_units":

fortiflexvm/data_source_configs_list.go

@@ -406,6 +406,34 @@ func dataSourceConfigsList() *schema.Resource {
 								},
 							},
 						},
+						"fortirecon": &schema.Schema{
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"service_pkg": &schema.Schema{
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"asset_num": &schema.Schema{
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"network_num": &schema.Schema{
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"executive_num": &schema.Schema{
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"vendor_num": &schema.Schema{
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+								},
+							},
+						},
 						"siem_cloud": &schema.Schema{
 							Type:     schema.TypeList,
 							Optional: true,

fortiflexvm/resource_config.go

@@ -67,10 +67,11 @@ func resourceConfig() *schema.Resource {
 				FC_EMS_CLOUD: FortiClient EMS Cloud;
 				SIEM_CLOUD: FortiSIEM Cloud;
 				FORTISASE: FortiSASE;
-				FORTIEDR: FortiEDR.`,
+				FORTIEDR: FortiEDR;
+				FORTIRECOND: FortiRecon.`,
 				ValidateDiagFunc: checkInputValidString("product_type", []string{"FGT_VM_Bundle", "FMG_VM", "FWB_VM", "FGT_VM_LCS",
 					"FC_EMS_OP", "FC_EMS_CLOUD", "FAZ_VM", "FPC_VM", "FAD_VM", "FGT_HW", "FAP_HW", "FSW_HW",
-					"FWBC_PRIVATE", "FWBC_PUBLIC", "FORTISASE", "FORTIEDR", "SIEM_CLOUD"}),
+					"FWBC_PRIVATE", "FWBC_PUBLIC", "FORTISASE", "FORTIEDR", "FORTIRECON", "SIEM_CLOUD"}),
 			},
 			"status": &schema.Schema{
 				Type:     schema.TypeString,
@@ -499,6 +500,40 @@ func resourceConfig() *schema.Resource {
 					},
 				},
 			},
+			"fortirecon": &schema.Schema{
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"service_pkg": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
+						"asset_num": &schema.Schema{
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"network_num": &schema.Schema{
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"executive_num": &schema.Schema{
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"vendor_num": &schema.Schema{
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+					},
+				},
+			},
 			"siem_cloud": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -898,7 +933,7 @@ func expandConfigProductType(d *schema.ResourceData, v interface{}, pre string)
 	typeId := convProductTypeName2Id(v.(string))
 	if typeId == 0 {
 		err := fmt.Errorf("product_type invalid: %v, should be one of [%v]", v.(string),
-			"FGT_VM_Bundle, FMG_VM, FWB_VM, FGT_VM_LCS, FC_EMS_OP, FAZ_VM, FPC_VM, FAD_VM, FGT_HW, FWBC_PRIVATE, FWBC_PUBLIC, FC_EMS_CLOUD, FORTISASE, FORTIEDR")
+			"FGT_VM_Bundle, FMG_VM, FWB_VM, FGT_VM_LCS, FC_EMS_OP, FAZ_VM, FPC_VM, FAD_VM, FGT_HW, FWBC_PRIVATE, FWBC_PUBLIC, FC_EMS_CLOUD, FORTISASE, FORTIEDR, FORTIRECON")
 		return typeId, err
 	}
 	return typeId, nil

sdk/sdkcore/forticlient.go

@@ -118,7 +118,7 @@ func fortiAPIErrorFormat(result map[string]interface{}, body string) (err error)
 func replaceMessage(result map[string]interface{}) map[string]interface{} {
 	if result["message"] != nil {
 		message := fmt.Sprintf("%v", result["message"])
-		re, compile_err := regexp.Compile(`Parameter id (\d+)`)
+		re, compile_err := regexp.Compile(`(?i)Parameter id (\d+)`)
 		if compile_err != nil {
 			return result
 		}
@@ -249,6 +249,16 @@ func paramID2Name(p_id int) (string, string, string) {
 		return "faz_vm", "addons", "list"
 	case 59:
 		return "fortisase", "additional_compute_region", "int"
+	case 61:
+		return "fortirecon", "service_pkg", "string"
+	case 62:
+		return "fortirecon", "asset_num", "int"
+	case 63:
+		return "fortirecon", "network_num", "int"
+	case 64:
+		return "fortirecon", "executive_num", "int"
+	case 65:
+		return "fortirecon", "vendor_num", "int"
 	case 66:
 		return "siem_cloud", "compute_units", "int"
 	case 67:

website/docs/d/fortiflexvm_configs_list.html.markdown

@@ -55,6 +55,7 @@ The `configs` block contains:
 * `fwbc_public` - (List of Object) FortiWeb Cloud - Public. The structure of [`configs.fwbc_public` block](#nestedobjatt--configs--fwbc_public) is documented below.
 * `fortisase` - (List of Object) FortiSASE. The structure of [`configs.fortisase` block](#nestedobjatt--configs--fortisase) is documented below.
 * `fortiedr` - (List of Object) FortiEDR. The structure of [`configs.fortiedr` block](#nestedobjatt--configs--fortiedr) is documented below.
+* `fortirecon` - (List of Object) FortiRecon. The structure of [`configs.fortirecon` block](#nestedobjatt--configs--fortirecon) is documented below.
 * `siem_cloud` - (List of Object) FortiSIEM Cloud. The structure of [`configs.siem_cloud` block](#nestedobjatt--configs--siem_cloud) is documented below.
 * `account_id` - (Optional/Number) Account ID.
 * `id` - (Number) The unqiue number of the configuration.
@@ -76,6 +77,7 @@ The `configs` block contains:
   * `FWBC_PUBLIC`: FortiWeb Cloud - Public
   * `FORTISASE`: FortiSASE
   * `FORTIEDR`: FortiEDR
+  * `FORTIREDON`: FortiRecon
   * `SIEM_CLOUD`: FortiSIEM Cloud
 * `program_serial_number` - (String) The unique serial number of the FortiFlex Program this configuration belongs to.
 * `status` - (String) The status of this configuration. `ACTIVATE` or `DISABLED`.
@@ -379,6 +381,15 @@ The `configs.fortiedr` block contains:
 * `endpoints` - (Number) Number of endpoints. Read only.
 * `addons` - (List of String) The default value is an empty list. Options: `"FEDRXDR"` (XDR).
 
+<a id="nestedobjatt--configs--fortirecon"></a>
+The `configs.fortirecon` block contains:
+
+* `service_pkg` - (String) `"FRNEASM"` (External Attack Surface Monitoring), `"FRNEASMBP"` (External Attack Surface Monitoring & Brand Protect), `"FRNEASMBPACI"` (External Attack Surface Monitoring & Brand Protect & Adversary Centric Intelligence)
+* `asset_num` - (Number) Number of Monitored Assets. Number between 200 and 1,000,000 (inclusive). Value should be divisible by 50.
+* `network_num` - (Number) Internal Attack Surface Monitoring. Number between 0 and 100 (inclusive)
+* `executive_num` - (Number) Executive Monitoring. Number between 0 and 1,000 (inclusive). This value can only be set to 0 if `service_pkg` is `"FRNEASM"` or `"FRNEASMBP"`.
+* `vendor_num` - (Number) Vendor Monitoring. Number between 0 and 1,000 (inclusive) This value can only be set to 0 if `service_pkg` is `"FRNEASM"` or `"FRNEASMBP"`.
+
 <a id="nestedobjatt--configs--siem_cloud"></a>
 The `configs.siem_cloud` block contains:
 

website/docs/r/fortiflexvm_config.html.markdown

@@ -272,6 +272,18 @@ resource "fortiflexvm_config" "example16" {
   }
 }
 
+resource "fortiflexvm_config" "example17" {
+  product_type          = "FORTIRECON"
+  program_serial_number = "ELAVMS00000XXXXX"
+  name                  = "FORTIRECON_example"
+  fortirecon {
+    service_pkg   = "FRNEASM" # "FRNEASM", "FRNEASMBP" or "FRNEASMBPACI"
+    asset_num     = 200       # Number of Monitored Assets. Number between 200 and 1,000,000 (inclusive). Value should be divisible by 50.
+    network_num   = 0         # Internal Attack Surface Monitoring. Number between 0 and 100 (inclusive)
+    executive_num = 0         # Executive Monitoring. Number between 0 and 1,000 (inclusive). This value can only be set to 0 if `service_pkg` is `"FRNEASM"` or `"FRNEASMBP"`.
+    vendor_num    = 0         # Vendor Monitoring. Number between 0 and 1,000 (inclusive) This value can only be set to 0 if `service_pkg` is `"FRNEASM"` or `"FRNEASMBP"`.
+  }
+}
 ```
 
 ## Argument Reference
@@ -297,6 +309,7 @@ The following arguments are supported:
   * `FWBC_PUBLIC`: FortiWeb Cloud - Public
   * `FORTISASE`: FortiSASE
   * `FORTIEDR`: FortiEDR
+  * `FORTIRECON`: FortiRecon
   * `SIEM_CLOUD`: FortiSIEM Cloud
 * `program_serial_number` - (Required/String) The serial number of your FortiFlex Program. This serial number should start with `"ELAVMR"`.
 * `name` - (Required unless you only update the status/String) The name of your configuration.
@@ -319,6 +332,7 @@ The following arguments are supported:
 * `fwbc_public` - (Block List) You must fill in this block if your `product_type` is `"FWBC_PUBLIC"`. The structure of [`fwbc_public` block](#nestedblock--fwbc_public) is documented below.
 * `fortisase` - (Block List) You must fill in this block if your `product_type` is `"FORTISASE"`. The structure of [`fortisase` block](#nestedblock--fortisase) is documented below.
 * `fortiedr` - (Block List) You must fill in this block if your `product_type` is `"FORTIEDR"`. The structure of [`fortiedr` block](#nestedblock--fortiedr) is documented below.
+* `fortirecon` - (Block List) You must fill in this block if your `product_type` is `"FORTIRECON"`. The structure of [`fortirecon` block](#nestedblock--fortirecon) is documented below.
 * `siem_cloud` - (Block List) You must fill in this block if your `product_type` is `"SIEM_CLOUD"`. The structure of [`siem_cloud` block](#nestedblock--siem_cloud) is documented below.
 
 <a id="nestedblock--fad_vm"></a>
@@ -616,6 +630,17 @@ The `fortisase` block contains:
 * `endpoints` - (Read only/Number) Number of endpoints. Read only.
 * `addons` - (Optional/List of String) The default value is an empty list. Options: `"FEDRXDR"` (XDR).
 
+<a id="nestedblock--fortirecon"></a>
+The `fortisase` block contains:
+
+* `service_pkg` - (Required if `product_type = "FORTITRECON"`/String) Possible values are:
+  * `"FRNEASM"` (External Attack Surface Monitoring)
+  * `"FRNEASMBP"` (External Attack Surface Monitoring & Brand Protect)
+  * `"FRNEASMBPACI"` (External Attack Surface Monitoring & Brand Protect & Adversary Centric Intelligence)
+* `asset_num` - (Required if `product_type = "FORTITRECON"`/Number) Number of Monitored Assets. Number between 200 and 1,000,000 (inclusive). Value should be divisible by 50.
+* `network_num` - (Optional/Number) Internal Attack Surface Monitoring. Number between 0 and 100 (inclusive)
+* `executive_num` - (Optional/Number) Executive Monitoring. Number between 0 and 1,000 (inclusive). This value can only be set to 0 if `service_pkg` is `"FRNEASM"` or `"FRNEASMBP"`.
+* `vendor_num` - (Optional/Number) Vendor Monitoring. Number between 0 and 1,000 (inclusive) This value can only be set to 0 if `service_pkg` is `"FRNEASM"` or `"FRNEASMBP"`.
 
 <a id="nestedblock--siem_cloud"></a>
 The `siem_cloud` block contains: