chore: run tests on linux and windows (#233)

* chore: run tests on linux and windows * pr-fix: update with correct multiple var group * pr-fix: update with correct array def * pr-fix: update with correct array def * pr-fix: update with correct array def * pr-fix: update with correct array def * pr-fix: update with strategy in job * pr-fix: update with strategy in job * pr-fix: update with allow glober installing ps modules * pr-fix: update w correct vm image on build * pr-temp: check windows latest * pr-fix: don't use variable in strategy.matrix variable definition * pr-fix: update with `-AllowClobber` on installing dependent ps modules * pr-fix: update with cross-platform support * pr-fix: add integration account maps to integration test project * pr-fix: add sql files to integration test project and prepare for win supoort * pr-prop: runtime variable declaration * pr-fix: update release pipeline with runtime vars * pr-sug: remove try/catch for warming up sql connection * pr-fix: update with correct sql statement
arcus-azure · Nov 30, 2021 · 2b7e716 · 2b7e716
1 parent 01a763e
commit 2b7e716
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 75 deletions.
diff --git a/build/ci-build.yml b/build/ci-build.yml
@@ -40,7 +40,7 @@ stages:
     jobs:
       - job: Compile
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(Vm.Linux.Image)'
         steps:
           - task: qetza.replacetokens.replacetokens-task.replacetokens@3
             displayName: 'Replace package version tokens'
@@ -75,7 +75,7 @@ stages:
       - job: RunUnitTests
         displayName: 'Run unit tests'
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(Vm.Linux.Image)'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download build artifacts'
@@ -93,8 +93,15 @@ stages:
     jobs:
       - job: RunIntegrationTests
         displayName: 'Run integration tests'
+        strategy:
+          maxParallel: 1
+          matrix:
+            linux:
+              imageName: ${{ variables['Vm.Linux.Image']}}
+            windows:
+              imageName: ${{ variables['Vm.Windows.Image']}}
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(imageName)'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download build artifacts'
@@ -115,7 +122,7 @@ stages:
       - job: PushToMyGet
         displayName: 'Push to MyGet'
         pool:
-          vmImage: 'windows-2019'
+          vmImage: '$(Vm.Linux.Image)'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download build artifacts'

diff --git a/build/psgallery-release.yml b/build/psgallery-release.yml
@@ -35,7 +35,7 @@ stages:
     jobs:
       - job: Compile
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(Vm.Linux.Image)'
         steps:
           - task: qetza.replacetokens.replacetokens-task.replacetokens@3
             displayName: 'Replace package version tokens'
@@ -79,7 +79,7 @@ stages:
       - job: RunUnitTests
         displayName: 'Run unit tests'
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(Vm.Linux.Image)'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download build artifacts'
@@ -97,8 +97,15 @@ stages:
     jobs:
       - job: RunIntegrationTests
         displayName: 'Run integration tests'
+        strategy:
+          maxParallel: 1
+          matrix:
+            linux:
+              imageName: ${{ variables['Vm.Linux.Image']}}
+            windows:
+              imageName: ${{ variables['Vm.Windows.Image']}}
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(imageName)'
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: 'Download build artifacts'
@@ -119,7 +126,7 @@ stages:
       - job: PushToNuGet
         displayName: 'Push to PowerShell Gallery'
         pool:
-          vmImage: '$(Vm.Image)'
+          vmImage: '$(Vm.Linux.Image)'
         variables:
           ${{ if ne(variables['Prerelease'], 'none') }}:
             Package.Version: "${{ parameters['Package.Version'] }}${{ parameters['Prerelease'] }}"

diff --git a/build/templates/run-pester-tests.yml b/build/templates/run-pester-tests.yml
@@ -31,8 +31,8 @@ steps:
               $content.RequiredModules |
                   where { $_.ModuleName -ne $null -and $_.ModuleName -notlike 'Arcus.Scripting.*' -and $_.ModuleVersion -ne "#{Package.Version}#" } |
                   % { Write-Host "Install $($_.ModuleName) module $($_.ModuleVersion)"
-                      Install-Module $_.ModuleName -MaximumVersion $_.ModuleVersion -Force -SkipPublisherCheck } }
-      Install-Module -Name Az -Force -SkipPublisherCheck -MaximumVersion 5.6.0
+                      Install-Module $_.ModuleName -MaximumVersion $_.ModuleVersion -AllowClobber -Force -SkipPublisherCheck } }
+      Install-Module -Name Az -Force -AllowClobber -SkipPublisherCheck -MaximumVersion 5.6.0
       Install-Module -Name AzTable -Force -SkipPublisherCheck -MaximumVersion 2.1.0
       Write-Host "Done installing, start importing modules"
     displayName: 'Install Pester test framework and Az required modules'

diff --git a/build/variables/build.yml b/build/variables/build.yml
@@ -1,4 +1,5 @@
 variables:
   DotNet.Sdk.Version: '2.2.105'
   Project: 'Arcus.Scripting'
-  Vm.Image: 'ubuntu-latest'
+  Vm.Linux.Image: 'ubuntu-latest'
+  Vm.Windows.Image: 'windows-latest'
diff --git a/src/Arcus.Scripting.KeyVault/Scripts/Set-AzKeyVaultSecretFromFile.ps1 b/src/Arcus.Scripting.KeyVault/Scripts/Set-AzKeyVaultSecretFromFile.ps1
@@ -17,8 +17,9 @@ Write-Verbose "Creating Azure Key Vault secret from file..."
 $secretValue = $null
 if ($Base64) {
     Write-Verbose "Use BASE64 format as secret format"
-    $content = Get-Content $filePath -AsByteStream -Raw
-    $contentBase64 = [System.Convert]::ToBase64String($content)
+    $content = Get-Content $filePath -Raw
+    $bytes = [System.Text.Encoding]::UTF8.GetBytes($content)
+    $contentBase64 = [System.Convert]::ToBase64String($bytes)
     $secretValue = ConvertTo-SecureString -String $contentBase64 -Force -AsPlainText
 } else {
     $rawContent = Get-Content $FilePath -Raw

diff --git a/src/Arcus.Scripting.Tests.Integration/Arcus.Scripting.IntegrationAccount.tests.ps1 b/src/Arcus.Scripting.Tests.Integration/Arcus.Scripting.IntegrationAccount.tests.ps1
@@ -17,23 +17,18 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = "unexisting-integration-account"
-				$schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
+                $schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
                 $schema = Get-ChildItem($schemaFilePath) -File
 
                 # Act
-                { 
-                    Set-AzIntegrationAccountSchemas -ResourceGroupName $resourceGroupName -Name $integrationAccountName -SchemaFilePath $schema.FullName -ErrorAction Stop
-                } | Should -Throw
-
-                # Assert
-                Assert-VerifiableMock
-                Assert-MockCalled Set-AzKeyVaultSecret -Times 0
+                { Set-AzIntegrationAccountSchemas -ResourceGroupName $resourceGroupName -Name $integrationAccountName -SchemaFilePath $schema.FullName -ErrorAction Stop } | 
+                    Should -Throw
             }
             It "Create a single schema in an Integration Account" {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
+                $schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
                 $schema = Get-ChildItem($schemaFilePath) -File
                 $expectedSchemaName = $schema.Name
                 $executionDateTime = (Get-Date).ToUniversalTime()
@@ -56,7 +51,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
+                $schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
                 $schema = Get-ChildItem($schemaFilePath) -File
                 $expectedSchemaName = $schema.Name
                 $executionDateTime = (Get-Date).ToUniversalTime()
@@ -82,7 +77,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
+                $schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
                 $schema = Get-ChildItem($schemaFilePath) -File
                 $expectedSchemaName = $schema.BaseName
                 $executionDateTime = (Get-Date).ToUniversalTime()
@@ -105,7 +100,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
+                $schemaFilePath = "$PSScriptRoot\Files\IntegrationAccount\Schemas\NestedSchema.xsd"
                 $schema = Get-ChildItem($schemaFilePath) -File
                 $artifactsPrefix = "dev-"
                 $expectedSchemaName = $artifactsPrefix + $schema.BaseName
@@ -129,7 +124,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemasFolder = "$PSScriptRoot\Files\IntegrationAccount\Schemas"
+                $schemasFolder = "$PSScriptRoot\Files\IntegrationAccount\Schemas"
                 $executionDateTime = (Get-Date).ToUniversalTime()
 
                 try {
@@ -158,7 +153,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemasFolder = "$PSScriptRoot\Files\IntegrationAccount\Schemas"
+                $schemasFolder = "$PSScriptRoot\Files\IntegrationAccount\Schemas"
                 $executionDateTime = (Get-Date).ToUniversalTime()
 
                 try {
@@ -187,7 +182,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$schemasFolder = "$PSScriptRoot\Files\IntegrationAccount\Schemas"
+                $schemasFolder = "$PSScriptRoot\Files\IntegrationAccount\Schemas"
                 $artifactsPrefix = "dev-"
                 $executionDateTime = (Get-Date).ToUniversalTime()
 
@@ -219,23 +214,18 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = "unexisting-integration-account"
-				$mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
+                $mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
                 $map = Get-ChildItem($mapFilePath) -File
 
                 # Act
-                { 
-                    Set-AzIntegrationAccountMaps -ResourceGroupName $resourceGroupName -Name $integrationAccountName -MapFilePath $map.FullName -ErrorAction Stop
-                } | Should -Throw
-
-                # Assert
-                Assert-VerifiableMock
-                Assert-MockCalled Set-AzKeyVaultSecret -Times 0
+                { Set-AzIntegrationAccountMaps -ResourceGroupName $resourceGroupName -Name $integrationAccountName -MapFilePath $map.FullName -ErrorAction Stop} |
+                    Should -Throw
             }
             It "Create a single map in an Integration Account" {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
+                $mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
                 $map = Get-ChildItem($mapFilePath) -File
                 $expectedMapName = $map.Name
                 $executionDateTime = (Get-Date).ToUniversalTime()
@@ -258,7 +248,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
+                $mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
                 $map = Get-ChildItem($mapFilePath) -File
                 $expectedMapName = $map.Name
                 $executionDateTime = (Get-Date).ToUniversalTime()
@@ -284,7 +274,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
+                $mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
                 $map = Get-ChildItem($mapFilePath) -File
                 $expectedMapName = $map.BaseName
                 $executionDateTime = (Get-Date).ToUniversalTime()
@@ -307,7 +297,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
+                $mapFilePath = "$PSScriptRoot\Files\IntegrationAccount\Maps\BankTransfer_CSV-to-BankTransfer_Canonical.xslt"
                 $map = Get-ChildItem($mapFilePath) -File
                 $artifactsPrefix = "dev-"
                 $expectedMapName = $artifactsPrefix + $map.BaseName
@@ -331,7 +321,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapsFolder = "$PSScriptRoot\Files\IntegrationAccount\Maps"
+                $mapsFolder = "$PSScriptRoot\Files\IntegrationAccount\Maps"
                 $executionDateTime = (Get-Date).ToUniversalTime()
 
                 try {
@@ -360,7 +350,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapsFolder = "$PSScriptRoot\Files\IntegrationAccount\Maps"
+                $mapsFolder = "$PSScriptRoot\Files\IntegrationAccount\Maps"
                 $executionDateTime = (Get-Date).ToUniversalTime()
 
                 try {
@@ -389,7 +379,7 @@ InModuleScope Arcus.Scripting.IntegrationAccount {
                 # Arrange
                 $resourceGroupName = $config.Arcus.ResourceGroupName
                 $integrationAccountName = $config.Arcus.IntegrationAccount.Name
-				$mapsFolder = "$PSScriptRoot\Files\IntegrationAccount\Maps"
+                $mapsFolder = "$PSScriptRoot\Files\IntegrationAccount\Maps"
                 $artifactsPrefix = "dev-"
                 $executionDateTime = (Get-Date).ToUniversalTime()
 

diff --git a/src/Arcus.Scripting.Tests.Integration/Arcus.Scripting.KeyVault.tests.ps1 b/src/Arcus.Scripting.Tests.Integration/Arcus.Scripting.KeyVault.tests.ps1
@@ -30,20 +30,19 @@ InModuleScope Arcus.Scripting.KeyVault {
                 }
             }
             It "Set secret as BASE64 in Key Vault" {
-                $contents = [System.Guid]::NewGuid().ToString()
-                $file = New-Item -Path "test-base64-file.txt" -ItemType File -Value $contents
+                # Arrange
+                $expected = [System.Guid]::NewGuid().ToString()
+                $file = New-Item -Path "test-base64-file.txt" -ItemType File -Value $expected
+                $secretName = "Arcus-Scripting-KeyVault-MySecret-$([System.Guid]::NewGuid())"
                 try {
-                    # Arrange
-                    $secretName = "Arcus-Scripting-KeyVault-MySecret-$([System.Guid]::NewGuid())"
-
                     # Act
                     Set-AzKeyVaultSecretAsBase64FromFile -KeyVaultName $config.Arcus.KeyVault.VaultName -SecretName $secretName -FilePath $file.FullName
 
                     # Assert
                     $actual = Get-AzKeyVaultSecret -VaultName $config.Arcus.KeyVault.VaultName -Name $secretName -AsPlainText
                     [System.Convert]::FromBase64String($actual) |
                         % { [System.Text.Encoding]::UTF8.GetString($_) } |
-                        Should -Be $contents.ToCharArray()
+                        Should -Be $expected.ToCharArray()
                 } finally {
                     Remove-Item -Path $file.FullName
                     Remove-AzKeyVaultSecret -VaultName $config.Arcus.KeyVault.VaultName -Name $secretName -PassThru -Force
@@ -71,14 +70,13 @@ InModuleScope Arcus.Scripting.KeyVault {
             }
             It "Set secret as BASE64 in Key Vault with expiration date" {
                 # Arrange
-                $contents = [System.Guid]::NewGuid().ToString()
-                $file = New-Item -Path "test-file.txt" -ItemType File -Value $contents
+                $expected = [System.Guid]::NewGuid().ToString()
+                $file = New-Item -Path "test-base64-file.txt" -ItemType File -Value $expected
                 $secretName = "Arcus-Scripting-KeyVault-MySecret-$([System.Guid]::NewGuid())"
                 $expirationDate = (Get-Date).AddDays(7).ToUniversalTime()
                 $expirationDate = $expirationDate.AddTicks(-$expirationDate.Ticks)
 
-                try
-                {
+                try {
                     # Act
                     Set-AzKeyVaultSecretAsBase64FromFile -KeyVaultName $config.Arcus.KeyVault.VaultName -SecretName $secretName -Expires $expirationDate -FilePath $file.FullName
 
@@ -88,7 +86,7 @@ InModuleScope Arcus.Scripting.KeyVault {
                     $actual = Get-AzKeyVaultSecret -VaultName $config.Arcus.KeyVault.VaultName -Name $secretName -AsPlainText
                     [System.Convert]::FromBase64String($actual) |
                         % { [System.Text.Encoding]::UTF8.GetString($_) } |
-                        Should -Be $contents.ToCharArray()
+                        Should -Be $expected.ToCharArray()
 
                 } finally {
                     Remove-Item -Path $file.FullName