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

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 636728f1fd..00438bf340 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -17,9 +17,8 @@ import (
 var DefaultConfigFile = func() string {
 	if path := os.Getenv("ARVADOS_CONFIG"); path != "" {
 		return path
-	} else {
-		return "/etc/arvados/config.yml"
 	}
+	return "/etc/arvados/config.yml"
 }()
 
 type Config struct {
@@ -121,6 +120,7 @@ type Cluster struct {
 		TrashSweepInterval           Duration
 		TrustAllContent              bool
 		ForwardSlashNameSubstitution string
+		S3FolderObjects              bool
 
 		BlobMissingReport        string
 		BalancePeriod            Duration
@@ -158,10 +158,13 @@ type Cluster struct {
 			AlternateEmailAddresses bool
 		}
 		OpenIDConnect struct {
-			Enable       bool
-			Issuer       string
-			ClientID     string
-			ClientSecret string
+			Enable             bool
+			Issuer             string
+			ClientID           string
+			ClientSecret       string
+			EmailClaim         string
+			EmailVerifiedClaim string
+			UsernameClaim      string
 		}
 		PAM struct {
 			Enable             bool
@@ -173,8 +176,13 @@ type Cluster struct {
 			ProviderAppID     string
 			ProviderAppSecret string
 		}
+		Test struct {
+			Enable bool
+			Users  map[string]TestUser
+		}
 		LoginCluster       string
 		RemoteTokenRefresh Duration
+		TokenLifetime      Duration
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -211,6 +219,7 @@ type Cluster struct {
 		UserNotifierEmailFrom                 string
 		UserProfileNotificationAddress        string
 		PreferDomainForUsername               string
+		UserSetupMailText                     string
 	}
 	Volumes   map[string]Volume
 	Workbench struct {
@@ -251,6 +260,7 @@ type Cluster struct {
 		InactivePageHTML       string
 		SSHHelpPageHTML        string
 		SSHHelpHostSuffix      string
+		IdleTimeout            Duration
 	}
 
 	ForceLegacyAPI14 bool
@@ -274,6 +284,7 @@ type S3VolumeDriverParameters struct {
 	Bucket             string
 	LocationConstraint bool
 	V2Signature        bool
+	UseAWSS3v2Driver   bool
 	IndexPageSize      int
 	ConnectTimeout     Duration
 	ReadTimeout        Duration
@@ -310,7 +321,6 @@ type Services struct {
 	Keepbalance    Service
 	Keepproxy      Service
 	Keepstore      Service
-	Nodemanager    Service
 	RailsAPI       Service
 	SSO            Service
 	WebDAVDownload Service
@@ -326,6 +336,11 @@ type Service struct {
 	ExternalURL  URL
 }
 
+type TestUser struct {
+	Email    string
+	Password string
+}
+
 // URL is a url.URL that is also usable as a JSON key/value.
 type URL url.URL
 
@@ -433,23 +448,25 @@ type ContainersConfig struct {
 type CloudVMsConfig struct {
 	Enable bool
 
-	BootProbeCommand     string
-	DeployRunnerBinary   string
-	ImageID              string
-	MaxCloudOpsPerSecond int
-	MaxProbesPerSecond   int
-	PollInterval         Duration
-	ProbeInterval        Duration
-	SSHPort              string
-	SyncInterval         Duration
-	TimeoutBooting       Duration
-	TimeoutIdle          Duration
-	TimeoutProbe         Duration
-	TimeoutShutdown      Duration
-	TimeoutSignal        Duration
-	TimeoutTERM          Duration
-	ResourceTags         map[string]string
-	TagKeyPrefix         string
+	BootProbeCommand               string
+	DeployRunnerBinary             string
+	ImageID                        string
+	MaxCloudOpsPerSecond           int
+	MaxProbesPerSecond             int
+	MaxConcurrentInstanceCreateOps int
+	PollInterval                   Duration
+	ProbeInterval                  Duration
+	SSHPort                        string
+	SyncInterval                   Duration
+	TimeoutBooting                 Duration
+	TimeoutIdle                    Duration
+	TimeoutProbe                   Duration
+	TimeoutShutdown                Duration
+	TimeoutSignal                  Duration
+	TimeoutStaleRunLock            Duration
+	TimeoutTERM                    Duration
+	ResourceTags                   map[string]string
+	TagKeyPrefix                   string
 
 	Driver           string
 	DriverParameters json.RawMessage
@@ -549,7 +566,7 @@ func (ss *StringSet) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	*ss = make(map[string]struct{}, len(hash))
-	for t, _ := range hash {
+	for t := range hash {
 		(*ss)[t] = struct{}{}
 	}
 
@@ -563,7 +580,6 @@ const (
 	ServiceNameController    ServiceName = "arvados-controller"
 	ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
 	ServiceNameHealth        ServiceName = "arvados-health"
-	ServiceNameNodemanager   ServiceName = "arvados-node-manager"
 	ServiceNameWorkbench1    ServiceName = "arvados-workbench1"
 	ServiceNameWorkbench2    ServiceName = "arvados-workbench2"
 	ServiceNameWebsocket     ServiceName = "arvados-ws"
@@ -581,7 +597,6 @@ func (svcs Services) Map() map[ServiceName]Service {
 		ServiceNameController:    svcs.Controller,
 		ServiceNameDispatchCloud: svcs.DispatchCloud,
 		ServiceNameHealth:        svcs.Health,
-		ServiceNameNodemanager:   svcs.Nodemanager,
 		ServiceNameWorkbench1:    svcs.Workbench1,
 		ServiceNameWorkbench2:    svcs.Workbench2,
 		ServiceNameWebsocket:     svcs.Websocket,