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 6f78073ac8df415287b5efbf80cec6d4c356e0a0..6ec8f345d75f430ecd4fe8ffab4bfa665f569770 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -82,7 +82,7 @@ type Cluster struct {
                MaxIndexDatabaseRead           int
                MaxItemsPerResponse            int
                MaxConcurrentRequests          int
-               MaxKeepBlockBuffers            int
+               MaxKeepBlobBuffers             int
                MaxRequestAmplification        int
                MaxRequestSize                 int
                RailsSessionSecretToken        string
@@ -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,12 @@ type Cluster struct {
                Repositories string
        }
        Login struct {
-               ProviderAppSecret string
-               ProviderAppID     string
+               GoogleClientID     string
+               GoogleClientSecret string
+               ProviderAppID      string
+               ProviderAppSecret  string
+               LoginCluster       string
+               RemoteTokenRefresh Duration
        }
        Mail struct {
                MailchimpAPIKey                string
@@ -200,6 +209,8 @@ type Cluster struct {
                }
                UserProfileFormMessage string
                VocabularyURL          string
+               WelcomePageHTML        string
+               InactivePageHTML       string
        }
 
        EnableBetaController14287 bool
@@ -295,9 +306,6 @@ func (su URL) String() string {
 }
 
 type ServiceInstance struct {
-       // Rendezvous is normally empty; when changing the URL of a
-       // Keepstore service, Rendezvous can be set to the old URL to
-       // preserve rendezvous ordering.
        Rendezvous string `json:",omitempty"`
 }