X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7499f61a2912cfdb1a316808fafa6e6ee77ee2e0..83898701e9c75661a240cadcf31f80cbccbb698e:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 394e30a737..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
@@ -219,6 +219,7 @@ type Cluster struct {
 		UserNotifierEmailFrom                 string
 		UserProfileNotificationAddress        string
 		PreferDomainForUsername               string
+		UserSetupMailText                     string
 	}
 	Volumes   map[string]Volume
 	Workbench struct {