Merge pull request #392 from shailesh91/master

Updates for v3.3.2

Modules/ArcGIS/ArcGIS.psd1

@@ -1,9 +1,9 @@
-#
+#
 # Module manifest for module 'PSGet_ArcGIS'
 #
 # Generated by: Esri
 #
-# Generated on: 02/17/2022
+# Generated on: 04/14/2022
 #
 
 @{
@@ -12,7 +12,7 @@
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion = '3.3.1'
+    ModuleVersion = '3.3.2'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -107,7 +107,7 @@
             # IconUri = ''
 
             # ReleaseNotes of this module
-            ReleaseNotes = 'ArcGIS Module for PowerShell DSC - 3.3.1'
+            ReleaseNotes = 'ArcGIS Module for PowerShell DSC - 3.3.2'
 
             # External dependent modules of this module
             # ExternalModuleDependencies = ''

Modules/ArcGIS/ArcGIS.psm1

@@ -1,4 +1,4 @@
-function Get-FQDN
+function Get-FQDN
 {    
     [CmdletBinding()]
     param(
@@ -2222,11 +2222,11 @@ function Invoke-ServerUpgradeScript {
             }
 
             $NodeToAdd["ServerRole"] = $ServerRole
-            if($ServerRole -ine "GeneralPurposeServer" -and ($AdditionalServerRoles.Count -gt 0)){
+            if($ServerRole -ieq "GeneralPurposeServer" -and ($AdditionalServerRoles.Count -gt 0)){
                 $NodeToAdd["AdditionalServerRoles"] = $AdditionalServerRoles
             }
 
-            if($ServerRole -ine "GeoEvent" -and  $ServerRole -ine "WorkflowManagerServer"){
+            if($ServerRole -ine "GeoEvent" -and $ServerRole -ine "WorkflowManagerServer"){
                 $ServerLicenseFilePath = $cf.ConfigData.Server.LicenseFilePath
                 $ServerLicensePassword = $null
                 if($cf.ConfigData.Server.LicensePasswordFilePath){

Modules/ArcGIS/ArcGISUtility.psm1

@@ -1,4 +1,4 @@
-function ConvertTo-HttpBody($props)
+function ConvertTo-HttpBody($props)
 {
     [string]$str = ''
     foreach($prop in $props.Keys){                
@@ -546,11 +546,7 @@ function Get-NodeAgentAmazonElementsPresent
     $File = Join-Path $InstallDir 'framework\etc\NodeAgentExt.xml'
     if(Test-Path $File){
         [xml]$xml = Get-Content $File
-        if((($xml.NodeAgent.Observers.Observer | Where-Object { $_.platform -ieq 'amazon'}).Length -gt 0) -or `
-                ($xml.NodeAgent.Observers.Observer.platform -ieq 'amazon') -or `
-                (($xml.NodeAgent.Plugins.Plugin | Where-Object { $_.platform -ieq 'amazon'}).Length -gt 0) -or `
-                ($xml.NodeAgent.Plugins.Plugin.platform -ieq 'amazon'))
-        {
+        if((Select-Xml -Xml $xml -XPath "//NodeAgent/Observers/Observer[@platform='amazon']").Length -gt 0 -or (Select-Xml -Xml $xml -XPath "//NodeAgent/Plugins/Plugin[@platform='amazon']").Length -gt 0){
             Write-Verbose "Amazon elements exist in $File"
             $Enabled = $true
         }
@@ -572,17 +568,21 @@ function Remove-NodeAgentAmazonElements
     $File = Join-Path $InstallDir 'framework\etc\NodeAgentExt.xml'
     if(Test-Path $File){
         [xml]$xml = Get-Content $File
-        if($xml.NodeAgent.Observers.Observer.platform -ieq 'amazon')
-        {
-            $xml.NodeAgent.Observers.RemoveChild($xml.NodeAgent.Observers.Observer)
-            Write-Verbose "Amazon Observer exists in $File. Removing it"
-            $Changed = $true
+        if((Select-Xml -Xml $xml -XPath "//NodeAgent/Observers/Observer[@platform='amazon']").Length -gt 0){
+            $amazonObserverNode = $xml.NodeAgent.Observers.SelectSingleNode("//Observer[@platform='amazon']")
+            if($null -ne $amazonObserverNode){
+                Write-Verbose "Amazon Observer exists in $File. Removing it"
+                $amazonObserverNode.ParentNode.RemoveChild($amazonObserverNode) | Out-Null
+                $Changed = $true
+            }
         }
-        if($xml.NodeAgent.Plugins.Plugin.platform -ieq 'amazon')
-        {
-            $xml.NodeAgent.Plugins.RemoveChild($xml.NodeAgent.Plugins.Plugin)
-            Write-Verbose "Amazon plugin exists in $File. Removing it"
-            $Changed = $true
+        if((Select-Xml -Xml $xml -XPath "//NodeAgent/Plugins/Plugin[@platform='amazon']").Length -gt 0){
+            $amazonPluginNode = $xml.NodeAgent.Plugins.SelectSingleNode("//Plugin[@platform='amazon']")
+            if($null -ne $amazonPluginNode){
+                Write-Verbose "Amazon plugin exists in $File. Removing it"
+                $amazonPluginNode.ParentNode.RemoveChild($amazonPluginNode) | Out-Null
+                $Changed = $true
+            }
         }
         if($Changed) {
             $xml.Save($File)
@@ -1118,7 +1118,7 @@ function Get-ComponentCode
         }
         ServerWorkflowManagerClassic = @{
             '10.6' = 'F0553C08-337E-4C10-AD64-F2E8A5457483'
-            '10.6.1' = '0C05EC3A-31E3-4530-B89F-FD51FB4822FB'
+            '10.6.1' = '816E8417-B450-4449-A660-1B98A4665FF7'
             '10.7' = 'FBF6F647-730E-40C6-97A2-B309127EFAEE'
             '10.7.1' = '2CCB468C-1534-4A70-8DBB-79083A01E0E5'
             '10.8' = 'A32F405C-5DFD-4470-92C6-CFC10514E1C0'
@@ -1128,7 +1128,7 @@ function Get-ComponentCode
         }
         DesktopWorkflowManagerClassic = @{
             '10.6' = 'CB6C6444-6F6B-4FF1-8BFC-46D528D59C50'
-            '10.6.1' = '816E8417-B450-4449-A660-1B98A4665FF7'
+            '10.6.1' = '0C05EC3A-31E3-4530-B89F-FD51FB4822FB'
             '10.7' = '2DD96926-CA3A-4F22-BC37-9396D6AF0994'
             '10.7.1' = 'FCC76F40-4B99-420B-854F-C0EE4D528090'
             '10.8' = '952B019D-51A5-4FF9-99F1-0B78108F1AD3'
@@ -1512,4 +1512,4 @@ Export-ModuleMember -Function Invoke-ArcGISWebRequest, ConvertTo-HttpBody, Invok
                                 Get-ConfiguredHostIdentifier, Set-ConfiguredHostIdentifier, Get-ConfiguredHostName, `
                                 Set-ConfiguredHostName, Get-ConfiguredHostIdentifierType, Get-ComponentCode, Get-ArcGISProductName, `
                                 Test-Install, Convert-PSObjectToHashtable, Get-DataStoreBackupLocation, `
-                                Invoke-DataStoreConfigureBackupLocationTool, Invoke-DescribeDataStore, Restart-ArcGISService
+                                Invoke-DataStoreConfigureBackupLocationTool, Invoke-DescribeDataStore, Restart-ArcGISService

Modules/ArcGIS/Configurations-Azure-2/BaseDeploymentSingleTierConfiguration.ps1

@@ -420,6 +420,8 @@
             {
                 ComponentType = "Server"
                 EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false}
+                Version = "10.9.1"
+                LogFormat = "csv"
                 DependsOn = $ServerDependsOn
             }
 
@@ -876,4 +878,4 @@
             }
         }
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/DataStoreConfiguration.ps1

@@ -221,4 +221,4 @@
 		    }
         }
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeConfigure.ps1

@@ -1,4 +1,4 @@
-Configuration DataStoreUpgradeConfigure{
+Configuration DataStoreUpgradeConfigure{
     param(
         [System.Management.Automation.PSCredential]
         $SiteAdministratorCredential,
@@ -37,4 +37,4 @@ Configuration DataStoreUpgradeConfigure{
             InstallDir = $InstallDir
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeInstall.ps1

@@ -1,4 +1,4 @@
-Configuration DataStoreUpgradeInstall{
+Configuration DataStoreUpgradeInstall{
     param(
         [System.String]
         $Version,
@@ -138,4 +138,4 @@ Configuration DataStoreUpgradeInstall{
             }
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradePreInstall.ps1

@@ -1,4 +1,4 @@
-Configuration DataStoreUpgradePreInstall{
+Configuration DataStoreUpgradePreInstall{
     param(
         [System.Management.Automation.PSCredential]
         $ServiceCredential,
@@ -31,4 +31,4 @@ Configuration DataStoreUpgradePreInstall{
             State = 'Stopped'
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/DiskConfiguration.ps1

@@ -43,4 +43,4 @@
 			}	
 		}
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/FileShareConfiguration.ps1

@@ -136,4 +136,4 @@
             }
         }
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/GISServerMultiTierConfiguration.ps1

@@ -518,6 +518,8 @@
             {
                 ComponentType = "Server"
                 EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false}
+				Version = "10.9.1"
+                LogFormat = "csv"
                 DependsOn = $ServerDependsOn
             }
 
@@ -749,4 +751,4 @@
 			}
 		}
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/GISServerSingleTierConfiguration.ps1

@@ -568,6 +568,8 @@
             {
                 ComponentType = "Server"
                 EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false}
+				Version = "10.9.1"
+                LogFormat = "csv"
                 DependsOn = $ServerDependsOn
             }
 
@@ -804,4 +806,4 @@
 			}
 		}
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/MissionServerMultiTierConfiguration.ps1

@@ -1,4 +1,4 @@
-Configuration MissionServerMultiTierConfiguration{
+Configuration MissionServerMultiTierConfiguration{
     param(
         [Parameter(Mandatory=$false)]
         [System.Management.Automation.PSCredential]
@@ -461,4 +461,4 @@ Configuration MissionServerMultiTierConfiguration{
 			}
 		}
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/MissionServerSingleTierConfiguration.ps1

@@ -1,4 +1,4 @@
-Configuration MissionServerSingleTierConfiguration{
+Configuration MissionServerSingleTierConfiguration{
     param(
         [Parameter(Mandatory=$false)]
         [System.Management.Automation.PSCredential]
@@ -481,4 +481,4 @@ Configuration MissionServerSingleTierConfiguration{
 			}
 		}
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/NotebookServerSingleTierConfiguration.ps1

@@ -494,4 +494,4 @@
 			}
 		}
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/PortalConfiguration.ps1

@@ -470,4 +470,4 @@
 		    }
         }
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/PortalPostUpgrade.ps1

@@ -1,4 +1,4 @@
-Configuration PortalPostUpgrade{
+Configuration PortalPostUpgrade{
 
     param(
         [parameter(Mandatory = $true)]
@@ -72,4 +72,4 @@ Configuration PortalPostUpgrade{
             ImportExternalPublicCertAsRoot = $True
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/PortalUpgrade.ps1

@@ -1,4 +1,4 @@
-Configuration PortalUpgrade{
+Configuration PortalUpgrade{
 
     param(
         [parameter(Mandatory = $true)]
@@ -181,4 +181,4 @@ Configuration PortalUpgrade{
             DataDir         = $DataDirsForPortal
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/SQLServerConfiguration.ps1

@@ -86,4 +86,4 @@
             }
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/ServerConfiguration.ps1

@@ -294,6 +294,8 @@
                 {
                     ComponentType = "Server"
                     EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false}
+                    Version = "10.9.1"
+                    LogFormat = "csv"
                     DependsOn = $ServerDependsOn
                 }
 
@@ -382,4 +384,4 @@
 		    }
         }
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/ServerUpgrade.ps1

@@ -1,4 +1,4 @@
-Configuration ServerUpgrade{
+Configuration ServerUpgrade{
     param(
         [System.String]
         $Version,
@@ -242,7 +242,10 @@ Configuration ServerUpgrade{
         if($ServerRole -ieq "NotebookServer"){
             $ServerLicenseRole = "NotebookServer"
         }
-
+        if($ServerRole -ieq "MissionServer"){
+            $ServerLicenseRole = "MissionServer"
+        }
+
 		## Download license file
 		if($ServerLicenseFileUrl) {
 			$ServerLicenseFileName = Get-FileNameFromUrl $ServerLicenseFileUrl
@@ -279,6 +282,13 @@ Configuration ServerUpgrade{
                 PsDscRunAsCredential  = $ServiceCredential # Copy as arcgis account which has access to this share
             }
 
+        }elseif($ServerRole -ieq "MissionServer"){
+            ArcGIS_MissionServerUpgrade MissionServerConfigureUpgrade{
+                Ensure = "Present"
+                Version = $Version
+                ServerHostName = $MachineFQDN
+                DependsOn = $Depends
+            }
         }else{
             ArcGIS_ServerUpgrade ServerConfigureUpgrade{
                 Ensure = "Present"
@@ -376,4 +386,4 @@ Configuration ServerUpgrade{
             }
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/SpatiotemporalBigDataStoreConfiguration.ps1

@@ -166,4 +166,4 @@
 		    }
         }
 	}
-}
+}

Modules/ArcGIS/Configurations-Azure-2/TileCacheDataStoreConfiguration.ps1

@@ -1,4 +1,4 @@
-Configuration TileCacheDataStoreConfiguration{
+Configuration TileCacheDataStoreConfiguration{
     param(
         [Parameter(Mandatory=$true)]
         [ValidateNotNullorEmpty()]
@@ -224,4 +224,4 @@ Configuration TileCacheDataStoreConfiguration{
             }
         }
     }
-}
+}

Modules/ArcGIS/Configurations-Azure-2/UpgradeVMFileShareConfiguration.ps1

@@ -69,4 +69,4 @@
 			}
 		}
     }
-}
+}