X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cfb6b08b94d423a768862481b629cfb21fcc70a2..7c3e13d4876a8e37feffee3cdaebc44b20b7b61b:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 07be5d51b6..29dd62ac1e 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -9,11 +9,18 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"os"
 
 	"git.curoverse.com/arvados.git/sdk/go/config"
 )
 
-const DefaultConfigFile = "/etc/arvados/config.yml"
+var DefaultConfigFile = func() string {
+	if path := os.Getenv("ARVADOS_CONFIG"); path != "" {
+		return path
+	} else {
+		return "/etc/arvados/config.yml"
+	}
+}()
 
 type Config struct {
 	Clusters map[string]Cluster
@@ -50,6 +57,15 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 	}
 }
 
+type WebDAVCacheConfig struct {
+	TTL                  Duration
+	UUIDTTL              Duration
+	MaxBlockEntries      int
+	MaxCollectionEntries int
+	MaxCollectionBytes   int64
+	MaxPermissionEntries int
+	MaxUUIDEntries       int
+}
 type Cluster struct {
 	ClusterID       string `json:"-"`
 	ManagementToken string
@@ -62,18 +78,22 @@ type Cluster struct {
 
 	API struct {
 		AsyncPermissionsUpdateInterval Duration
-		DisabledAPIs                   []string
+		DisabledAPIs                   StringSet
 		MaxIndexDatabaseRead           int
 		MaxItemsPerResponse            int
 		MaxRequestAmplification        int
 		MaxRequestSize                 int
 		RailsSessionSecretToken        string
 		RequestTimeout                 Duration
+		SendTimeout                    Duration
+		WebsocketClientEventQueue      int
+		WebsocketServerEventQueue      int
+		KeepServiceRequestTimeout      Duration
 	}
 	AuditLogs struct {
 		MaxAge             Duration
 		MaxDeleteBatch     int
-		UnloggedAttributes []string
+		UnloggedAttributes StringSet
 	}
 	Collections struct {
 		BlobSigning          bool
@@ -90,13 +110,19 @@ type Cluster struct {
 		PreserveVersionIfIdle Duration
 		TrashSweepInterval    Duration
 		TrustAllContent       bool
+
+		WebDAVCache WebDAVCacheConfig
 	}
 	Git struct {
+		GitCommand   string
+		GitoliteHome string
 		Repositories string
 	}
 	Login struct {
-		ProviderAppSecret string
-		ProviderAppID     string
+		ProviderAppSecret  string
+		ProviderAppID      string
+		LoginCluster       string
+		RemoteTokenRefresh Duration
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -125,10 +151,10 @@ type Cluster struct {
 		AutoSetupNewUsers                     bool
 		AutoSetupNewUsersWithRepository       bool
 		AutoSetupNewUsersWithVmUUID           string
-		AutoSetupUsernameBlacklist            []string
+		AutoSetupUsernameBlacklist            StringSet
 		EmailSubjectPrefix                    string
-		NewInactiveUserNotificationRecipients []string
-		NewUserNotificationRecipients         []string
+		NewInactiveUserNotificationRecipients StringSet
+		NewUserNotificationRecipients         StringSet
 		NewUsersAreActive                     bool
 		UserNotifierEmailFrom                 string
 		UserProfileNotificationAddress        string
@@ -138,7 +164,7 @@ type Cluster struct {
 		APIClientConnectTimeout          Duration
 		APIClientReceiveTimeout          Duration
 		APIResponseCompression           bool
-		ApplicationMimetypesWithViewIcon map[string]struct{}
+		ApplicationMimetypesWithViewIcon StringSet
 		ArvadosDocsite                   string
 		ArvadosPublicDataDocURL          string
 		DefaultOpenIdPrefix              string
@@ -246,24 +272,23 @@ type InstanceType struct {
 
 type ContainersConfig struct {
 	CloudVMs                    CloudVMsConfig
+	CrunchRunCommand            string
+	CrunchRunArgumentsList      []string
 	DefaultKeepCacheRAM         ByteSize
 	DispatchPrivateKey          string
 	LogReuseDecisions           bool
 	MaxComputeVMs               int
 	MaxDispatchAttempts         int
 	MaxRetryAttempts            int
+	MinRetryPeriod              Duration
+	ReserveExtraRAM             ByteSize
 	StaleLockTimeout            Duration
-	SupportedDockerImageFormats []string
+	SupportedDockerImageFormats StringSet
 	UsePreemptibleInstances     bool
 
 	JobsAPI struct {
-		Enable                  string
-		GitInternalDir          string
-		DefaultDockerImage      string
-		CrunchJobWrapper        string
-		CrunchJobUser           string
-		CrunchRefreshTrigger    string
-		ReuseJobIfOutputsDiffer bool
+		Enable         string
+		GitInternalDir string
 	}
 	Logging struct {
 		MaxAge                       Duration
@@ -278,13 +303,16 @@ type ContainersConfig struct {
 		LogUpdateSize                ByteSize
 	}
 	SLURM struct {
-		Managed struct {
+		PrioritySpread             int64
+		SbatchArgumentsList        []string
+		SbatchEnvironmentVariables map[string]string
+		Managed                    struct {
 			DNSServerConfDir       string
 			DNSServerConfTemplate  string
 			DNSServerReloadCommand string
 			DNSServerUpdateCommand string
 			ComputeNodeDomain      string
-			ComputeNodeNameservers []string
+			ComputeNodeNameservers StringSet
 			AssignNodeHostname     string
 		}
 	}
@@ -372,6 +400,40 @@ func (it *InstanceTypeMap) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+type StringSet map[string]struct{}
+
+// UnmarshalJSON handles old config files that provide an array of
+// instance types instead of a hash.
+func (ss *StringSet) UnmarshalJSON(data []byte) error {
+	if len(data) > 0 && data[0] == '[' {
+		var arr []string
+		err := json.Unmarshal(data, &arr)
+		if err != nil {
+			return err
+		}
+		if len(arr) == 0 {
+			*ss = nil
+			return nil
+		}
+		*ss = make(map[string]struct{}, len(arr))
+		for _, t := range arr {
+			(*ss)[t] = struct{}{}
+		}
+		return nil
+	}
+	var hash map[string]struct{}
+	err := json.Unmarshal(data, &hash)
+	if err != nil {
+		return err
+	}
+	*ss = make(map[string]struct{}, len(hash))
+	for t, _ := range hash {
+		(*ss)[t] = struct{}{}
+	}
+
+	return nil
+}
+
 type ServiceName string
 
 const (