X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/86b7903116608ac3a8314437639cb61d774fb510..d99713e58b0b9eb284fc3ea7f4008fa80bc5bcc5:/sdk/go/arvados/config.go?ds=sidebyside

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 02043fb6d1..4a7221f053 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -81,6 +81,8 @@ type Cluster struct {
 		DisabledAPIs                   StringSet
 		MaxIndexDatabaseRead           int
 		MaxItemsPerResponse            int
+		MaxConcurrentRequests          int
+		MaxKeepBlobBuffers             int
 		MaxRequestAmplification        int
 		MaxRequestSize                 int
 		RailsSessionSecretToken        string
@@ -88,6 +90,7 @@ type Cluster struct {
 		SendTimeout                    Duration
 		WebsocketClientEventQueue      int
 		WebsocketServerEventQueue      int
+		KeepServiceRequestTimeout      Duration
 	}
 	AuditLogs struct {
 		MaxAge             Duration
@@ -95,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
@@ -113,11 +122,15 @@ type Cluster struct {
 		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
@@ -154,6 +167,7 @@ type Cluster struct {
 		UserNotifierEmailFrom                 string
 		UserProfileNotificationAddress        string
 	}
+	Volumes   map[string]Volume
 	Workbench struct {
 		ActivationContactLink            string
 		APIClientConnectTimeout          Duration
@@ -193,6 +207,48 @@ type Cluster struct {
 	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 +292,16 @@ 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 is normally empty; when changing the URL of a
+	// Keepstore service, Rendezvous can be set to the old URL to
+	// preserve rendezvous ordering.
+	Rendezvous string `json:",omitempty"`
+}
 
 type PostgreSQL struct {
 	Connection     PostgreSQLConnection