15003: Fix errant warnings on Workbench configs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/config/cmd_test.go b/lib/config/cmd_test.go
index 7fc1ef9772a4c94dc77a17d595fdb57866d9b8f4..997935e5dcb4d54658de8f0546264fe6c8d903fb 100644 (file)
--- a/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@ -49,6 +49,14 @@ Clusters:
     RailsAPI:
       InternalURLs:
         "http://0.0.0.0:8000": {}
+  Workbench:
+    UserProfileFormFields:
+      color:
+        Type: select
+        Options:
+          fuchsia: {}
+    ApplicationMimetypesWithViewIcon:
+      whitespace: {}
 `
        code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
        c.Check(code, check.Equals, 0)

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index b97dbc8cf05c1bda71c3e56fa5789b8afe99dd21..7e5b47191e95d93d848df9fe56a6ca0762f6bae2 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -758,7 +758,19 @@ Clusters:
       #   Set "Required" as "true" for any of these fields to make them required.
       # If any of the required fields are missing in the user's profile, the user will be
       # redirected to the profile page before they can access any Workbench features.
-      UserProfileFormFields: {}
+      UserProfileFormFields:
+        SAMPLE:
+          Type: select
+          FormFieldTitle: Best color
+          FormFieldDescription: your favorite color
+          Required: false
+          Position: 1
+          Options:
+            red: {}
+            blue: {}
+            green: {}
+            SAMPLE: {}
+
         # exampleTextValue:  # key that will be set in properties
         #   Type: text  #
         #   FormFieldTitle: ""
@@ -800,6 +812,7 @@ Clusters:
         vnd.realvnc.bed: {}
         xml: {}
         xsl: {}
+        SAMPLE: {}
 
       # The maximum number of bytes to load in the log viewer
       LogViewerMaxBytes: 1M

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index bf0896ff8b1ce455d467ebd45810f9b60a905352..0a9d7a5b6df6ce8ec00d775081c732d3d7b91a50 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -764,7 +764,19 @@ Clusters:
       #   Set "Required" as "true" for any of these fields to make them required.
       # If any of the required fields are missing in the user's profile, the user will be
       # redirected to the profile page before they can access any Workbench features.
-      UserProfileFormFields: {}
+      UserProfileFormFields:
+        SAMPLE:
+          Type: select
+          FormFieldTitle: Best color
+          FormFieldDescription: your favorite color
+          Required: false
+          Position: 1
+          Options:
+            red: {}
+            blue: {}
+            green: {}
+            SAMPLE: {}
+
         # exampleTextValue:  # key that will be set in properties
         #   Type: text  #
         #   FormFieldTitle: ""
@@ -806,6 +818,7 @@ Clusters:
         vnd.realvnc.bed: {}
         xml: {}
         xsl: {}
+        SAMPLE: {}
 
       # The maximum number of bytes to load in the log viewer
       LogViewerMaxBytes: 1M