Merge 'origin/development' into feature/pester-5

Author: nvarscar

build/bump_version.ps1

@@ -1,8 +1,8 @@
 Param (
     $Path = '.\dbops.psd1'
 )
-git config --global user.email $env:git_user_email
-git config --global user.name $env:git_username
+git config --global user.email $env:GIT_USER_EMAIL
+git config --global user.name $env:GIT_USERNAME
 $moduleFile = Invoke-Command -ScriptBlock ([scriptblock]::Create((Get-Content $Path -Raw)))
 $version = [Version]$moduleFile.ModuleVersion
 $regEx = "^([\s]*ModuleVersion[\s]*\=[\s]*)\'(" + [regex]::Escape($version) + ")\'[\s]*`$"

dbops.psd1

@@ -4,7 +4,7 @@
     RootModule             = '.\dbops.psm1'
 
     # Version number of this module.
-    ModuleVersion          = '0.7.1'
+    ModuleVersion          = '0.8.1'
 
     # ID used to uniquely identify this module
     GUID                   = '16dff216-533a-4fa3-9b2e-4408dbe15e63'

dbops.psm1

@@ -123,6 +123,25 @@ Register-PSFConfigValidation -Name "connectionType" -ScriptBlock {
     return $Result
 }
 
+Register-PSFConfigValidation -Name "errorAction" -ScriptBlock {
+    Param (
+        $Value
+    )
+    $Result = New-Object PSObject -Property @{
+        Success = $True
+        Value   = $null
+        Message = ""
+    }
+    try {
+        $Result.Value = [String][System.Management.Automation.ActionPreference]$Value
+    }
+    catch {
+        $Result.Message = $_.Exception.Message
+        $Result.Success = $False
+    }
+    return $Result
+}
+
 Register-PSFConfigValidation -Name "tokenRegex" -ScriptBlock {
     Param (
         $Value
@@ -180,8 +199,12 @@ Set-PSFConfig -FullName dbops.security.usecustomencryptionkey -Value ($PSVersion
 Set-PSFConfig -FullName dbops.rdbms.type -Value 'SqlServer' -Validation connectionType -Initialize -Description "Assumes a certain RDBMS as a default one for each command. SQLServer by default"
 Set-PSFConfig -FullName dbops.package.slim -Value $false -Validation bool -Initialize -Description "Decides whether to make the packages 'slim' and omit module files when creating the package. Default: `$false"
 Set-PSFConfig -FullName dbops.config.variabletoken -Value "\#\{(token)\}" -Validation tokenRegex -Initialize -Description "Variable replacement token. Regex string that will be replaced with values from -Variables parameters. Default: \#\{(token)\}"
-$dotNet = try { dotnet --version } catch { $null }
+$dotNet = try { & { dotnet --version } } catch { $null }
 Set-PSFConfig -FullName dbops.runtime.dotnetversion -Value ($dotNet -as [version]) -Description "Current dotnet runtime." -Hidden
+Set-PSFConfig -FullName dbops.ErrorActionPreference -Value Stop -Initialize -Description "Module ErrorAction default value" -Validation errorAction
+
+# Module-wide ErrorAction preference
+$ErrorActionPreference = Get-PSFConfigValue -FullName dbops.ErrorActionPreference
 
 # extensions for SMO
 $typeData = Get-TypeData -TypeName 'Microsoft.SqlServer.Management.Smo.Database'
@@ -220,4 +243,4 @@ $aliases = @(
 )
 $aliases | ForEach-Object {
     if (-not (Test-Path Alias:$($_.AliasName))) { Set-Alias -Scope Global -Name $($_.AliasName) -Value $($_.Definition) }
-}
+}

docs/changelog.md

@@ -1,3 +1,9 @@
+# Release notes for v0.8.1:
+- ### Wrapper around dotnet call to filter output (#148) by @nvarscar
+# Release notes for v0.8.0:
+- ### Hotfix: Nuget downloads now use lowercase filename in the URL (#139) by @nvarscar
+- ### Feature: Allow ErrorAction to properly handle errors (#140) by @nvarscar
+- ### Setting default encoding to UTF8 (#142) by @nvarscar
 # Release notes for v0.7.1:
 - ### Adding support for underscore char in tokens (#130) by @nvarscar
 # Release notes for v0.7.0:

functions/Invoke-DBOQuery.ps1

@@ -435,7 +435,7 @@ function Invoke-DBOQuery {
         }
         catch {
             # don't really need anything else here
-            throw $_
+            Write-Error $_
         }
         finally {
             # close the connection even when interrupted by Ctrl+C

internal/classes/DBOpsDeploymentStatus.class.ps1

@@ -10,6 +10,7 @@ class DBOpsDeploymentStatus {
     [System.Nullable[datetime]] $StartTime
     [System.Nullable[datetime]] $EndTime
     [string[]] $DeploymentLog
+    [string] $ErrorScript
 
     DBOpsDeploymentStatus() {
         Add-Member -InputObject $this -MemberType ScriptProperty -Name Duration -Value {

internal/classes/DBOpsHelper.class.ps1

@@ -137,12 +137,12 @@ class DBOpsHelper {
             $encoding = [System.Text.Encoding]::UTF7
         }
         else {
-            $encoding = [System.Text.Encoding]::ASCII
+            $encoding = [System.Text.Encoding]::UTF8
         }
         return $encoding.GetString($Array, $skipBytes, $Array.Length - $skipBytes)
     }
     # scrubs nulls from the datatable
-    static [PSObject] DataRowToPSObject([DataRow] $row){
+    static [PSObject] DataRowToPSObject([DataRow] $row) {
         $psObject = [PSObject]::new()
         if ($null -ne $row -and $row.RowState -and $row.RowState -ne [DataRowState]::Detached) {
             foreach ($column in $row.Table.Columns) {

internal/functions/Invoke-Deployment.ps1

@@ -134,6 +134,9 @@
             if (!$Status.Successful) {
                 # Throw output error if unsuccessful
                 if ($Status.Error) {
+                    if ($upgradeResult.errorScript) {
+                        $Status.ErrorScript = $upgradeResult.errorScript.Name
+                    }
                     throw $Status.Error
                 }
                 else {
@@ -349,12 +352,12 @@
                 }
             }
             catch {
-                throw $_
+                Write-Error $_
             }
             finally {
                 $status.EndTime = [datetime]::Now
-                $status
             }
+            return $status
         }
     }
     end { }

internal/xml/dbops.format.ps1xml

@@ -108,6 +108,9 @@
                     <ListItem>
                         <PropertyName>Duration</PropertyName>
                     </ListItem>
+                    <ListItem>
+                        <PropertyName>ErrorScript</PropertyName>
+                    </ListItem>
                 </ListItems>
             </ListEntry>
         </ListEntries>

tests/functional/Install-DBOScript.Tests.ps1

@@ -232,7 +232,7 @@ Describe "<type> Install-DBOScript functional tests" -Tag FunctionalTests -ForEa
         }
     }
     Context "deployments with errors should throw terminating errors" {
-        BeforeAll {
+        BeforeEach {
             Reset-TestDatabase
             $null = Install-DBOScript -ScriptPath (Get-PackageScript -Version 1) @dbConnectionParams -SchemaVersionTable $null
         }
@@ -249,6 +249,22 @@ Describe "<type> Install-DBOScript functional tests" -Tag FunctionalTests -ForEa
             $errorObject | Should -Not -BeNullOrEmpty
             $errorObject.Exception.Message | Should -BeLike (Get-TableExistsMessage "a")
         }
+        It "Should return failure results with SilentlyContinue" {
+            $testResults = Install-DBOScript -Path $tranFailScripts -SchemaVersionTable $logTable -DeploymentMethod NoTransaction @dbConnectionParams -ErrorAction SilentlyContinue
+            $testResults.Successful | Should -Be $false
+            $testResults.SqlInstance | Should -Be $instance
+            $testResults.Database | Should -Be $newDbName
+            $testResults.SourcePath | Should -Be ($tranFailScripts | Split-Path -Leaf)
+            $testResults.ConnectionType | Should -Be $Type
+            $testResults.Configuration.SchemaVersionTable | Should -Be $logTable
+            $testResults.Error.Message | Should -BeLike (Get-TableExistsMessage "a")
+            $testResults.ErrorScript | Should -Be ($tranFailScripts[1] | Split-Path -Leaf)
+            $testResults.Scripts.Name | Should -Be ($tranFailScripts[0] | Split-Path -Leaf)
+            $testResults.Duration.TotalMilliseconds | Should -BeGreaterOrEqual 0
+            $testResults.StartTime | Should -Not -BeNullOrEmpty
+            $testResults.EndTime | Should -Not -BeNullOrEmpty
+            $testResults.EndTime | Should -BeGreaterOrEqual $testResults.StartTime
+        }
         It "should halt after throwing an error" {
             #Running package
             try {