From b9913c5ac757c10970ca49a81ad7242fc268742d Mon Sep 17 00:00:00 2001
From: Joseph Lewis III <jlewisiii@google.com>
Date: Thu, 21 Nov 2019 09:09:52 -0800
Subject: [PATCH] made form fields "optional" from the perspective of opsman
 (#551)

---
 CHANGELOG.md           |  4 ++++
 docs/customization.md  | 15 +++++----------
 pkg/generator/forms.go | 13 +++++++------
 tile.yml               | 10 ++++++++++
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93436323..a403c680a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Form fields are now optional to work with OpsMan settings.
+
 ## [5.0.0] - 2019-10-28
 
 ### Added
diff --git a/docs/customization.md b/docs/customization.md
index 2b5eb3d23..46e9bff53 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -179,9 +179,8 @@ For example:
 
 
 <ul>
-  <li><b>Required</b></li>
+  <li><i>Optional</i></li>
   <li>Default: <code>b8e19880-ac58-42ef-b033-f7cd9c94d1fe</code></li>
-  <li>This option _is not_ user configurable. It must be set to the default.</li>
   <li>Valid Values:
   <ul>
     <li><tt>b8e19880-ac58-42ef-b033-f7cd9c94d1fe</tt> - Google Bigtable</li>
@@ -312,9 +311,8 @@ For example:
 
 
 <ul>
-  <li><b>Required</b></li>
+  <li><i>Optional</i></li>
   <li>Default: <code>4bc59b9a-8520-409f-85da-1c7552315863</code></li>
-  <li>This option _is not_ user configurable. It must be set to the default.</li>
   <li>Valid Values:
   <ul>
     <li><tt>4bc59b9a-8520-409f-85da-1c7552315863</tt> - Google CloudSQL for MySQL</li>
@@ -439,9 +437,8 @@ For example:
 
 
 <ul>
-  <li><b>Required</b></li>
+  <li><i>Optional</i></li>
   <li>Default: <code>cbad6d78-a73c-432d-b8ff-b219a17a803a</code></li>
-  <li>This option _is not_ user configurable. It must be set to the default.</li>
   <li>Valid Values:
   <ul>
     <li><tt>cbad6d78-a73c-432d-b8ff-b219a17a803a</tt> - Google CloudSQL for PostgreSQL</li>
@@ -566,9 +563,8 @@ For example:
 
 
 <ul>
-  <li><b>Required</b></li>
+  <li><i>Optional</i></li>
   <li>Default: <code>51b3e27e-d323-49ce-8c5f-1211e6409e82</code></li>
-  <li>This option _is not_ user configurable. It must be set to the default.</li>
   <li>Valid Values:
   <ul>
     <li><tt>51b3e27e-d323-49ce-8c5f-1211e6409e82</tt> - Google Spanner</li>
@@ -677,9 +673,8 @@ For example:
 
 
 <ul>
-  <li><b>Required</b></li>
+  <li><i>Optional</i></li>
   <li>Default: <code>b9e4332e-b42b-4680-bda5-ea1506797474</code></li>
-  <li>This option _is not_ user configurable. It must be set to the default.</li>
   <li>Valid Values:
   <ul>
     <li><tt>b9e4332e-b42b-4680-bda5-ea1506797474</tt> - Google Cloud Storage</li>
diff --git a/pkg/generator/forms.go b/pkg/generator/forms.go
index c43f8ccc9..1cf6b7220 100644
--- a/pkg/generator/forms.go
+++ b/pkg/generator/forms.go
@@ -248,11 +248,13 @@ func generateServicePlanForm(svc *broker.ServiceDefinition) (Form, error) {
 				Configurable: true,
 			},
 			{
-				Name:        "service",
-				Label:       "Service",
-				Type:        "dropdown_select",
-				Description: "The service this plan is associated with.",
-				Default:     entry.ID,
+				Name:         "service",
+				Label:        "Service",
+				Type:         "dropdown_select",
+				Description:  "The service this plan is associated with.",
+				Default:      entry.ID,
+				Configurable: true,
+				Optional:     true,
 				Options: []FormOption{
 					{
 						Name:  entry.ID,
@@ -377,7 +379,6 @@ func brokerVariableToFormProperty(v broker.BrokerVariable) FormProperty {
 		formInput.Options = opts
 
 		if len(opts) == 1 {
-			formInput.Configurable = false
 			formInput.Default = opts[0].Name
 		}
 	}
diff --git a/tile.yml b/tile.yml
index 2b98a6e2e..56a207fed 100644
--- a/tile.yml
+++ b/tile.yml
@@ -332,9 +332,11 @@ service_plan_forms:
     default: b8e19880-ac58-42ef-b033-f7cd9c94d1fe
     label: Service
     description: The service this plan is associated with.
+    configurable: true
     options:
     - name: b8e19880-ac58-42ef-b033-f7cd9c94d1fe
       label: Google Bigtable
+    optional: true
   - name: storage_type
     type: dropdown_select
     default: SSD
@@ -374,9 +376,11 @@ service_plan_forms:
     default: 4bc59b9a-8520-409f-85da-1c7552315863
     label: Service
     description: The service this plan is associated with.
+    configurable: true
     options:
     - name: 4bc59b9a-8520-409f-85da-1c7552315863
       label: Google CloudSQL for MySQL
+    optional: true
   - name: tier
     type: string
     label: Tier
@@ -410,9 +414,11 @@ service_plan_forms:
     default: cbad6d78-a73c-432d-b8ff-b219a17a803a
     label: Service
     description: The service this plan is associated with.
+    configurable: true
     options:
     - name: cbad6d78-a73c-432d-b8ff-b219a17a803a
       label: Google CloudSQL for PostgreSQL
+    optional: true
   - name: tier
     type: string
     label: Tier
@@ -445,9 +451,11 @@ service_plan_forms:
     default: 51b3e27e-d323-49ce-8c5f-1211e6409e82
     label: Service
     description: The service this plan is associated with.
+    configurable: true
     options:
     - name: 51b3e27e-d323-49ce-8c5f-1211e6409e82
       label: Google Spanner
+    optional: true
   - name: num_nodes
     type: string
     default: "1"
@@ -475,9 +483,11 @@ service_plan_forms:
     default: b9e4332e-b42b-4680-bda5-ea1506797474
     label: Service
     description: The service this plan is associated with.
+    configurable: true
     options:
     - name: b9e4332e-b42b-4680-bda5-ea1506797474
       label: Google Cloud Storage
+    optional: true
   - name: storage_class
     type: string
     label: Storage Class