Merge branch 'master' into patch-2

Author: mgreenegit

README.md

@@ -109,7 +109,7 @@ For more information about bind mounts, please go onto the [Docker documentation
 | ---|---|
 | Package is out of date      | Create a Pull Request or Issue |
 | New desired package     | Create a Pull Request or Issue |
-| New desired Cloud Shell feature | Create an Issue |
+| New desired Cloud Shell feature | Create an [Discussion](https://github.com/Azure/CloudShell/discussions) |
 | Issue with one of the packages*     | Talk to package owner & create a PR on their repo.  |
 | Issue with how package interacts with Cloud Shell     | Create a Pull Request OR GitHub Issue |
 | Security bug | See https://www.microsoft.com/en-us/msrc/faqs-report-an-issue |

linux/powershell/Dockerfile.Data.json

@@ -7,6 +7,5 @@
     "AzureADMaxVersion": "2.9999.9999.9999",
     "AzureADStandardMaxVersion": "0.0.9999.9999",
     "SQLServerModuleMaxVersion": "21.9999.99999",
-    "PowerBIMaxVersion": "1.9999.9999",
-    "AzGuestConfigurationMaxVersion": "0.9999.9999"
-}
+    "PowerBIMaxVersion": "1.9999.9999"
+}

linux/powershell/Invoke-PreparePowerShell.ps1

@@ -18,7 +18,7 @@ $moduleList = @(
     "AzurePSDrive",
     "MicrosoftPowerBIMgmt",
     "Az",
-    "Az.GuestConfiguration",
+    "GuestConfiguration",
     "Microsoft.PowerShell.UnixCompleters",
     "Microsoft.PowerShell.SecretManagement",
     "Microsoft.PowerShell.SecretStore"

linux/powershell/setupPowerShell.ps1

@@ -135,7 +135,7 @@ try {
         # Install modules from PSGallery
         Write-Output "Installing modules from production gallery"    
         PowerShellGet\Install-Module -Name AzurePSDrive @prodAllUsers   
-        PowerShellGet\Install-Module -Name Az.GuestConfiguration -MaximumVersion $script:dockerfileDataObject.AzGuestConfigurationMaxVersion -ErrorAction SilentlyContinue @prodAllUsers
+        PowerShellGet\Install-Module -Name GuestConfiguration -MaximumVersion $script:dockerfileDataObject.GuestConfigurationMaxVersion -ErrorAction SilentlyContinue @prodAllUsers
         PowerShellGet\Install-Module -Name Microsoft.PowerShell.UnixCompleters @prodAllUsers
         PowerShellGet\Install-Module -AllowPreRelease -Force PSReadLine -Repository PSGallery # get psreadline beta
         PowerShellGet\Install-Module -Name Az.Tools.Predictor -Repository PSGallery

linux/tools.Dockerfile

@@ -30,7 +30,7 @@ RUN az aks install-cli \
 
 # Download the latest terraform (AMD64), install to global environment.
 RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B36CBA91A2C0730C435FC280B0B441097685B676 \
-    && TF_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M ".current_version") \
+    && TF_VERSION=$(curl -s https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r -M ".version") \
     && wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_linux_amd64.zip \
     && wget -nv -O terraform.sha256 https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_SHA256SUMS \
     && wget -nv -O terraform.sha256.sig https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_SHA256SUMS.sig \  

tests/PSinLinuxCloudShellImage.Tests.ps1

@@ -190,13 +190,13 @@ Describe "PowerShell Modules" {
 
     }
 
-    It "Az.GuestConfiguration PowerShell Module" {
+    It "GuestConfiguration PowerShell Module" {
 
-        $module = Get-Module -Name Az.GuestConfiguration -ListAvailable
+        $module = Get-Module -Name GuestConfiguration -ListAvailable
         $module | Should -Not -BeNullOrEmpty
 
-        # Az.GuestConfiguration module version must be 0.*.* or greater
-        $module.Version -like "0.*.*" | Should -Be $true
+        # GuestConfiguration module version must be 3.5.4 or greater
+        $module.Version -ge '3.5.4' | Should -Be $true
     }
 
     It "MicrosoftTeams PowerShell Module" {
@@ -236,7 +236,7 @@ Describe "PowerShell Modules" {
         @{ ModuleName = "AzureAD.Standard.Preview" }
         @{ ModuleName = "Az" }
         @{ ModuleName = "MicrosoftPowerBIMgmt" }
-        @{ ModuleName = "Az.GuestConfiguration" }
+        @{ ModuleName = "GuestConfiguration" }
         @{ ModuleName = "EXOPSSessionConnector" }
         @{ ModuleName = "MicrosoftTeams" }
         @{ ModuleName = "Microsoft.PowerShell.UnixCompleters" }