X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/22e3ec0b8647ba1236d1f0e0cd55dcdb4cca7702..83898701e9c75661a240cadcf31f80cbccbb698e:/sdk/go/arvados/config.go diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 00438bf340..9dc9e17dd8 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -49,12 +49,12 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) { } } } - if cc, ok := sc.Clusters[clusterID]; !ok { + cc, ok := sc.Clusters[clusterID] + if !ok { return nil, fmt.Errorf("cluster %q is not configured", clusterID) - } else { - cc.ClusterID = clusterID - return &cc, nil } + cc.ClusterID = clusterID + return &cc, nil } type WebDAVCacheConfig struct { @@ -86,7 +86,6 @@ type Cluster struct { MaxKeepBlobBuffers int MaxRequestAmplification int MaxRequestSize int - RailsSessionSecretToken string RequestTimeout Duration SendTimeout Duration WebsocketClientEventQueue int @@ -183,6 +182,7 @@ type Cluster struct { LoginCluster string RemoteTokenRefresh Duration TokenLifetime Duration + TrustedClients map[string]struct{} } Mail struct { MailchimpAPIKey string