Merge pull request #52 from rebelinux/dev

v0.3.10

Author: rebelinux

AsBuiltReport.Veeam.VB365.psd1

@@ -12,7 +12,7 @@
     RootModule = 'AsBuiltReport.Veeam.VB365.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.3.9'
+    ModuleVersion = '0.3.10'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -55,15 +55,15 @@
     RequiredModules = @(
         @{
             ModuleName = 'AsBuiltReport.Core';
-            ModuleVersion = '1.4.2.1'
+            ModuleVersion = '1.4.3'
         },
         @{
             ModuleName = 'PScriboCharts';
             ModuleVersion = '0.9.0'
         },
         @{
             ModuleName = 'Diagrammer.Core';
-            ModuleVersion = '0.2.19'
+            ModuleVersion = '0.2.22'
         }
     )
 

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ##### This project is community maintained and has no sponsorship from Veeam, its employees or any of its affiliates.
 
+## [0.3.10] - 2025-04-11
+
+### Changed
+
+- Bump module version to 0.3.10
+- Update dependencies in changelog
+- Improve diagram AdditionalInfo sorting
+- Refactor Infrastructure Diagram generation logic for clarity and efficiency
+
 ## [0.3.9] - 2025-03-04
 
 ### Added

Src/Private/Get-AbrVb365Diagram.ps1

@@ -5,7 +5,7 @@ function Get-AbrVb365Diagram {
     .DESCRIPTION
         Diagram the configuration of Veeam Backup for Microsoft 365 infrastructure in PDF/SVG/DOT/PNG formats using PSGraph and Graphviz.
     .NOTES
-        Version:        0.3.9
+        Version:        0.3.10
         Author(s):      Jonathan Colon
         Twitter:        @jcolonfzenpr
         Github:         rebelinux
@@ -83,7 +83,7 @@ function Get-AbrVb365Diagram {
             $ProxiesInfo = @()
 
             $Proxies | ForEach-Object {
-                $inobj = @{
+                $inobj = [PSCustomObject] [ordered] @{
                     'Type' = $_.Type
                     'Port' = "TCP/$($_.Port)"
                     'OS' = $_.OperatingSystemKind
@@ -168,7 +168,7 @@ function Get-AbrVb365Diagram {
                 } else {
                     $ObjStorage = 'None'
                 }
-                $inobj = [ordered] @{
+                $inobj = [PSCustomObject] [ordered] @{
                     # 'Path' = $Repository.Path
                     'Capacity' = ConvertTo-FileSizeString $Repository.Capacity
                     'Free Space' = ConvertTo-FileSizeString $Repository.FreeSpace
@@ -194,13 +194,13 @@ function Get-AbrVb365Diagram {
             }
         }
         # Object Repositories Graphviz Cluster
-try {
+        try {
 
             $ObjectRepositoriesInfo = @()
             $ORIconType = @()
 
             $ObjectRepositories | ForEach-Object {
-                $inobj = @{
+                $inobj = [PSCustomObject] [ordered] @{
                     'Type' = $_.Type
                     'Folder' = $_.Folder
                     'Immutability' = $_.EnableImmutability
@@ -236,7 +236,7 @@ try {
             $OrganizationsInfo = @()
 
             ($Organizations | Where-Object { $_.Type -eq 'OnPremises' }) | ForEach-Object {
-                $inobj = @{
+                $inobj = [PSCustomObject] [ordered] @{
                     'Users' = "Licensed: $($_.LicensingOptions.LicensedUsersCount) - Trial: $($_.LicensingOptions.TrialUsersCount)"
                     'BackedUp' = ConvertTo-TextYN $_.IsBackedUp
                 }
@@ -255,7 +255,7 @@ try {
             $OrganizationsInfo = @()
 
             ($Organizations | Where-Object { $_.Type -eq 'Office365' }) | ForEach-Object {
-                $inobj = @{
+                $inobj = [PSCustomObject] [ordered] @{
                     'Users' = "Licensed: $($_.LicensingOptions.LicensedUsersCount) - Trial: $($_.LicensingOptions.TrialUsersCount)"
                     'BackedUp' = ConvertTo-TextYN $_.IsBackedUp
                 }

Src/Public/Invoke-AsBuiltReport.Veeam.VB365.ps1

@@ -5,10 +5,10 @@ function Invoke-AsBuiltReport.Veeam.VB365 {
     .DESCRIPTION
         Documents the configuration of Veeam VB365 in Word/HTML/Text formats using PScribo.
     .NOTES
-        Version:        0.3.9
+        Version:        0.3.10
         Author:         Jonathan Colon
-        Twitter:
-        Github:
+        Twitter:        @jcolonzenpr
+        Github:         @rebelinux
         Credits:        Iain Brighton (@iainbrighton) - PScribo module
 
     .LINK
@@ -43,7 +43,7 @@ function Invoke-AsBuiltReport.Veeam.VB365 {
         if ($InstalledVersion) {
             Write-PScriboMessage -Plugin "Module" -IsWarning "AsBuiltReport.Veeam.VB365 $($InstalledVersion.ToString()) is currently installed."
             $LatestVersion = Find-Module -Name AsBuiltReport.Veeam.VB365 -Repository PSGallery -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Version
-            if ($LatestVersion -gt $InstalledVersion) {
+            if ([version]$LatestVersion -gt [version]$InstalledVersion) {
                 Write-PScriboMessage -Plugin "Module" -IsWarning "AsBuiltReport.Veeam.VB365 $($LatestVersion.ToString()) is available."
                 Write-PScriboMessage -Plugin "Module" -IsWarning "Run 'Update-Module -Name AsBuiltReport.Veeam.VB365 -Force' to install the latest version."
             }
@@ -199,26 +199,20 @@ function Invoke-AsBuiltReport.Veeam.VB365 {
                     }
                 } else {
                     try {
-                        try {
-                            $Graph = Get-AbrVb365Diagram
-                            $Diagram = New-Diagrammer @DiagramParams -InputObject $Graph
-                        } catch {
-                            Write-PScriboMessage -IsWarning "Unable to generate the Infrastructure Diagram: $($_.Exception.Message)"
-                        }
-
-                        if ($Diagram) {
-                            If ((Get-DiaImagePercent -GraphObj $Diagram).Width -gt 1500) { $ImagePrty = 20 } else { $ImagePrty = 50 }
-                            Section -Style Heading2 "Infrastructure Diagram." {
-                                Image -Base64 $Diagram -Text "Veeam Backup for Microsoft 365 Diagram" -Percent $ImagePrty -Align Center
-                                Paragraph "Image preview: Opens the image in a new tab to view it at full resolution." -Tabs 2
-                            }
-                            BlankLine
-                        }
+                        $Graph = Get-AbrVb365Diagram
+                        $script:Diagram = New-Diagrammer @DiagramParams -InputObject $Graph
                     } catch {
-                        Write-PScriboMessage -IsWarning "Infrastructure Diagram: $($_.Exception.Message)"
+                        Write-PScriboMessage -IsWarning "Unable to generate the Infrastructure Diagram: $($_.Exception.Message)"
                     }
                 }
             }
         }
+        if ($Diagram) {
+            If ((Get-DiaImagePercent -GraphObj $Diagram).Width -gt 1500) { $ImagePrty = 20 } else { $ImagePrty = 50 }
+            Section -Style Heading2 "Infrastructure Diagram." -Orientation Landscape {
+                Image -Base64 $Diagram -Text "Veeam Backup for Microsoft 365 Diagram" -Percent $ImagePrty -Align Center
+                Paragraph "Image preview: Opens the image in a new tab to view it at full resolution." -Tabs 2
+            }
+        }
     } #endregion foreach loop
 }