X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3aaefcb3c76ff470b475d950398d01255e87712a..ffa1fd1fdf584c71e248e9bb7d523f788a517510:/sdk/go/arvados/config.go?ds=sidebyside

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index a8d601d5f6..844991f41e 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -65,6 +65,17 @@ type WebDAVCacheConfig struct {
 	MaxCollectionBytes   int64
 	MaxPermissionEntries int
 	MaxUUIDEntries       int
+	MaxSessions          int
+}
+
+type UploadDownloadPermission struct {
+	Upload   bool
+	Download bool
+}
+
+type UploadDownloadRolePermissions struct {
+	User  UploadDownloadPermission
+	Admin UploadDownloadPermission
 }
 
 type Cluster struct {
@@ -86,7 +97,7 @@ type Cluster struct {
 		MaxKeepBlobBuffers             int
 		MaxRequestAmplification        int
 		MaxRequestSize                 int
-		RailsSessionSecretToken        string
+		MaxTokenLifetime               Duration
 		RequestTimeout                 Duration
 		SendTimeout                    Duration
 		WebsocketClientEventQueue      int
@@ -129,6 +140,10 @@ type Cluster struct {
 		BalanceTimeout           Duration
 
 		WebDAVCache WebDAVCacheConfig
+
+		KeepproxyPermission UploadDownloadRolePermissions
+		WebDAVPermission    UploadDownloadRolePermissions
+		WebDAVLogEvents     bool
 	}
 	Git struct {
 		GitCommand   string
@@ -152,30 +167,29 @@ 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
+			AcceptAccessToken               bool
+			AcceptAccessTokenScope          string
+			AuthenticationRequestParameters map[string]string
 		}
 		PAM struct {
 			Enable             bool
 			Service            string
 			DefaultEmailDomain string
 		}
-		SSO struct {
-			Enable            bool
-			ProviderAppID     string
-			ProviderAppSecret string
-		}
 		Test struct {
 			Enable bool
 			Users  map[string]TestUser
@@ -184,6 +198,7 @@ type Cluster struct {
 		RemoteTokenRefresh Duration
 		TokenLifetime      Duration
 		TrustedClients     map[string]struct{}
+		IssueTrustedTokens bool
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -263,8 +278,6 @@ type Cluster struct {
 		SSHHelpHostSuffix      string
 		IdleTimeout            Duration
 	}
-
-	ForceLegacyAPI14 bool
 }
 
 type Volume struct {
@@ -278,8 +291,8 @@ type Volume struct {
 
 type S3VolumeDriverParameters struct {
 	IAMRole            string
-	AccessKey          string
-	SecretKey          string
+	AccessKeyID        string
+	SecretAccessKey    string
 	Endpoint           string
 	Region             string
 	Bucket             string
@@ -316,6 +329,7 @@ type Services struct {
 	Composer       Service
 	Controller     Service
 	DispatchCloud  Service
+	DispatchLSF    Service
 	GitHTTP        Service
 	GitSSH         Service
 	Health         Service
@@ -323,7 +337,6 @@ type Services struct {
 	Keepproxy      Service
 	Keepstore      Service
 	RailsAPI       Service
-	SSO            Service
 	WebDAVDownload Service
 	WebDAV         Service
 	WebShell       Service
@@ -413,6 +426,7 @@ type ContainersConfig struct {
 	StaleLockTimeout            Duration
 	SupportedDockerImageFormats StringSet
 	UsePreemptibleInstances     bool
+	RuntimeEngine               string
 
 	JobsAPI struct {
 		Enable         string
@@ -430,6 +444,10 @@ type ContainersConfig struct {
 		LogUpdatePeriod              Duration
 		LogUpdateSize                ByteSize
 	}
+	ShellAccess struct {
+		Admin bool
+		User  bool
+	}
 	SLURM struct {
 		PrioritySpread             int64
 		SbatchArgumentsList        []string
@@ -444,6 +462,10 @@ type ContainersConfig struct {
 			AssignNodeHostname     string
 		}
 	}
+	LSF struct {
+		BsubSudoUser      string
+		BsubArgumentsList []string
+	}
 }
 
 type CloudVMsConfig struct {
@@ -580,6 +602,7 @@ const (
 	ServiceNameRailsAPI      ServiceName = "arvados-api-server"
 	ServiceNameController    ServiceName = "arvados-controller"
 	ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
+	ServiceNameDispatchLSF   ServiceName = "arvados-dispatch-lsf"
 	ServiceNameHealth        ServiceName = "arvados-health"
 	ServiceNameWorkbench1    ServiceName = "arvados-workbench1"
 	ServiceNameWorkbench2    ServiceName = "arvados-workbench2"
@@ -597,6 +620,7 @@ func (svcs Services) Map() map[ServiceName]Service {
 		ServiceNameRailsAPI:      svcs.RailsAPI,
 		ServiceNameController:    svcs.Controller,
 		ServiceNameDispatchCloud: svcs.DispatchCloud,
+		ServiceNameDispatchLSF:   svcs.DispatchLSF,
 		ServiceNameHealth:        svcs.Health,
 		ServiceNameWorkbench1:    svcs.Workbench1,
 		ServiceNameWorkbench2:    svcs.Workbench2,