Revert "Add MSRDS deprecation notice to deployment scripts"

This reverts commit e7f7d9a.
alan-turing-institute · Jun 27, 2023 · d5ba196 · d5ba196
1 parent e7f7d9a
commit d5ba196
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/deployment/secure_research_environment/setup/Deploy_SRE.ps1 b/deployment/secure_research_environment/setup/Deploy_SRE.ps1
@@ -59,9 +59,6 @@ if (Get-MgContext) {
 # Check that we are using the correct provider
 # --------------------------------------------
 if ($config.sre.remoteDesktop.provider -ne "ApacheGuacamole") {
-    if ($config.sre.remoteDesktop.provider -wq "MicrosoftRDS") {
-        Add-LogMessage -Level Warning "Support for Microsoft RDS is deprecated and will be removed in release v4.1.0"
-    }
     Add-LogMessage -Level Fatal "You should not be running this script when using remote desktop provider '$($config.sre.remoteDesktop.provider)'"
 }
 

diff --git a/deployment/secure_research_environment/setup/Setup_SRE_Key_Vault_And_Users.ps1 b/deployment/secure_research_environment/setup/Setup_SRE_Key_Vault_And_Users.ps1
@@ -51,7 +51,6 @@ try {
     if ($config.sre.remoteDesktop.provider -eq "ApacheGuacamole") {
         $null = Resolve-KeyVaultSecret -VaultName $config.sre.keyVault.name -SecretName $config.sre.remoteDesktop.guacamole.adminPasswordSecretName -DefaultLength 20 -AsPlaintext
     } elseif ($config.sre.remoteDesktop.provider -eq "MicrosoftRDS") {
-        Add-LogMessage -Level Warning "Support for Microsoft RDS is deprecated and will be removed in release v4.1.0"
         $null = Resolve-KeyVaultSecret -VaultName $config.sre.keyVault.name -SecretName $config.sre.remoteDesktop.gateway.adminPasswordSecretName -DefaultLength 20 -AsPlaintext
         $null = Resolve-KeyVaultSecret -VaultName $config.sre.keyVault.name -SecretName $config.sre.remoteDesktop.appSessionHost.adminPasswordSecretName -DefaultLength 20 -AsPlaintext
     } else {

diff --git a/deployment/secure_research_environment/setup/Setup_SRE_Networking.ps1 b/deployment/secure_research_environment/setup/Setup_SRE_Networking.ps1
@@ -88,7 +88,6 @@ if ($config.sre.remoteDesktop.provider -eq "ApacheGuacamole") {
     $null = Set-NetworkSecurityGroupRules -NetworkSecurityGroup $guacamoleNsg -Rules $rules
     $remoteDesktopSubnet = Set-SubnetNetworkSecurityGroup -Subnet $remoteDesktopSubnet -NetworkSecurityGroup $guacamoleNsg
 } elseif ($config.sre.remoteDesktop.provider -eq "MicrosoftRDS") {
-    Add-LogMessage -Level Warning "Support for Microsoft RDS is deprecated and will be removed in release v4.1.0"
     # Ensure that gateway NSG exists with correct rules
     $gatewayNsg = Deploy-NetworkSecurityGroup -Name $config.sre.remoteDesktop.gateway.nsg.name -ResourceGroupName $config.sre.network.vnet.rg -Location $config.sre.location
     $rules = Get-JsonFromMustacheTemplate -TemplatePath (Join-Path $PSScriptRoot ".." "network_rules" $config.sre.remoteDesktop.gateway.nsg.rules) -Parameters $config -AsHashtable