From dcda037f6f9a5a57d50219dac37c17284342eed8 Mon Sep 17 00:00:00 2001
From: Gary Marjoram <marjoram@ie.ibm.com>
Date: Thu, 22 Oct 2020 16:31:33 +0100
Subject: [PATCH] Convert to validator-v1

---
 .bluemix/deploy.json      | 76 +++++++++++++++++++++++++++++++++------
 .bluemix/nls/messages.yml |  2 ++
 2 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/.bluemix/deploy.json b/.bluemix/deploy.json
index e68b469..cdf423c 100644
--- a/.bluemix/deploy.json
+++ b/.bluemix/deploy.json
@@ -18,55 +18,91 @@
             "description": {
                 "$ref":"#/messages/deploy.region"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-region",
+                "params": ["api-key"]
+            }
         },
         "dev-organization": {
             "description": {
                 "$ref":"#/messages/deploy.org"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-org",
+                "params": ["dev-region"]
+            }
         },
         "dev-space": {
             "description": {
                 "$ref":"#/messages/deploy.space"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-space",
+                "params": ["dev-organization"]
+            }
         },
         "qa-region": {
             "description": {
                 "$ref":"#/messages/deploy.region"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-region",
+                "params": ["api-key"]
+            }
         },
         "qa-organization": {
             "description": {
                 "$ref":"#/messages/deploy.org"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-org",
+                "params": ["qa-region"]
+            }
         },
         "qa-space": {
             "description": {
                 "$ref":"#/messages/deploy.space"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-space",
+                "params": ["qa-organization"]
+            }
         },
         "prod-region": {
             "description": {
                 "$ref":"#/messages/deploy.region"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-region",
+                "params": ["api-key"]
+            }
         },
         "prod-organization": {
             "description": {
                 "$ref":"#/messages/deploy.org"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-org",
+                "params": ["prod-region"]
+            }
         },
         "prod-space": {
             "description": {
                 "$ref":"#/messages/deploy.space"
              },
-            "type": "string"
+            "type": "string",
+            "validator": {
+                "v-type": "cf-space",
+                "params": ["prod-organization"]
+            }
         },
         "orders-app-name": {
             "description": {
@@ -91,6 +127,15 @@
             "type": "string",
             "pattern": "\\S",
             "maxLength": 63
+        },
+        "api-key": {
+            "description": {
+                "$ref": "#/messages/deploy.apiKeyDescription"
+            },
+            "type": "string",
+            "validator": {
+                "v-type": "api-key"
+            }
         }
     },
     "required": [
@@ -105,12 +150,13 @@
         "prod-space",
         "orders-app-name",
         "catalog-app-name",
-        "ui-app-name"
+        "ui-app-name",
+        "api-key"
     ],
     "form": [
         {
             "type": "validator",
-            "url": "/devops/setup/bm-helper/helper.html"
+            "url": "/devops/validator/validator-v1.html"
         },
         {
             "type": "text",
@@ -136,6 +182,14 @@
             },
             "key": "ui-app-name"
         },
+        {
+            "type": "password",
+            "readonly": false,
+            "title": {
+                "$ref": "#/messages/deploy.apiKeyTitle"
+            },
+            "key": "api-key"
+        },
         {
             "type": "table",
             "columnCount": 4,
diff --git a/.bluemix/nls/messages.yml b/.bluemix/nls/messages.yml
index 98e695e..d45b3ac 100644
--- a/.bluemix/nls/messages.yml
+++ b/.bluemix/nls/messages.yml
@@ -53,3 +53,5 @@ headerSVG.saucelabs3: "SAUCE LABS"
 headerSVG.pagerDuty: "PAGER DUTY"
 headerSVG.devops: "DEVOPS"
 headerSVG.insights: "INSIGHTS"
+deploy.apiKeyTitle: "IBM Cloud API key"
+deploy.apiKeyDescription: "An API key is required to access the IBM Cloud Runtime. If you do not have one, you can click the Create button. You can also obtain an API key with 'ibmcloud iam api-key-create' or via the console at https://cloud.ibm.com/iam#/apikeys"