20690: Remove workbench1-specific configs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/config/cmd_test.go b/lib/config/cmd_test.go
index 9503a54d2d7c137ec5c2e805a3aaec9b990014ce..d94eea89dfbc7ee6562ebd3452b2d879e031c1ae 100644 (file)
--- a/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@ -69,8 +69,6 @@ Clusters:
         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)
@@ -124,8 +122,6 @@ Clusters:
         Type: select
         Options:
           fuchsia: {}
-    ApplicationMimetypesWithViewIcon:
-      whitespace: {}
 `
        code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
        c.Check(code, check.Equals, 1)

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 24d626aae50a1a9b46ec3d3dde9b3efcccbbb853..79889565a06f7273b20d69406fcf3194077481fe 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1822,18 +1822,12 @@ Clusters:
       ArvadosDocsite: https://doc.arvados.org
       ArvadosPublicDataDocURL: https://playground.arvados.org/projects/public
       ShowUserAgreementInline: false
-      SecretKeyBase: ""
 
       # Set this configuration to true to avoid providing an easy way for users
       # to share data with unauthenticated users; this may be necessary on
       # installations where strict data access controls are needed.
       DisableSharingURLsUI: false
 
-      # Scratch directory used by the remote repository browsing
-      # feature. If it doesn't exist, it (and any missing parents) will be
-      # created using mkdir_p.
-      RepositoryCache: /var/www/arvados-workbench/current/tmp/git
-
       # Below is a sample setting of user_profile_form_fields config parameter.
       # This configuration parameter should be set to either false (to disable) or
       # to a map as shown below.
@@ -1880,71 +1874,7 @@ Clusters:
       # to display on the profile page.
       UserProfileFormMessage: 'Welcome to Arvados. All <span style="color:red">required fields</span> must be completed before you can proceed.'
 
-      # Mimetypes of applications for which the view icon
-      # would be enabled in a collection's show page.
-      # It is sufficient to list only applications here.
-      # No need to list text and image types.
-      ApplicationMimetypesWithViewIcon:
-        cwl: {}
-        fasta: {}
-        go: {}
-        javascript: {}
-        json: {}
-        pdf: {}
-        python: {}
-        x-python: {}
-        r: {}
-        rtf: {}
-        sam: {}
-        x-sh: {}
-        vnd.realvnc.bed: {}
-        xml: {}
-        xsl: {}
-        SAMPLE: {}
-
-      # The maximum number of bytes to load in the log viewer
-      LogViewerMaxBytes: 1M
-
-      # When anonymous_user_token is configured, show public projects page
-      EnablePublicProjectsPage: true
-
-      # By default, disable the "Getting Started" popup which is specific to Arvados playground
-      EnableGettingStartedPopup: false
-
-      # Ask Arvados API server to compress its response payloads.
-      APIResponseCompression: true
-
-      # Timeouts for API requests.
-      APIClientConnectTimeout: 2m
-      APIClientReceiveTimeout: 5m
-
-      # Maximum number of historic log records of a running job to fetch
-      # and display in the Log tab, while subscribing to web sockets.
-      RunningJobLogRecordsToFetch: 2000
-
-      # In systems with many shared projects, loading of dashboard and topnav
-      # can be slow due to collections indexing; use the following parameters
-      # to suppress these properties
-      ShowRecentCollectionsOnDashboard: true
-      ShowUserNotifications: true
-
-      # Enable/disable "multi-site search" in top nav ("true"/"false"), or
-      # a link to the multi-site search page on a "home" Workbench site.
-      #
-      # Example:
-      #   https://workbench.zzzzz.arvadosapi.com/collections/multisite
-      MultiSiteSearch: ""
-
-      # Should workbench allow management of local git repositories? Set to false if
-      # the jobs api is disabled and there are no local git repositories.
-      Repositories: true
-
       SiteName: Arvados Workbench
-      ProfilingEnabled: false
-
-      # This is related to obsolete Google OpenID 1.0 login
-      # but some workbench stuff still expects it to be set.
-      DefaultOpenIdPrefix: "https://www.google.com/accounts/o8/id"
 
       # Workbench2 configs
       FileViewersConfigURL: ""

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index ea01cc3c6872a88adb341d953adbe75760b4f176..7b9bd847d1f50e9a930f496c108f13e8a12b07e3 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -269,31 +269,15 @@ type Cluster struct {
        StorageClasses map[string]StorageClassConfig
        Volumes        map[string]Volume
        Workbench      struct {
-               ActivationContactLink            string
-               APIClientConnectTimeout          Duration
-               APIClientReceiveTimeout          Duration
-               APIResponseCompression           bool
-               ApplicationMimetypesWithViewIcon StringSet
-               ArvadosDocsite                   string
-               ArvadosPublicDataDocURL          string
-               DefaultOpenIdPrefix              string
-               DisableSharingURLsUI             bool
-               EnableGettingStartedPopup        bool
-               EnablePublicProjectsPage         bool
-               FileViewersConfigURL             string
-               LogViewerMaxBytes                ByteSize
-               MultiSiteSearch                  string
-               ProfilingEnabled                 bool
-               Repositories                     bool
-               RepositoryCache                  string
-               RunningJobLogRecordsToFetch      int
-               SecretKeyBase                    string
-               ShowRecentCollectionsOnDashboard bool
-               ShowUserAgreementInline          bool
-               ShowUserNotifications            bool
-               SiteName                         string
-               Theme                            string
-               UserProfileFormFields            map[string]struct {
+               ActivationContactLink   string
+               ArvadosDocsite          string
+               ArvadosPublicDataDocURL string
+               DisableSharingURLsUI    bool
+               FileViewersConfigURL    string
+               ShowUserAgreementInline bool
+               SiteName                string
+               Theme                   string
+               UserProfileFormFields   map[string]struct {
                        Type                 string
                        FormFieldTitle       string
                        FormFieldDescription string