X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/97d368d1f14a17b0c4d847a22b51444b577f4bab..8b873a9b3b8865a4d451263e48b49122b9c32759:/sdk/go/arvados/config.go diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 275eb9e190..db4e6dcd89 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,12 +57,14 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) { } } -type API struct { - MaxItemsPerResponse int - MaxRequestAmplification int - RequestTimeout Duration +type WebDAVCacheConfig struct { + TTL Duration + UUIDTTL Duration + MaxCollectionEntries int + MaxCollectionBytes int64 + MaxPermissionEntries int + MaxUUIDEntries int } - type Cluster struct { ClusterID string `json:"-"` ManagementToken string @@ -65,28 +74,147 @@ type Cluster struct { Containers ContainersConfig RemoteClusters map[string]RemoteCluster PostgreSQL PostgreSQL - API API - SystemLogs SystemLogs - TLS TLS + + API struct { + AsyncPermissionsUpdateInterval Duration + DisabledAPIs StringSet + MaxIndexDatabaseRead int + MaxItemsPerResponse int + MaxRequestAmplification int + MaxRequestSize int + RailsSessionSecretToken string + RequestTimeout Duration + SendTimeout Duration + WebsocketClientEventQueue int + WebsocketServerEventQueue int + } + AuditLogs struct { + MaxAge Duration + MaxDeleteBatch int + UnloggedAttributes StringSet + } + Collections struct { + BlobSigning bool + BlobSigningKey string + BlobSigningTTL Duration + CollectionVersioning bool + DefaultTrashLifetime Duration + DefaultReplication int + ManagedProperties map[string]struct { + Value interface{} + Function string + Protected bool + } + PreserveVersionIfIdle Duration + TrashSweepInterval Duration + TrustAllContent bool + + WebDAVCache WebDAVCacheConfig + } + Git struct { + Repositories string + } + Login struct { + ProviderAppSecret string + ProviderAppID string + } + Mail struct { + MailchimpAPIKey string + MailchimpListID string + SendUserSetupNotificationEmail bool + IssueReporterEmailFrom string + IssueReporterEmailTo string + SupportEmailAddress string + EmailFrom string + } + SystemLogs struct { + LogLevel string + Format string + MaxRequestLogParamsSize int + } + TLS struct { + Certificate string + Key string + Insecure bool + } + Users struct { + AnonymousUserToken string + AdminNotifierEmailFrom string + AutoAdminFirstUser bool + AutoAdminUserWithEmail string + AutoSetupNewUsers bool + AutoSetupNewUsersWithRepository bool + AutoSetupNewUsersWithVmUUID string + AutoSetupUsernameBlacklist StringSet + EmailSubjectPrefix string + NewInactiveUserNotificationRecipients StringSet + NewUserNotificationRecipients StringSet + NewUsersAreActive bool + UserNotifierEmailFrom string + UserProfileNotificationAddress string + } + Workbench struct { + ActivationContactLink string + APIClientConnectTimeout Duration + APIClientReceiveTimeout Duration + APIResponseCompression bool + ApplicationMimetypesWithViewIcon StringSet + ArvadosDocsite string + ArvadosPublicDataDocURL string + DefaultOpenIdPrefix string + EnableGettingStartedPopup bool + EnablePublicProjectsPage bool + FileViewersConfigURL string + LogViewerMaxBytes ByteSize + MultiSiteSearch string + ProfilingEnabled bool + Repositories bool + RepositoryCache string + RunningJobLogRecordsToFetch int + SecretKeyBase string + ShowRecentCollectionsOnDashboard bool + ShowUserAgreementInline bool + ShowUserNotifications bool + SiteName string + Theme string + UserProfileFormFields map[string]struct { + Type string + FormFieldTitle string + FormFieldDescription string + Required bool + Position int + Options map[string]struct{} + } + UserProfileFormMessage string + VocabularyURL string + } + + EnableBetaController14287 bool } type Services struct { - Controller Service - DispatchCloud Service - Health Service - Keepbalance Service - Keepproxy Service - Keepstore Service - Nodemanager Service - RailsAPI Service - WebDAV Service - Websocket Service - Workbench1 Service - Workbench2 Service + Composer Service + Controller Service + DispatchCloud Service + GitHTTP Service + GitSSH Service + Health Service + Keepbalance Service + Keepproxy Service + Keepstore Service + Nodemanager Service + RailsAPI Service + SSO Service + WebDAVDownload Service + WebDAV Service + WebShell Service + Websocket Service + Workbench1 Service + Workbench2 Service } type Service struct { - InternalURLs map[URL]ServiceInstance `json:",omitempty"` + InternalURLs map[URL]ServiceInstance ExternalURL URL } @@ -109,12 +237,6 @@ func (su URL) MarshalText() ([]byte, error) { type ServiceInstance struct{} -type SystemLogs struct { - LogLevel string - Format string - MaxRequestLogParamsSize int -} - type PostgreSQL struct { Connection PostgreSQLConnection ConnectionPool int @@ -123,15 +245,11 @@ type PostgreSQL struct { type PostgreSQLConnection map[string]string type RemoteCluster struct { - // API endpoint host or host:port; default is {id}.arvadosapi.com - Host string - // Perform a proxy request when a local client requests an - // object belonging to this remote. - Proxy bool - // Scheme, default "https". Can be set to "http" for testing. - Scheme string - // Disable TLS verify. Can be set to true for testing. - Insecure bool + Host string + Proxy bool + Scheme string + Insecure bool + ActivateUsers bool } type InstanceType struct { @@ -147,9 +265,51 @@ type InstanceType struct { } type ContainersConfig struct { - CloudVMs CloudVMsConfig - DispatchPrivateKey string - StaleLockTimeout Duration + 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 StringSet + UsePreemptibleInstances bool + + JobsAPI struct { + Enable string + GitInternalDir string + } + Logging struct { + MaxAge Duration + LogBytesPerEvent int + LogSecondsBetweenEvents int + LogThrottlePeriod Duration + LogThrottleBytes int + LogThrottleLines int + LimitLogBytesPerJob int + LogPartialLineThrottlePeriod Duration + LogUpdatePeriod Duration + LogUpdateSize ByteSize + } + SLURM struct { + PrioritySpread int64 + SbatchArgumentsList []string + SbatchEnvironmentVariables map[string]string + Managed struct { + DNSServerConfDir string + DNSServerConfTemplate string + DNSServerReloadCommand string + DNSServerUpdateCommand string + ComputeNodeDomain string + ComputeNodeNameservers StringSet + AssignNodeHostname string + } + } } type CloudVMsConfig struct { @@ -169,6 +329,8 @@ type CloudVMsConfig struct { TimeoutShutdown Duration TimeoutSignal Duration TimeoutTERM Duration + ResourceTags map[string]string + TagKeyPrefix string Driver string DriverParameters json.RawMessage @@ -232,6 +394,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 ( @@ -267,9 +463,3 @@ func (svcs Services) Map() map[ServiceName]Service { ServiceNameKeepstore: svcs.Keepstore, } } - -type TLS struct { - Certificate string - Key string - Insecure bool -}