Add fix for special characters when converting to JSON in old powershell

EwanNoble · EwanNoble · commit 8333d925d4d4 · 2019-10-21T15:05:42.000+01:00
diff --git a/tasks/EnvironmentConfiguration/task/Invoke-Task.ps1 b/tasks/EnvironmentConfiguration/task/Invoke-Task.ps1
@@ -6,6 +6,21 @@ try {
     Import-Module -Name $PSScriptRoot/InitializationHelpers.psm1 -Force
     Initialize-TaskDependencies
 
+    $AzAccountsModule = @(Get-Module Az.Accounts -ListAvailable)[0]
+    $AzureRmProfileModule = @(Get-Module AzureRm.Profile -ListAvailable)[0]
+    if ($AzAccountsModule) {
+        Enable-AzureRmAlias -Scope Process
+        $Global:IsAz = $true
+        Write-Host "Using Az Module"
+    }
+    elseif ($AzureRmProfileModule) {
+        $Global:IsAzureRm = $true
+        Write-Host "Using AzureRm Module"
+    }
+    else {
+        throw "No Azure powershell module found"
+    }
+
     if ($ENV:TF_BUILD) {
 
         # --- Inputs
@@ -25,20 +40,14 @@ try {
         # --- Init
         $Endpoint = Get-VstsEndpoint -Name $ServiceEndpointName -Require
 
-        $AzAccountsModule = @(Get-Module Az.Accounts -ListAvailable)[0]
-        $AzureRmProfileModule = @(Get-Module AzureRm.Profile -ListAvailable)[0]
-
-        if ($AzAccountsModule) {
+        if ($Global:IsAz) {
             Initialize-AzModule -Endpoint $Endpoint
-            Enable-AzureRmAlias -Scope Process
-            $Global:IsAz = $true
         }
-        elseif ($AzureRmProfileModule) {
+        elseif ($Global:IsAzureRm) {
             Initialize-AzureRMModule -Endpoint $Endpoint
-            $Global:IsAzureRm = $true
         }
         else {
-            throw "No Azure powershell module found"
+            throw "Couldn't find Global Azure module setting $($MyInvocation.ScriptLineNumber) $($MyInvocation.ScriptName)"
         }
     }
 
diff --git a/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/configuration/Build-ConfigurationEntity.ps1 b/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/configuration/Build-ConfigurationEntity.ps1
@@ -21,6 +21,13 @@ function Build-ConfigurationEntity {
         $Schema = Expand-Schema -PropertyObject $SchemaObject.Properties
         $Configuration = ($Schema | ConvertTo-Json -Depth 10 -Compress)
 
+        if ($PSVersionTable.PSVersion.Major -lt 6) {
+            $Configuration = [Regex]::Replace($Configuration,
+                "\\u(?<Value>[a-zA-Z0-9]{4})", {
+                    param($m) ([char]([int]::Parse($m.Groups['Value'].Value,
+                                [System.Globalization.NumberStyles]::HexNumber))).ToString() } )
+        }
+
         Write-Output $Configuration
     }
     catch {
diff --git a/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/storage/Get-TableEntity.ps1 b/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/storage/Get-TableEntity.ps1
@@ -19,7 +19,9 @@ function Get-TableEntity {
         }
         elseif ($Global:IsAzureRm) {
             $TableOperation = [Microsoft.WindowsAzure.Storage.Table.TableOperation]::Retrieve($PartitionKey, $RowKey)
-
+        }
+        else {
+            throw "Couldn't find Global Azure module setting $($MyInvocation.ScriptLineNumber) $($MyInvocation.ScriptName)"
         }
         $Entity = $StorageTable.CloudTable.Execute($TableOperation, $null, $null)
 
diff --git a/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/storage/New-TableEntity.ps1 b/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/storage/New-TableEntity.ps1
@@ -14,19 +14,17 @@ function New-TableEntity {
 
         if ($Global:IsAz) {
             $Entity = [Microsoft.Azure.Cosmos.Table.DynamicTableEntity]::new($PartitionKey, $RowKey)
-        }
-        elseif ($Global:IsAzureRm) {
-            $Entity = New-Object -TypeName Microsoft.WindowsAzure.Storage.Table.DynamicTableEntity -ArgumentList $PartitionKey, $RowKey
-        }
-
-        $Entity.Properties.Add("Data", $Configuration)
-        if ($Global:IsAz) {
+            $Entity.Properties.Add("Data", $Configuration)
             $null = $StorageTable.CloudTable.Execute([Microsoft.Azure.Cosmos.Table.TableOperation]::Insert($Entity))
         }
         elseif ($Global:IsAzureRm) {
+            $Entity = [Microsoft.WindowsAzure.Storage.Table.DynamicTableEntity]::new($PartitionKey, $RowKey)
+            $Entity.Properties.Add("Data", $Configuration)
             $null = $StorageTable.CloudTable.Execute([Microsoft.WindowsAzure.Storage.Table.TableOperation]::Insert($Entity))
         }
-
+        else {
+            throw "Couldn't find Global Azure module setting $($MyInvocation.ScriptLineNumber) $($MyInvocation.ScriptName)"
+        }
     }
     catch {
         Write-Error -Message "$_" -ErrorAction Stop
diff --git a/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/storage/Set-TableEntity.ps1 b/tasks/EnvironmentConfiguration/task/ps_modules/Handlers/private/storage/Set-TableEntity.ps1
@@ -16,6 +16,9 @@ function Set-TableEntity {
         elseif ($Global:IsAzureRm) {
             $null = $StorageTable.CloudTable.Execute([Microsoft.WindowsAzure.Storage.Table.TableOperation]::InsertOrReplace($Entity))
         }
+        else {
+            throw "Couldn't find Global Azure module setting $($MyInvocation.ScriptLineNumber) $($MyInvocation.ScriptName)"
+        }
 
     }
     catch {
diff --git a/tasks/EnvironmentConfiguration/tests/Start-MockTaskRunner.ps1 b/tasks/EnvironmentConfiguration/tests/Start-MockTaskRunner.ps1
@@ -1,22 +1,30 @@
-$ENV:SYSTEM_CULTURE = "en_US"
-$VerbosePreference = "Continue"
-$Debugpreference = "Continue"
+$TestRunner = Start-Job -ScriptBlock {
+    $ENV:SYSTEM_CULTURE = "en_US"
+    $VerbosePreference = "Continue"
+    $Debugpreference = "Continue"
 
-Import-Module -Name $PSScriptRoot/../task/ps_modules/VstsTaskSdk -Force
-Import-Module -Name $PSScriptRoot/modules/UnitTest.Helpers.psm1 -Force
-Import-Module -Name $PSScriptRoot/../task/InitializationHelpers.psm1 -Force
+    Import-Module -Name $using:PSScriptRoot/../task/ps_modules/VstsTaskSdk -Force
+    Import-Module -Name $using:PSScriptRoot/modules/UnitTest.Helpers.psm1 -Force
+    Import-Module -Name $using:PSScriptRoot/../task/InitializationHelpers.psm1 -Force
 
-try {
-    Set-MockEnvironment
+    try {
+        Set-MockEnvironment
 
-    $SourcePath = "$PSScriptRoot/resource"
-    $TargetFilename = "*.schema.json"
-    $TableName = "configuration"
-    $StorageAccount = "helloitscraigstr"
-    $EnvironmentName = "dev"
-    . $PSScriptRoot/../task/Invoke-Task.ps1
+        $SourcePath = "$using:PSScriptRoot/resource"
+        $TargetFilename = "*.schema.json"
+        $TableName = "configuration"
+        $StorageAccount = "testconversion41"
+        $EnvironmentName = "dev"
+        . $using:PSScriptRoot/../task/Invoke-Task.ps1
 
+    }
+    finally {
+        Clear-MockEnvironment
+    }
 }
-finally {
-    Clear-MockEnvironment
-}
+# Wait for default input
+Wait-Job $TestRunner
+Receive-Job $TestRunner
+
+Wait-Job $TestRunner
+Receive-Job $TestRunner
diff --git a/tasks/EnvironmentConfiguration/tests/modules/UnitTest.Helpers.psm1 b/tasks/EnvironmentConfiguration/tests/modules/UnitTest.Helpers.psm1
@@ -18,7 +18,7 @@ function Set-MockEnvironment {
     $ENV:PaymentsObjectArray = @"
     [{"Enabled": true, "aString": "string"}]
 "@
-
+    $ENV:GoogleHeaderUrl = "'https://www.googletagmanager.com/gtm.js?id='wrappedinquotes'&gtm_auth=someauth&gtm_preview=env-7&gtm_cookies_win=x'"
 }
 
 function Clear-MockEnvironment {
@@ -34,7 +34,8 @@ function Clear-MockEnvironment {
         "ENV:PaymentsEnabled",
         "ENV:PaymentsInt",
         "ENV:PaymentsNumber",
-        "ENV:PaymentsArray"
+        "ENV:PaymentsArray",
+        "ENV:GoogleHeaderUrl"
     )
 }
 
diff --git a/tasks/EnvironmentConfiguration/tests/resource/SFA.DAS.Test.Valid.json b/tasks/EnvironmentConfiguration/tests/resource/SFA.DAS.Test.Valid.json
@@ -17,5 +17,6 @@
       "Enabled": true,
       "aString": "string"
     }
-  ]
+  ],
+  "GoogleHeaderUrl": "'https://www.googletagmanager.com/gtm.js?id='wrappedinquotes'&gtm_auth=someauth&gtm_preview=env-7&gtm_cookies_win=x'"
 }
diff --git a/tasks/EnvironmentConfiguration/tests/resource/SFA.DAS.Test.schema.json b/tasks/EnvironmentConfiguration/tests/resource/SFA.DAS.Test.schema.json
@@ -75,6 +75,10 @@
       },
       "minItems": 0,
       "environmentVariable": "PaymentsObjectArray"
+    },
+    "GoogleHeaderUrl": {
+      "type": "string",
+      "environmentVariable": "GoogleHeaderUrl"
     }
   },
   "additionalProperties": false,

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ function Get-TableEntity {`
`19`	`19`	`}`
`20`	`20`	`elseif ($Global:IsAzureRm) {`
`21`	`21`	`$TableOperation = [Microsoft.WindowsAzure.Storage.Table.TableOperation]::Retrieve($PartitionKey, $RowKey)`
`22`		`-`
	`22`	`+ }`
	`23`	`+ else {`
	`24`	`+ throw "Couldn't find Global Azure module setting $($MyInvocation.ScriptLineNumber) $($MyInvocation.ScriptName)"`
`23`	`25`	`}`
`24`	`26`	`$Entity = $StorageTable.CloudTable.Execute($TableOperation, $null, $null)`
`25`	`27`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ function Set-TableEntity {`
`16`	`16`	`elseif ($Global:IsAzureRm) {`
`17`	`17`	`$null = $StorageTable.CloudTable.Execute([Microsoft.WindowsAzure.Storage.Table.TableOperation]::InsertOrReplace($Entity))`
`18`	`18`	`}`
	`19`	`+ else {`
	`20`	`+ throw "Couldn't find Global Azure module setting $($MyInvocation.ScriptLineNumber) $($MyInvocation.ScriptName)"`
	`21`	`+ }`
`19`	`22`
`20`	`23`	`}`
`21`	`24`	`catch {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ function Set-MockEnvironment {`
`18`	`18`	`$ENV:PaymentsObjectArray = @"`
`19`	`19`	`[{"Enabled": true, "aString": "string"}]`
`20`	`20`	`"@`
`21`		`-`
	`21`	`+ $ENV:GoogleHeaderUrl = "'https://www.googletagmanager.com/gtm.js?id='wrappedinquotes'&gtm_auth=someauth&gtm_preview=env-7&gtm_cookies_win=x'"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`function Clear-MockEnvironment {`
`@@ -34,7 +34,8 @@ function Clear-MockEnvironment {`
`34`	`34`	`"ENV:PaymentsEnabled",`
`35`	`35`	`"ENV:PaymentsInt",`
`36`	`36`	`"ENV:PaymentsNumber",`
`37`		`- "ENV:PaymentsArray"`
	`37`	`+ "ENV:PaymentsArray",`
	`38`	`+ "ENV:GoogleHeaderUrl"`
`38`	`39`	`)`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@`
`17`	`17`	`"Enabled": true,`
`18`	`18`	`"aString": "string"`
`19`	`19`	`}`
`20`		`- ]`
	`20`	`+ ],`
	`21`	`+ "GoogleHeaderUrl": "'https://www.googletagmanager.com/gtm.js?id='wrappedinquotes'&gtm_auth=someauth&gtm_preview=env-7&gtm_cookies_win=x'"`
`21`	`22`	`}`