X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cd9e72bd95b32203231f6ccc96ddce9325b30a95..b9e8e790912565619289540a8dc546a5c9c60f6e:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index d9aa92b65d..e2ad7b089d 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -5,6 +5,7 @@
 package arvados
 
 import (
+	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -61,13 +62,10 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 }
 
 type WebDAVCacheConfig struct {
-	TTL                  Duration
-	UUIDTTL              Duration
-	MaxBlockEntries      int
-	MaxCollectionEntries int
-	MaxCollectionBytes   int64
-	MaxUUIDEntries       int
-	MaxSessions          int
+	TTL                Duration
+	MaxBlockEntries    int
+	MaxCollectionBytes int64
+	MaxSessions        int
 }
 
 type UploadDownloadPermission struct {
@@ -101,7 +99,11 @@ type Cluster struct {
 		DisabledAPIs                     StringSet
 		MaxIndexDatabaseRead             int
 		MaxItemsPerResponse              int
+		MaxConcurrentRailsRequests       int
 		MaxConcurrentRequests            int
+		MaxQueuedRequests                int
+		MaxQueueTimeForLockRequests      Duration
+		LogCreateRequestFraction         float64
 		MaxKeepBlobBuffers               int
 		MaxRequestAmplification          int
 		MaxRequestSize                   int
@@ -115,6 +117,7 @@ type Cluster struct {
 		FreezeProjectRequiresDescription bool
 		FreezeProjectRequiresProperties  StringSet
 		UnfreezeProjectRequiresAdmin     bool
+		LockBeforeUpdate                 bool
 	}
 	AuditLogs struct {
 		MaxAge             Duration
@@ -147,6 +150,8 @@ type Cluster struct {
 		BalanceCollectionBuffers int
 		BalanceTimeout           Duration
 		BalanceUpdateLimit       int
+		BalancePullLimit         int
+		BalanceTrashLimit        int
 
 		WebDAVCache WebDAVCacheConfig
 
@@ -165,6 +170,7 @@ type Cluster struct {
 			URL                URL
 			StartTLS           bool
 			InsecureTLS        bool
+			MinTLSVersion      TLSVersion
 			StripDomain        string
 			AppendDomain       string
 			SearchAttribute    string
@@ -203,11 +209,12 @@ type Cluster struct {
 			Enable bool
 			Users  map[string]TestUser
 		}
-		LoginCluster       string
-		RemoteTokenRefresh Duration
-		TokenLifetime      Duration
-		TrustedClients     map[string]struct{}
-		IssueTrustedTokens bool
+		LoginCluster         string
+		RemoteTokenRefresh   Duration
+		TokenLifetime        Duration
+		TrustedClients       map[URL]struct{}
+		TrustPrivateNetworks bool
+		IssueTrustedTokens   bool
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -219,16 +226,18 @@ type Cluster struct {
 		EmailFrom                      string
 	}
 	SystemLogs struct {
-		LogLevel                string
-		Format                  string
-		MaxRequestLogParamsSize int
+		LogLevel                  string
+		Format                    string
+		MaxRequestLogParamsSize   int
+		RequestQueueDumpDirectory string
 	}
 	TLS struct {
 		Certificate string
 		Key         string
 		Insecure    bool
-		Automatic   bool
-		Staging     bool
+		ACME        struct {
+			Server string
+		}
 	}
 	Users struct {
 		ActivatedUsersAreVisibleToOthers      bool
@@ -250,6 +259,14 @@ type Cluster struct {
 		PreferDomainForUsername               string
 		UserSetupMailText                     string
 		RoleGroupsVisibleToAll                bool
+		CanCreateRoleGroups                   bool
+		ActivityLoggingPeriod                 Duration
+		SyncIgnoredGroups                     []string
+		SyncRequiredGroups                    []string
+		SyncUserAccounts                      bool
+		SyncUserAPITokens                     bool
+		SyncUserGroups                        bool
+		SyncUserSSHKeys                       bool
 	}
 	StorageClasses map[string]StorageClassConfig
 	Volumes        map[string]Volume
@@ -292,6 +309,7 @@ type Cluster struct {
 		SSHHelpPageHTML        string
 		SSHHelpHostSuffix      string
 		IdleTimeout            Duration
+		BannerUUID             string
 	}
 }
 
@@ -301,12 +319,13 @@ type StorageClassConfig struct {
 }
 
 type Volume struct {
-	AccessViaHosts   map[URL]VolumeAccess
-	ReadOnly         bool
-	Replication      int
-	StorageClasses   map[string]bool
-	Driver           string
-	DriverParameters json.RawMessage
+	AccessViaHosts         map[URL]VolumeAccess
+	ReadOnly               bool
+	AllowTrashWhenReadOnly bool
+	Replication            int
+	StorageClasses         map[string]bool
+	Driver                 string
+	DriverParameters       json.RawMessage
 }
 
 type S3VolumeDriverParameters struct {
@@ -318,7 +337,6 @@ type S3VolumeDriverParameters struct {
 	Bucket             string
 	LocationConstraint bool
 	V2Signature        bool
-	UseAWSS3v2Driver   bool
 	IndexPageSize      int
 	ConnectTimeout     Duration
 	ReadTimeout        Duration
@@ -395,13 +413,58 @@ func (su *URL) UnmarshalText(text []byte) error {
 }
 
 func (su URL) MarshalText() ([]byte, error) {
-	return []byte(fmt.Sprintf("%s", (*url.URL)(&su).String())), nil
+	return []byte(su.String()), nil
 }
 
 func (su URL) String() string {
 	return (*url.URL)(&su).String()
 }
 
+type TLSVersion uint16
+
+func (v TLSVersion) MarshalText() ([]byte, error) {
+	switch v {
+	case 0:
+		return []byte{}, nil
+	case tls.VersionTLS10:
+		return []byte("1.0"), nil
+	case tls.VersionTLS11:
+		return []byte("1.1"), nil
+	case tls.VersionTLS12:
+		return []byte("1.2"), nil
+	case tls.VersionTLS13:
+		return []byte("1.3"), nil
+	default:
+		return nil, fmt.Errorf("unsupported TLSVersion %x", v)
+	}
+}
+
+func (v *TLSVersion) UnmarshalJSON(text []byte) error {
+	if len(text) > 0 && text[0] == '"' {
+		var s string
+		err := json.Unmarshal(text, &s)
+		if err != nil {
+			return err
+		}
+		text = []byte(s)
+	}
+	switch string(text) {
+	case "":
+		*v = 0
+	case "1.0":
+		*v = tls.VersionTLS10
+	case "1.1":
+		*v = tls.VersionTLS11
+	case "1.2":
+		*v = tls.VersionTLS12
+	case "1.3":
+		*v = tls.VersionTLS13
+	default:
+		return fmt.Errorf("unsupported TLSVersion %q", text)
+	}
+	return nil
+}
+
 type ServiceInstance struct {
 	ListenURL  URL
 	Rendezvous string `json:",omitempty"`
@@ -448,7 +511,6 @@ type ContainersConfig struct {
 	DefaultKeepCacheRAM           ByteSize
 	DispatchPrivateKey            string
 	LogReuseDecisions             bool
-	MaxComputeVMs                 int
 	MaxDispatchAttempts           int
 	MaxRetryAttempts              int
 	MinRetryPeriod                Duration
@@ -457,6 +519,7 @@ type ContainersConfig struct {
 	SupportedDockerImageFormats   StringSet
 	AlwaysUsePreemptibleInstances bool
 	PreemptiblePriceFactor        float64
+	MaximumPriceFactor            float64
 	RuntimeEngine                 string
 	LocalKeepBlobBuffersPerVCPU   int
 	LocalKeepLogsToContainerLog   string
@@ -467,6 +530,7 @@ type ContainersConfig struct {
 	}
 	Logging struct {
 		MaxAge                       Duration
+		SweepInterval                Duration
 		LogBytesPerEvent             int
 		LogSecondsBetweenEvents      Duration
 		LogThrottlePeriod            Duration
@@ -506,11 +570,16 @@ type CloudVMsConfig struct {
 	Enable bool
 
 	BootProbeCommand               string
+	InstanceInitCommand            string
 	DeployRunnerBinary             string
+	DeployPublicKey                bool
 	ImageID                        string
 	MaxCloudOpsPerSecond           int
 	MaxProbesPerSecond             int
 	MaxConcurrentInstanceCreateOps int
+	MaxInstances                   int
+	InitialQuotaEstimate           int
+	SupervisorFraction             float64
 	PollInterval                   Duration
 	ProbeInterval                  Duration
 	SSHPort                        string
@@ -534,9 +603,11 @@ type InstanceTypeMap map[string]InstanceType
 var errDuplicateInstanceTypeName = errors.New("duplicate instance type name")
 
 // UnmarshalJSON does special handling of InstanceTypes:
-// * populate computed fields (Name and Scratch)
-// * error out if InstancesTypes are populated as an array, which was
-//   deprecated in Arvados 1.2.0
+//
+// - populate computed fields (Name and Scratch)
+//
+// - error out if InstancesTypes are populated as an array, which was
+// deprecated in Arvados 1.2.0
 func (it *InstanceTypeMap) UnmarshalJSON(data []byte) error {
 	fixup := func(t InstanceType) (InstanceType, error) {
 		if t.ProviderType == "" {