Merge pull request #19 from AsBuiltReport/dev

v0.1.1release
AsBuiltReport · Oct 21, 2022 · f9bf4f3 · f9bf4f3
2 parents 040a158 + 1e56ca6
commit f9bf4f3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/AsBuiltReport.Fortinet.FortiGate.json b/AsBuiltReport.Fortinet.FortiGate.json
@@ -8,7 +8,9 @@
         "ShowHeaderFooter": true,
         "ShowTableCaptions": true
     },
-    "Options": {},
+    "Options": {
+        "Port": 443
+    },
     "InfoLevel": {
         "_comment_": "0 = Disabled, 1 = Enabled / Summary, 2 = Adv Summary, 3 = Detailed.",
         "FortiCare": {

diff --git a/AsBuiltReport.Fortinet.FortiGate.psd1 b/AsBuiltReport.Fortinet.FortiGate.psd1
@@ -12,7 +12,7 @@
 RootModule = 'AsBuiltReport.Fortinet.FortiGate.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.1.0'
+ModuleVersion = '0.1.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # :arrows_clockwise: Fortinet FortiGate As Built Report Changelog
 
+## [0.1.1] - 2022-09-20
+
+### Fixed
+
+- Connection: Add Options for custom Port [#16](https://github.com/AsBuiltReport/AsBuiltReport.Fortinet.FortiGate/pull/16) - Fixes [#15](https://github.com/AsBuiltReport/AsBuiltReport.Fortinet.FortiGate/issues/15)
+- FortiCare: add Try/Catch for Firmware Upgrade Paths [#17](https://github.com/AsBuiltReport/AsBuiltReport.Fortinet.FortiGate/pull/17) - Fixes [#14](https://github.com/AsBuiltReport/AsBuiltReport.Fortinet.FortiGate/issues/14)
+
 ## [0.1.0] - 2022-07-31
 
 - Initial Release with support of FortiCare, System, Route, Firewall and User
diff --git a/README.md b/README.md
@@ -127,6 +127,10 @@ The **Report** schema provides configuration of the Fortinet FortiGate report in
 ### Options
 The **Options** schema allows certain options within the report to be toggled on or off.
 
+| Sub-Schema      | Setting      | Default | Description |
+|-----------------|--------------|---------|-------------|
+| Port | TCP Port  | 443 | Used to specify the admin HTTPS port of FortiGate
+
 <!-- ********** Add/Remove the number of InfoLevels as required ********** -->
 ### InfoLevel
 The **InfoLevel** schema allows configuration of each section of the report at a granular level. The following sections can be set.

diff --git a/Src/Private/Get-AbrFgtFortiCare.ps1 b/Src/Private/Get-AbrFgtFortiCare.ps1
@@ -93,7 +93,13 @@ function Get-AbrFgtForticare {
         }
 
         $firmware = Get-FGTMonitorSystemFirmware
-        $firmware_upgrade_paths = Get-FGTMonitorSystemFirmware -upgrade_paths
+        try {
+            $firmware_upgrade_paths = Get-FGTMonitorSystemFirmware -upgrade_paths -Verbose
+        }
+        catch {
+            $firmware_upgrade_paths = $null
+        }
+
 
         if ($firmware -and $firmware_upgrade_paths -and $InfoLevel.Forticare.Firmware -ge 1) {
             Paragraph "The following section details firmware information on FortiGate."

diff --git a/Src/Public/Invoke-AsBuiltReport.Fortinet.FortiGate.ps1 b/Src/Public/Invoke-AsBuiltReport.Fortinet.FortiGate.ps1
@@ -36,7 +36,7 @@ function Invoke-AsBuiltReport.Fortinet.FortiGate {
 
         try {
             #Connection to FortiGate (TODO: Add Parameter for Certificate Check and Port)
-            Connect-FGT -Server $System -Credential $Credential -SkipCertificateCheck | Out-Null #-Port $Options.ServerPort
+            Connect-FGT -Server $System -Credential $Credential -SkipCertificateCheck -Port $Options.Port | Out-Null
 
             #Get Model
             $Model = (Get-FGTMonitorSystemFirmware).current.'platform-id'