Merge branch '15107-google-login'

[arvados.git] / sdk / go / arvados / config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 076a3c44d7701c63e691d1ff54a1bae4be8e6dab..6ec8f345d75f430ecd4fe8ffab4bfa665f569770 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -119,6 +119,11 @@ type Cluster struct {
                TrashSweepInterval    Duration
                TrustAllContent       bool
 
+               BlobMissingReport        string
+               BalancePeriod            Duration
+               BalanceCollectionBatch   int
+               BalanceCollectionBuffers int
+
                WebDAVCache WebDAVCacheConfig
        }
        Git struct {
@@ -127,8 +132,10 @@ type Cluster struct {
                Repositories string
        }
        Login struct {
-               ProviderAppSecret  string
+               GoogleClientID     string
+               GoogleClientSecret string
                ProviderAppID      string
+               ProviderAppSecret  string
                LoginCluster       string
                RemoteTokenRefresh Duration
        }
@@ -202,6 +209,8 @@ type Cluster struct {
                }
                UserProfileFormMessage string
                VocabularyURL          string
+               WelcomePageHTML        string
+               InactivePageHTML       string
        }
 
        EnableBetaController14287 bool