Rename Workbench.BannerURL to Workbench.BannerUUID

closes #20078

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 26ada44d6deeaed721bf93823d87dc5f6f381793..d1913563476547ecdf99f1d617c87e3751e25463 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1781,9 +1781,11 @@ Clusters:
       # This feature is disabled when set to zero.
       IdleTimeout: 0s
 
-      # URL to a file that is a fragment of text or HTML which should
-      # be rendered in Workbench as a banner.
-      BannerURL: ""
+      # UUID of a collection.  This collection should be shared with
+      # all users.  Workbench will look for a file "banner.html" in
+      # this collection and display its contents (should be
+      # HTML-formatted text) when users first log in to Workbench.
+      BannerUUID: ""
 
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.

diff --git a/lib/config/export.go b/lib/config/export.go
index f9699c6edcf5c5ef74d3a1977341a8b41084aef7..a8a535eeb58540799be38e7a8fc852ad0c0552fe 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -267,7 +267,7 @@ var whitelist = map[string]bool{
        "Workbench.ApplicationMimetypesWithViewIcon.*":        true,
        "Workbench.ArvadosDocsite":                            true,
        "Workbench.ArvadosPublicDataDocURL":                   true,
-       "Workbench.BannerURL":                                 true,
+       "Workbench.BannerUUID":                                true,
        "Workbench.DefaultOpenIdPrefix":                       false,
        "Workbench.DisableSharingURLsUI":                      true,
        "Workbench.EnableGettingStartedPopup":                 true,

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 677706c08208541ef4f13a4e1f8430272d9782e5..9d133a4bcf37b7d3521c6a8e521e605945f542e6 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -296,7 +296,7 @@ type Cluster struct {
                SSHHelpPageHTML        string
                SSHHelpHostSuffix      string
                IdleTimeout            Duration
-               BannerURL              string
+               BannerUUID             string
        }
 }