X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c2b55f26cbf4e0c963e6d30aa63c11898bfc3a09..3e8f849f40aed8fe2f6ce7e41c674195d177c52b:/sdk/go/arvados/config.go diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 62ea8b319c..72128a9dcd 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -60,6 +60,7 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) { type WebDAVCacheConfig struct { TTL Duration UUIDTTL Duration + MaxBlockEntries int MaxCollectionEntries int MaxCollectionBytes int64 MaxPermissionEntries int @@ -80,6 +81,8 @@ type Cluster struct { DisabledAPIs StringSet MaxIndexDatabaseRead int MaxItemsPerResponse int + MaxConcurrentRequests int + MaxKeepBlobBuffers int MaxRequestAmplification int MaxRequestSize int RailsSessionSecretToken string @@ -87,6 +90,7 @@ type Cluster struct { SendTimeout Duration WebsocketClientEventQueue int WebsocketServerEventQueue int + KeepServiceRequestTimeout Duration } AuditLogs struct { MaxAge Duration @@ -94,13 +98,19 @@ type Cluster struct { UnloggedAttributes StringSet } Collections struct { - BlobSigning bool - BlobSigningKey string - BlobSigningTTL Duration - CollectionVersioning bool - DefaultTrashLifetime Duration - DefaultReplication int - ManagedProperties map[string]struct { + BlobSigning bool + BlobSigningKey string + BlobSigningTTL Duration + BlobTrash bool + BlobTrashLifetime Duration + BlobTrashCheckInterval Duration + BlobTrashConcurrency int + BlobDeleteConcurrency int + BlobReplicateConcurrency int + CollectionVersioning bool + DefaultTrashLifetime Duration + DefaultReplication int + ManagedProperties map[string]struct { Value interface{} Function string Protected bool @@ -109,14 +119,26 @@ type Cluster struct { TrashSweepInterval Duration TrustAllContent bool + BlobMissingReport string + BalancePeriod Duration + BalanceCollectionBatch int + BalanceCollectionBuffers int + WebDAVCache WebDAVCacheConfig } Git struct { + GitCommand string + GitoliteHome string Repositories string } Login struct { - ProviderAppSecret string - ProviderAppID string + GoogleClientID string + GoogleClientSecret string + GoogleAlternateEmailAddresses bool + ProviderAppID string + ProviderAppSecret string + LoginCluster string + RemoteTokenRefresh Duration } Mail struct { MailchimpAPIKey string @@ -142,7 +164,6 @@ type Cluster struct { AdminNotifierEmailFrom string AutoAdminFirstUser bool AutoAdminUserWithEmail string - AnonymousUserToken string AutoSetupNewUsers bool AutoSetupNewUsersWithRepository bool AutoSetupNewUsersWithVmUUID string @@ -153,7 +174,9 @@ type Cluster struct { NewUsersAreActive bool UserNotifierEmailFrom string UserProfileNotificationAddress string + PreferDomainForUsername string } + Volumes map[string]Volume Workbench struct { ActivationContactLink string APIClientConnectTimeout Duration @@ -188,11 +211,55 @@ type Cluster struct { } UserProfileFormMessage string VocabularyURL string + WelcomePageHTML string + InactivePageHTML string } EnableBetaController14287 bool } +type Volume struct { + AccessViaHosts map[URL]VolumeAccess + ReadOnly bool + Replication int + StorageClasses map[string]bool + Driver string + DriverParameters json.RawMessage +} + +type S3VolumeDriverParameters struct { + AccessKey string + SecretKey string + Endpoint string + Region string + Bucket string + LocationConstraint bool + IndexPageSize int + ConnectTimeout Duration + ReadTimeout Duration + RaceWindow Duration + UnsafeDelete bool +} + +type AzureVolumeDriverParameters struct { + StorageAccountName string + StorageAccountKey string + StorageBaseURL string + ContainerName string + RequestTimeout Duration + ListBlobsRetryDelay Duration + ListBlobsMaxAttempts int +} + +type DirectoryVolumeDriverParameters struct { + Root string + Serialize bool +} + +type VolumeAccess struct { + ReadOnly bool +} + type Services struct { Composer Service Controller Service @@ -236,7 +303,13 @@ func (su URL) MarshalText() ([]byte, error) { return []byte(fmt.Sprintf("%s", (*url.URL)(&su).String())), nil } -type ServiceInstance struct{} +func (su URL) String() string { + return (*url.URL)(&su).String() +} + +type ServiceInstance struct { + Rendezvous string `json:",omitempty"` +} type PostgreSQL struct { Connection PostgreSQLConnection @@ -282,13 +355,8 @@ type ContainersConfig struct { 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 @@ -303,9 +371,10 @@ type ContainersConfig struct { LogUpdateSize ByteSize } SLURM struct { - PrioritySpread int64 - SbatchArgumentsList []string - Managed struct { + PrioritySpread int64 + SbatchArgumentsList []string + SbatchEnvironmentVariables map[string]string + Managed struct { DNSServerConfDir string DNSServerConfTemplate string DNSServerReloadCommand string