X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1fb68cf0a5f6ad058a54d4f822385983b3504987..1f1c719242487831557805b3e73b50eef7a29753:/sdk/go/arvados/config.go?ds=sidebyside

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 00438bf340..c0170d1d7f 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 {
@@ -65,6 +65,7 @@ type WebDAVCacheConfig struct {
 	MaxCollectionBytes   int64
 	MaxPermissionEntries int
 	MaxUUIDEntries       int
+	MaxSessions          int
 }
 
 type Cluster struct {
@@ -86,7 +87,7 @@ type Cluster struct {
 		MaxKeepBlobBuffers             int
 		MaxRequestAmplification        int
 		MaxRequestSize                 int
-		RailsSessionSecretToken        string
+		MaxTokenLifetime               Duration
 		RequestTimeout                 Duration
 		SendTimeout                    Duration
 		WebsocketClientEventQueue      int
@@ -152,19 +153,21 @@ type Cluster struct {
 			UsernameAttribute  string
 		}
 		Google struct {
-			Enable                  bool
-			ClientID                string
-			ClientSecret            string
-			AlternateEmailAddresses bool
+			Enable                          bool
+			ClientID                        string
+			ClientSecret                    string
+			AlternateEmailAddresses         bool
+			AuthenticationRequestParameters map[string]string
 		}
 		OpenIDConnect struct {
-			Enable             bool
-			Issuer             string
-			ClientID           string
-			ClientSecret       string
-			EmailClaim         string
-			EmailVerifiedClaim string
-			UsernameClaim      string
+			Enable                          bool
+			Issuer                          string
+			ClientID                        string
+			ClientSecret                    string
+			EmailClaim                      string
+			EmailVerifiedClaim              string
+			UsernameClaim                   string
+			AuthenticationRequestParameters map[string]string
 		}
 		PAM struct {
 			Enable             bool
@@ -183,6 +186,7 @@ type Cluster struct {
 		LoginCluster       string
 		RemoteTokenRefresh Duration
 		TokenLifetime      Duration
+		TrustedClients     map[string]struct{}
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -262,8 +266,6 @@ type Cluster struct {
 		SSHHelpHostSuffix      string
 		IdleTimeout            Duration
 	}
-
-	ForceLegacyAPI14 bool
 }
 
 type Volume struct {
@@ -429,6 +431,10 @@ type ContainersConfig struct {
 		LogUpdatePeriod              Duration
 		LogUpdateSize                ByteSize
 	}
+	ShellAccess struct {
+		Admin bool
+		User  bool
+	}
 	SLURM struct {
 		PrioritySpread             int64
 		SbatchArgumentsList        []string