Merge pull request #87 from sqlcollaborative/feature/fix-absolute

nvarscar · web-flow · commit 9eee49a3a329 · 2019-10-19T17:30:28.000-07:00
Fixing absolute path in package deployments
diff --git a/internal/classes/DBOps.class.ps1 b/internal/classes/DBOps.class.ps1
@@ -358,7 +358,7 @@ class DBOpsPackageBase : DBOps {
         return $false
     }
     [string] ExportToJson() {
-        $exportObject = @{} | Select-Object -Property $this.PropertiesToExport
+        $exportObject = @{ } | Select-Object -Property $this.PropertiesToExport
         foreach ($type in $exportObject.psobject.Properties.name) {
             $property = $this.PsObject.Properties | Where-Object Name -eq $type
             if ($this.$type -is [DBOps]) {
@@ -1005,7 +1005,13 @@ class DBOpsFile : DBOps {
         return $dPath.Replace('/', '\')
     }
     [string] ExportToJson() {
-        return $this | Select-Object -Property $this.PropertiesToExport | ConvertTo-Json -Depth 1
+        $expObject = @{ } | Select-Object -Property $this.PropertiesToExport
+        foreach ($prop in $this.PropertiesToExport) {
+            $expObject.$prop = $this.$prop
+        }
+        # replace symbols in PackagePath
+        $expObject.PackagePath = $this.PackagePath -replace ':', ''
+        return $expObject | ConvertTo-Json -Depth 1
     }
     #Writes current script into the archive file
     [void] Save([ZipArchive]$zipFile) {
@@ -1138,7 +1144,7 @@ class DBOpsConfig : DBOps {
 
     #Methods
     [hashtable] AsHashtable () {
-        $ht = @{}
+        $ht = @{ }
         foreach ($property in $this.psobject.Properties.Name) {
             $ht += @{ $property = $this.$property }
         }
@@ -1175,7 +1181,7 @@ class DBOpsConfig : DBOps {
     }
     # Returns a JSON string representin the object
     [string] ExportToJson() {
-        $outObject = @{}
+        $outObject = @{ }
         foreach ($prop in [DBOpsConfig]::EnumProperties()) {
             if ($this.$prop -is [securestring]) {
                 $outObject += @{ $prop = $this.$prop | ConvertTo-EncryptedString }
@@ -1188,7 +1194,8 @@ class DBOpsConfig : DBOps {
                     }
                 }
             }
-            else { $outObject += @{ $prop = $this.$prop }
+            else {
+                $outObject += @{ $prop = $this.$prop }
             }
         }
         return $outObject | ConvertTo-Json -Depth 3
@@ -1251,7 +1258,7 @@ class DBOpsConfig : DBOps {
         foreach ($key in $config.Keys) {
             if ($key -eq 'Variables') {
                 # create new hashtable with all the existing variables
-                $hashVar = @{}
+                $hashVar = @{ }
                 foreach ($variable in $this.Variables.psobject.Properties.Name) {
                     $hashVar += @{
                         $variable = $this.Variables.$variable
@@ -1304,6 +1311,6 @@ class DBOpsConfig : DBOps {
 
     #Returns deploy file name
     static [object]GetDeployFile() {
-        return (Get-DBOModuleFileList | Where-Object { $_.Type -eq 'Misc' -and $_.Name -eq "Deploy.ps1"})
+        return (Get-DBOModuleFileList | Where-Object { $_.Type -eq 'Misc' -and $_.Name -eq "Deploy.ps1" })
     }
 }
diff --git a/tests/DBOpsBuild.class.Tests.ps1 b/tests/DBOpsBuild.class.Tests.ps1
@@ -61,6 +61,7 @@ Describe "DBOpsBuild class tests" -Tag $commandName, UnitTests, DBOpsBuild {
         }
         BeforeEach {
             $pkg = [DBOpsPackage]::new()
+            $pkg.Slim = $true
             $pkg.SaveToFile($packageName, $true)
             $build = $pkg.NewBuild('1.0')
         }
@@ -89,6 +90,7 @@ Describe "DBOpsBuild class tests" -Tag $commandName, UnitTests, DBOpsBuild {
     Context "tests other methods" {
         BeforeEach {
             $pkg = [DBOpsPackage]::new()
+            $pkg.Slim = $true
             $build = $pkg.NewBuild('1.0')
             $f = [DBOpsFile]::new($fileObject1, $scriptPath1, $true)
             $build.AddScript($f)
@@ -256,7 +258,7 @@ Describe "DBOpsBuild class tests" -Tag $commandName, UnitTests, DBOpsBuild {
         $testResults = Get-ArchiveItem "$packageName.test.zip"
         $saveTestsErrors = 0
         #should trigger file updates for build files and module files
-        foreach ($testResult in ($oldResults | Where-Object { $_.Path -like (Join-PSFPath -Normalize 'content\1.0\success\*') -or $_.Path -like (Join-PSFPath -Normalize 'Modules\dbops\*')  } )) {
+        foreach ($testResult in ($oldResults | Where-Object { $_.Path -like (Join-PSFPath -Normalize 'content\1.0\success\*') -or $_.Path -like (Join-PSFPath -Normalize 'Modules\dbops\*') } )) {
             if ($testResult.LastWriteTime -ge ($testResults | Where-Object Path -eq $testResult.Path).LastWriteTime) {
                 It "Should have updated Modified date for file $($testResult.Path)" {
                     $testResult.LastWriteTime -lt ($testResults | Where-Object Path -eq $testResult.Path).LastWriteTime | Should Be $true
diff --git a/tests/Install-DBOPackage.Tests.ps1 b/tests/Install-DBOPackage.Tests.ps1
@@ -592,7 +592,7 @@ Describe "Install-DBOPackage integration tests" -Tag $commandName, IntegrationTe
     }
     Context "testing deployment using variables in config" {
         BeforeAll {
-            $p1 = New-DBOPackage -ScriptPath $v1scripts -Name "$workFolder\pv1" -Build 1.0 -Force -Configuration @{SqlInstance = '#{srv}'; Database = '#{db}'}
+            $p1 = New-DBOPackage -ScriptPath $v1scripts -Name "$workFolder\pv1" -Build 1.0 -Force -Configuration @{SqlInstance = '#{srv}'; Database = '#{db}' }
             $outputFile = "$workFolder\log.txt"
             $null = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $cleanupScript
         }
@@ -602,7 +602,7 @@ Describe "Install-DBOPackage integration tests" -Tag $commandName, IntegrationTe
         It "should deploy version 1.0" {
             $before = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $verificationScript
             $rowsBefore = ($before | Measure-Object).Count
-            $testResults = Install-DBOPackage "$workFolder\pv1.zip" -Credential $script:mssqlCredential -Variables @{srv = $script:mssqlInstance; db = $newDbName} -SchemaVersionTable $logTable -OutputFile "$workFolder\log.txt" -Silent
+            $testResults = Install-DBOPackage "$workFolder\pv1.zip" -Credential $script:mssqlCredential -Variables @{srv = $script:mssqlInstance; db = $newDbName } -SchemaVersionTable $logTable -OutputFile "$workFolder\log.txt" -Silent
             $testResults.Successful | Should Be $true
             $testResults.Scripts.Name | Should Be $v1Journal
             $testResults.SqlInstance | Should Be $script:mssqlInstance
@@ -666,4 +666,42 @@ Describe "Install-DBOPackage integration tests" -Tag $commandName, IntegrationTe
             'd' | Should Not BeIn $testResults.name
         }
     }
+    Context "testing deployment from a package with an absolute path" {
+        BeforeAll {
+            $p1 = New-DBOPackage -ScriptPath $v1scripts -Name "$workFolder\pv1" -Build 1.0 -Force -Absolute
+            $outputFile = "$workFolder\log.txt"
+            $null = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $cleanupScript
+        }
+        AfterAll {
+            $null = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -Query "IF OBJECT_ID('SchemaVersions') IS NOT NULL DROP TABLE SchemaVersions"
+        }
+        It "should deploy version 1.0" {
+            $before = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $verificationScript
+            $rowsBefore = ($before | Measure-Object).Count
+            $testResults = Install-DBOPackage "$workFolder\pv1.zip" -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -Database $newDbName -Silent
+            $testResults.Successful | Should Be $true
+            $absolutePath = Get-Item $v1scripts | ForEach-Object { Join-PSFPath 1.0 ($_.FullName -replace '^/|^\\|^\\\\|\.\\|\./|:', "") }
+            $testResults.Scripts.Name | Should BeIn $absolutePath
+            $testResults.SqlInstance | Should Be $script:mssqlInstance
+            $testResults.Database | Should Be $newDbName
+            $testResults.SourcePath | Should Be (Join-PSFPath -Normalize "$workFolder\pv1.zip")
+            $testResults.ConnectionType | Should Be 'SQLServer'
+            $testResults.Configuration.SchemaVersionTable | Should Be 'SchemaVersions'
+            $testResults.Error | Should BeNullOrEmpty
+            $testResults.Duration.TotalMilliseconds | Should -BeGreaterOrEqual 0
+            $testResults.StartTime | Should Not BeNullOrEmpty
+            $testResults.EndTime | Should Not BeNullOrEmpty
+            $testResults.EndTime | Should -BeGreaterOrEqual $testResults.StartTime
+            'Upgrade successful' | Should BeIn $testResults.DeploymentLog
+
+            #Verifying objects
+            $testResults = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $verificationScript
+            'SchemaVersions' | Should BeIn $testResults.name
+            'a' | Should BeIn $testResults.name
+            'b' | Should BeIn $testResults.name
+            'c' | Should Not BeIn $testResults.name
+            'd' | Should Not BeIn $testResults.name
+            ($testResults | Measure-Object).Count | Should Be ($rowsBefore + 3)
+        }
+    }
 }
diff --git a/tests/Install-DBOSqlScript.Tests.ps1 b/tests/Install-DBOSqlScript.Tests.ps1
@@ -123,9 +123,9 @@ Describe "Install-DBOSqlScript integration tests" -Tag $commandName, Integration
             $null = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $cleanupScript
         }
         It "should deploy version 1.0" {
-            $testResults = Install-DBOSqlScript -Absolute -ScriptPath $v1scripts -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -Database $newDbName -SchemaVersionTable $logTable -Silent
+            $testResults = Install-DBOSqlScript -ScriptPath $v1scripts -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -Database $newDbName -SchemaVersionTable $logTable -Silent
             $testResults.Successful | Should Be $true
-            $testResults.Scripts.Name | Should Be (Resolve-Path $v1scripts).Path
+            $testResults.Scripts.Name | Should Be (Get-Item $v1scripts).Name
             $testResults.SqlInstance | Should Be $script:mssqlInstance
             $testResults.Database | Should Be $newDbName
             $testResults.SourcePath | Should Be $v1scripts
@@ -147,9 +147,9 @@ Describe "Install-DBOSqlScript integration tests" -Tag $commandName, Integration
             'd' | Should Not BeIn $testResults.name
         }
         It "should deploy version 2.0" {
-            $testResults = Install-DBOSqlScript -Absolute -ScriptPath $v2scripts -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -Database $newDbName -SchemaVersionTable $logTable -Silent
+            $testResults = Install-DBOSqlScript -ScriptPath $v2scripts -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -Database $newDbName -SchemaVersionTable $logTable -Silent
             $testResults.Successful | Should Be $true
-            $testResults.Scripts.Name | Should Be (Resolve-Path $v2scripts).Path
+            $testResults.Scripts.Name | Should Be (Get-Item $v2scripts).Name
             $testResults.SqlInstance | Should Be $script:mssqlInstance
             $testResults.Database | Should Be $newDbName
             $testResults.SourcePath | Should Be $v2scripts
diff --git a/tests/New-DBOPackage.Tests.ps1 b/tests/New-DBOPackage.Tests.ps1
@@ -81,6 +81,12 @@ Describe "New-DBOPackage tests" -Tag $commandName, UnitTests {
             $testResults.ModuleVersion | Should Be (Get-Module dbops).Version
             Test-Path $packageName | Should Be $true
         }
+        It "should create proper package with abolute path" {
+            $p = New-DBOPackage -Path $packageName -ScriptPath "$here\etc\query1.sql" -Force -Absolute -Build 1;
+            $testResults = Get-ArchiveItem $p
+            $path = $here.Replace(':', '') -replace '^/', ''
+            Join-PSFPath content\1 $path etc\query1.sql -Normalize | Should -BeIn $testResults.Path
+        }
     }
     Context "current folder tests" {
         BeforeAll {
@@ -190,7 +196,7 @@ Describe "New-DBOPackage tests" -Tag $commandName, UnitTests {
             $config.Variables | Should Be $null
         }
         It "should be able to store variables" {
-            $null = New-DBOPackage -ScriptPath "$here\etc\query1.sql" -Name $packageName -Configuration @{ ApplicationName = 'FooBar' } -Variables @{ MyVar = 'foo'; MyBar = 1; MyNull = $null} -Force
+            $null = New-DBOPackage -ScriptPath "$here\etc\query1.sql" -Name $packageName -Configuration @{ ApplicationName = 'FooBar' } -Variables @{ MyVar = 'foo'; MyBar = 1; MyNull = $null } -Force
             $null = Expand-ArchiveItem -Path $packageName -DestinationPath $workFolder -Item 'dbops.config.json'
             $config = Get-Content "$workFolder\dbops.config.json" | ConvertFrom-Json
             $config.ApplicationName | Should Be 'FooBar'

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ class DBOpsPackageBase : DBOps {`
`358`	`358`	`return $false`
`359`	`359`	`}`
`360`	`360`	`[string] ExportToJson() {`
`361`		`- $exportObject = @{} \| Select-Object -Property $this.PropertiesToExport`
	`361`	`+ $exportObject = @{ } \| Select-Object -Property $this.PropertiesToExport`
`362`	`362`	`foreach ($type in $exportObject.psobject.Properties.name) {`
`363`	`363`	`$property = $this.PsObject.Properties \| Where-Object Name -eq $type`
`364`	`364`	`if ($this.$type -is [DBOps]) {`
`@@ -1005,7 +1005,13 @@ class DBOpsFile : DBOps {`
`1005`	`1005`	`return $dPath.Replace('/', '\')`
`1006`	`1006`	`}`
`1007`	`1007`	`[string] ExportToJson() {`
`1008`		`- return $this \| Select-Object -Property $this.PropertiesToExport \| ConvertTo-Json -Depth 1`
	`1008`	`+ $expObject = @{ } \| Select-Object -Property $this.PropertiesToExport`
	`1009`	`+ foreach ($prop in $this.PropertiesToExport) {`
	`1010`	`+ $expObject.$prop = $this.$prop`
	`1011`	`+ }`
	`1012`	`+ # replace symbols in PackagePath`
	`1013`	`+ $expObject.PackagePath = $this.PackagePath -replace ':', ''`
	`1014`	`+ return $expObject \| ConvertTo-Json -Depth 1`
`1009`	`1015`	`}`
`1010`	`1016`	`#Writes current script into the archive file`
`1011`	`1017`	`[void] Save([ZipArchive]$zipFile) {`
`@@ -1138,7 +1144,7 @@ class DBOpsConfig : DBOps {`
`1138`	`1144`
`1139`	`1145`	`#Methods`
`1140`	`1146`	`[hashtable] AsHashtable () {`
`1141`		`- $ht = @{}`
	`1147`	`+ $ht = @{ }`
`1142`	`1148`	`foreach ($property in $this.psobject.Properties.Name) {`
`1143`	`1149`	`$ht += @{ $property = $this.$property }`
`1144`	`1150`	`}`
`@@ -1175,7 +1181,7 @@ class DBOpsConfig : DBOps {`
`1175`	`1181`	`}`
`1176`	`1182`	`# Returns a JSON string representin the object`
`1177`	`1183`	`[string] ExportToJson() {`
`1178`		`- $outObject = @{}`
	`1184`	`+ $outObject = @{ }`
`1179`	`1185`	`foreach ($prop in [DBOpsConfig]::EnumProperties()) {`
`1180`	`1186`	`if ($this.$prop -is [securestring]) {`
`1181`	`1187`	`$outObject += @{ $prop = $this.$prop \| ConvertTo-EncryptedString }`
`@@ -1188,7 +1194,8 @@ class DBOpsConfig : DBOps {`
`1188`	`1194`	`}`
`1189`	`1195`	`}`
`1190`	`1196`	`}`
`1191`		`- else { $outObject += @{ $prop = $this.$prop }`
	`1197`	`+ else {`
	`1198`	`+ $outObject += @{ $prop = $this.$prop }`
`1192`	`1199`	`}`
`1193`	`1200`	`}`
`1194`	`1201`	`return $outObject \| ConvertTo-Json -Depth 3`
`@@ -1251,7 +1258,7 @@ class DBOpsConfig : DBOps {`
`1251`	`1258`	`foreach ($key in $config.Keys) {`
`1252`	`1259`	`if ($key -eq 'Variables') {`
`1253`	`1260`	`# create new hashtable with all the existing variables`
`1254`		`- $hashVar = @{}`
	`1261`	`+ $hashVar = @{ }`
`1255`	`1262`	`foreach ($variable in $this.Variables.psobject.Properties.Name) {`
`1256`	`1263`	`$hashVar += @{`
`1257`	`1264`	`$variable = $this.Variables.$variable`
`@@ -1304,6 +1311,6 @@ class DBOpsConfig : DBOps {`
`1304`	`1311`
`1305`	`1312`	`#Returns deploy file name`
`1306`	`1313`	`static [object]GetDeployFile() {`
`1307`		`- return (Get-DBOModuleFileList \| Where-Object { $_.Type -eq 'Misc' -and $_.Name -eq "Deploy.ps1"})`
	`1314`	`+ return (Get-DBOModuleFileList \| Where-Object { $_.Type -eq 'Misc' -and $_.Name -eq "Deploy.ps1" })`
`1308`	`1315`	`}`
`1309`	`1316`	`}`