Merge pull request #17 from sabinio/bug_fix

bug fix

AssistDeploy.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 <metadata>
 <id>AssistDeploy</id>
-<version>1.4.0.0</version>
+<version>1.4.0.1</version>
 <authors>SabinIO</authors>
 <description>SSIS Deploy PowerShell Module</description>
 </metadata>

AssistDeploy.psd1

@@ -13,7 +13,7 @@
     NestedModules = @()
 
     # Version number of this module.
-    ModuleVersion = '1.4.0.0'
+    ModuleVersion = '1.4.0.1'
 
     # ID used to uniquely identify this module
     GUID = '00049e8b-6f5f-41be-8e36-31d500ee53b9'

Functions/ImportJson.ps1

@@ -39,6 +39,15 @@ $ssisJson = Import-Json -jsonPath "C:\Users\SQLTraining\Documents\iscPublish.jso
             throw $_.Exception
         }
     }
+    else{
+        try {
+            Write-Verbose "Testing the environment variables in json file have a value... " -Verbose
+            Test-VariablesForPublishProfile -jsonPsCustomObject $jsonTested -localVariables
+        }
+        catch {
+            throw $_.Exception
+        }
+    }
     try {
         Write-Verbose "Testing project params in project.params match the project params in the json file..." -Verbose
         Test-ProjectParamsMatch -jsonObject $jsonTested -ispacPath $ispacPath

Functions/PublishSsisVariables.ps1

@@ -101,8 +101,15 @@ Non-mandatory params here can be used to overwrite the values stored in the publ
                         )
                 )
                 AND p.project_id = (
-                    select er.project_id from CATALOG.environment_references er
-                    where er.environment_name = @0)
+                    SELECT er.project_id
+                    FROM CATALOG.environment_references er
+                    WHERE er.environment_name = @0
+                        AND er.project_id = (
+                            SELECT project_id
+                            FROM CATALOG.projects proj
+                            WHERE proj.NAME = @1
+                            )
+                    )
         )
         SELECT referenced_variable_name, CASE eevee.sensitive WHEN 0 THEN 'False' ELSE 'True' END as sensitive, eevee.description, eevee.type as data_type, eevee.value
         FROM cte

Functions/TestVariablesForPublishProfile.ps1

@@ -7,7 +7,9 @@ function Test-VariablesForPublishProfile {
     param
     (
         [Parameter(Position = 0, mandatory = $true)]
-        [PSCustomObject] $jsonPsCustomObject
+        [PSCustomObject] $jsonPsCustomObject,
+        [Parameter(Position = 0, mandatory = $false)]
+        [Switch] $localVariables
     )
     $missingVariables = @()
     $ssisJson = $jsonPsCustomObject
@@ -26,4 +28,17 @@ function Test-VariablesForPublishProfile {
             throw ('The following ssisEnvironmentVariable variables are not defined in the session (but are defined in the json file): {0}' -f ($missingVariables -join " `n"))
         }
     }
+    else{
+        Write-Verbose "Validating that each environment variable named in json file has a value." -Verbose
+        $keys = $($ssisJson.ssisEnvironmentVariable)
+        foreach ($var in $keys)
+        {   
+            $varValue = $var.Value
+            if ($varValue.Length -eq 0)
+            {   
+                $msg = "$($var.VariableName) does not have a value. Cannot use switch -localVariables where an environment variable does nto have a value. "
+                Throw $msg
+            }
+        }
+    }
 }