Fix SF task issues (#5634)

* Add a default value for the new setting configureDockerSettings. Ported from master(#5620)

* Do not throw if server certificate is not present to encrypt password

Author: bishal-pdMSFT

Tasks/Common/ServiceFabricHelpers/Get-ServiceFabricEncryptedText.ps1

@@ -17,7 +17,8 @@ function Get-ServiceFabricEncryptedText
     $cert = Get-Item "Cert:\$defaultCertStoreLocation\$defaultCertStoreName\$serverCertThumbprint" -ErrorAction SilentlyContinue
     if (-not $cert)
     {
-        throw (Get-VstsLocString -Key ServerCertificateNotFoundForTextEncrypt -ArgumentList $serverCertThumbprint)
+        Write-Warning (Get-VstsLocString -Key ServerCertificateNotFoundForTextEncrypt -ArgumentList $serverCertThumbprint)
+        return $Text
     }
 
     # Encrypt the text using the cluster connection's certificate.

Tasks/ServiceFabricComposeDeploy/ServiceFabricComposeDeploy.ps1

@@ -82,7 +82,7 @@ try {
 
     if ($registryCredentials -ne "None")
     {
-        if (-not $isEncrypted)
+        if (-not $isEncrypted -and $clusterConnectionParameters["ServerCertThumbprint"])
         {
             Write-Host (Get-VstsLocString -Key EncryptingPassword)
             $password = Get-ServiceFabricEncryptedText -Text $password -ClusterConnectionParameters $clusterConnectionParameters

Tasks/ServiceFabricComposeDeploy/task.json

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

Tasks/ServiceFabricComposeDeploy/task.loc.json

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

Tasks/ServiceFabricDeploy/Strings/resources.resjson/en-US/resources.resjson

@@ -51,9 +51,9 @@
   "loc.input.label.registryCredentials": "Registry Credentials Source",
   "loc.input.help.registryCredentials": "Choose how credentials for the Docker registry will be provided.",
   "loc.input.label.dockerRegistryEndpoint": "Docker Registry Connection",
-  "loc.input.help.dockerRegistryEndpoint": "Select a Docker registry connection. Required for commands that need to authenticate with a registry.",
+  "loc.input.help.dockerRegistryEndpoint": "Select a Docker registry connection. Required for commands that need to authenticate with a registry.<br/>Note: task will try to encrypt the registry secret before transmitting it to service fabric cluster. However, it needs cluster's server certiticate to be installed on agent machine in order to do so. If certificate is not present, secret will not be encrypted.",
   "loc.input.label.azureSubscriptionEndpoint": "Azure subscription",
-  "loc.input.help.azureSubscriptionEndpoint": "Select an Azure subscription",
+  "loc.input.help.azureSubscriptionEndpoint": "Select an Azure subscription.<br/>Note: task will try to encrypt the registry secret before transmitting it to service fabric cluster. However, it needs cluster's server certiticate to be installed on agent machine in order to do so. If certificate is not present, secret will not be encrypted.",
   "loc.input.label.registryUserName": "Registry User Name",
   "loc.input.help.registryUserName": "Username for the Docker registry",
   "loc.input.label.registryPassword": "Registry Password",

Tasks/ServiceFabricDeploy/Update-DockerSettings.psm1

@@ -43,7 +43,7 @@ function Update-DockerSettings
             }
         }
 
-        if (-not $isPasswordEncrypted)
+        if (-not $isPasswordEncrypted -and $ClusterConnectionParameters["ServerCertThumbprint"])
         {
             $password = Get-ServiceFabricEncryptedText -Text $password -ClusterConnectionParameters $ClusterConnectionParameters
             $isPasswordEncrypted = $true

Tasks/ServiceFabricDeploy/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 4,
-        "Patch": 1
+        "Patch": 2
     },
     "demands": [
         "Cmd"
@@ -307,6 +307,7 @@
             "name": "configureDockerSettings",
             "type": "boolean",
             "label": "Configure Docker settings",
+            "defaultValue": "false",
             "helpMarkDown": "Configures the application with the specified Docker settings.",
             "groupname": "docker"
         },
@@ -329,7 +330,7 @@
             "name": "dockerRegistryEndpoint",
             "type": "connectedService:dockerregistry",
             "label": "Docker Registry Connection",
-            "helpMarkDown": "Select a Docker registry connection. Required for commands that need to authenticate with a registry.",
+            "helpMarkDown": "Select a Docker registry connection. Required for commands that need to authenticate with a registry.<br/>Note: task will try to encrypt the registry secret before transmitting it to service fabric cluster. However, it needs cluster's server certiticate to be installed on agent machine in order to do so. If certificate is not present, secret will not be encrypted.",
             "visibleRule": "configureDockerSettings = true && registryCredentials = ContainerRegistryEndpoint",
             "required": true,
             "groupname": "docker"
@@ -338,7 +339,7 @@
             "name": "azureSubscriptionEndpoint",
             "type": "connectedService:AzureRM",
             "label": "Azure subscription",
-            "helpMarkDown": "Select an Azure subscription",
+            "helpMarkDown": "Select an Azure subscription.<br/>Note: task will try to encrypt the registry secret before transmitting it to service fabric cluster. However, it needs cluster's server certiticate to be installed on agent machine in order to do so. If certificate is not present, secret will not be encrypted.",
             "visibleRule": "configureDockerSettings = true && registryCredentials = AzureResourceManagerEndpoint",
             "required": true,
             "groupname": "docker"

Tasks/ServiceFabricDeploy/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 4,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [
     "Cmd"
@@ -307,6 +307,7 @@
       "name": "configureDockerSettings",
       "type": "boolean",
       "label": "ms-resource:loc.input.label.configureDockerSettings",
+      "defaultValue": "false",
       "helpMarkDown": "ms-resource:loc.input.help.configureDockerSettings",
       "groupname": "docker"
     },