Fix case where cluster has a cert, but it is not available. (#5640)

Author: NCarlsonMSFT

Tasks/Common/ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1

@@ -18,7 +18,7 @@ function Get-ServiceFabricEncryptedText
     if (-not $cert)
     {
         Write-Warning (Get-VstsLocString -Key ServerCertificateNotFoundForTextEncrypt -ArgumentList $serverCertThumbprint)
-        return $Text
+        return $null
     }
 
     # Encrypt the text using the cluster connection's certificate.

Tasks/ServiceFabricComposeDeploy/ServiceFabricComposeDeploy.ps1

@@ -85,8 +85,12 @@ try {
         if (-not $isEncrypted -and $clusterConnectionParameters["ServerCertThumbprint"])
         {
             Write-Host (Get-VstsLocString -Key EncryptingPassword)
-            $password = Get-ServiceFabricEncryptedText -Text $password -ClusterConnectionParameters $clusterConnectionParameters
-            $isEncrypted = $true
+            $encryptedPassword = Get-ServiceFabricEncryptedText -Text $password -ClusterConnectionParameters $clusterConnectionParameters
+            if ($encryptedPassword)
+            {
+                $password = $encryptedPassword
+                $isEncrypted = $true
+            }
         }
 
         if ($usePreviewApi)

Tasks/ServiceFabricComposeDeploy/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 0,
         "Minor": 1,
-        "Patch": 6
+        "Patch": 7
     },
     "demands": [
         "Cmd"

Tasks/ServiceFabricComposeDeploy/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 0,
     "Minor": 1,
-    "Patch": 6
+    "Patch": 7
   },
   "demands": [
     "Cmd"

Tasks/ServiceFabricDeploy/Update-DockerSettings.psm1

@@ -45,8 +45,12 @@ function Update-DockerSettings
 
         if (-not $isPasswordEncrypted -and $ClusterConnectionParameters["ServerCertThumbprint"])
         {
-            $password = Get-ServiceFabricEncryptedText -Text $password -ClusterConnectionParameters $ClusterConnectionParameters
-            $isPasswordEncrypted = $true
+            $encryptedPassword = Get-ServiceFabricEncryptedText -Text $password -ClusterConnectionParameters $clusterConnectionParameters
+            if ($encryptedPassword)
+            {
+                $password = $encryptedPassword
+                $isPasswordEncrypted = $true
+            }
         }
 
         $appManifestPath = Join-Path $ApplicationPackagePath "ApplicationManifest.xml"

Tasks/ServiceFabricDeploy/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 4,
-        "Patch": 2
+        "Patch": 3
     },
     "demands": [
         "Cmd"

Tasks/ServiceFabricDeploy/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 4,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [
     "Cmd"