From 8f61adde961617c3ad6da46e3355f201944fed1d Mon Sep 17 00:00:00 2001
From: Peter Jausovec <peterj@microsoft.com>
Date: Fri, 10 Feb 2017 15:50:03 -0800
Subject: [PATCH] Address PR feedback

---
 src/tasks/dockerDeploy/dockerDeploy.ts |  2 +-
 src/tasks/dockerDeploy/task.json       | 29 ++++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/tasks/dockerDeploy/dockerDeploy.ts b/src/tasks/dockerDeploy/dockerDeploy.ts
index a8d172d..e0a585e 100644
--- a/src/tasks/dockerDeploy/dockerDeploy.ts
+++ b/src/tasks/dockerDeploy/dockerDeploy.ts
@@ -10,7 +10,7 @@ var targetType = tl.getInput("targetType", true);
 /* tslint:disable:no-var-requires */
 require({
     "ACS DCOS": "./dockerDeployAcsDcos",
-    "Kubernetes": "./dockerDeployAcsKube"
+    "ACS Kubernetes": "./dockerDeployAcsKube"
 }[targetType]).run()
 /* tslint:enable:no-var-requires */
 .fail(function failure(err) {
diff --git a/src/tasks/dockerDeploy/task.json b/src/tasks/dockerDeploy/task.json
index 23c674c..7a06675 100644
--- a/src/tasks/dockerDeploy/task.json
+++ b/src/tasks/dockerDeploy/task.json
@@ -37,7 +37,7 @@
             "required": true,
             "options": {
                 "ACS DCOS": "Azure Container Service (DC/OS)",
-                "Kubernetes": "Kubernetes Cluster"
+                "ACS Kubernetes": "Azure Container Service (Kubernetes)"
             },
             "helpMarkDown": "Select a deployment target type."
         },
@@ -46,6 +46,7 @@
             "type": "filePath",
             "label": "Docker Compose File",
             "required": true,
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Path to the primary Docker Compose file to use."
         },
         {
@@ -56,6 +57,7 @@
                 "rows": "2"
             },
             "label": "Additional Docker Compose Files",
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Additional Docker Compose files to be combined with the primary Docker Compose file. Relative paths are resolved relative to the directory containing the primary Docker Compose file. If a specified file is not found, it is ignored. Specify each file path on a new line."
         },
         {
@@ -66,6 +68,7 @@
                 "rows": "2"
             },
             "label": "Environment Variables",
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Environment variables to be set during the command. Specify each name=value pair on a new line."
         },
         {
@@ -73,6 +76,7 @@
             "type": "string",
             "label": "Project Name",
             "defaultValue": "$(Release.DefinitionName)",
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Project name used for default naming of images and containers."
         },
         {
@@ -80,6 +84,7 @@
             "type": "boolean",
             "label": "Qualify Image Names",
             "defaultValue": "false",
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Automatically qualify image names for built services with the Docker registry connection's hostname if not otherwise specified."
         },
         {
@@ -105,14 +110,13 @@
         {
             "name": "kubernetesEndpointType",
             "type": "pickList",
-            "label": "Kubernetes Connection Type",
+            "label": "ACS Kubernetes Connection Type",
             "required": true,
             "options": {
-                "Direct": "Direct",
                 "SSH": "SSH"
             },
-            "visibleRule": "targetType = Kubernetes",
-            "helpMarkDown": "Select a Kubernetes connection type."
+            "visibleRule": "targetType = ACS Kubernetes",
+            "helpMarkDown": "Select a Azure Container Service Kubernetes connection type."
         },
         {
             "name": "acsDcosMasterUrl",
@@ -123,15 +127,6 @@
             "visibleRule": "targetType = ACS DCOS && acsDcosEndpointType = Direct",
             "helpMarkDown": "URL of the Azure Container Service DC/OS master node."
         },
-        {
-            "name": "kubernetesApiEndpointURL",
-            "type": "string",
-            "label": "Kubernetes API Endpoint URL",
-            "required": true,
-            "defaultValue": "http://localhost",
-            "visibleRule": "targetType = Kubernetes && kubernetesEndpointType = Direct",
-            "helpMarkDown": "URL of the Kubernetes master node."
-        },
         {
             "name": "acsDcosSshEndpoint",
             "type": "connectedService:ssh",
@@ -145,8 +140,8 @@
             "type": "connectedService:ssh",
             "label": "Kubernetes SSH Connection",
             "required": true,
-            "visibleRule": "targetType = Kubernetes && kubernetesEndpointType = SSH",
-            "helpMarkDown": "Select a Kubernetes SSH connection."
+            "visibleRule": "targetType = ACS Kubernetes && kubernetesEndpointType = SSH",
+            "helpMarkDown": "Select an AzurE container Service Kubernetes SSH connection."
         },
         {
             "name": "acsDcosAppGroupName",
@@ -162,6 +157,7 @@
             "label": "Application Group Qualifier",
             "required": true,
             "defaultValue": "$(System.TeamFoundationCollectionUri)/$(System.TeamProject)",
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Qualifier for the Marathon application group name that is hashed and appended to create a unique identifier for deployment definitions."
         },
         {
@@ -170,6 +166,7 @@
             "label": "Application Group Version",
             "required": true,
             "defaultValue": "$(Release.ReleaseId).$(Release.AttemptNumber)",
+            "visibleRule": "targetType = ACS DCOS | targetType = ACS Kubernetes",
             "helpMarkDown": "Version for the Marathon application group name that is appended to create a unique identifier for specific deployments."
         },
         {