18874: Merge commit '6f8dcb2b13f3058db656908fb26b09e23b527f08' into 18874-merge-wb2

[arvados.git] / sdk / go / arvados / config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index fbbcb78ec2991b00aca4f4b2f4e94fb7ac209760..a3e54952da483c46a87416b200291bc65b66304b 100644 (file)
--- 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"
@@ -99,6 +100,9 @@ type Cluster struct {
                MaxIndexDatabaseRead             int
                MaxItemsPerResponse              int
                MaxConcurrentRequests            int
+               MaxQueuedRequests                int
+               MaxQueueTimeForLockRequests      Duration
+               LogCreateRequestFraction         float64
                MaxKeepBlobBuffers               int
                MaxRequestAmplification          int
                MaxRequestSize                   int
@@ -112,6 +116,7 @@ type Cluster struct {
                FreezeProjectRequiresDescription bool
                FreezeProjectRequiresProperties  StringSet
                UnfreezeProjectRequiresAdmin     bool
+               LockBeforeUpdate                 bool
        }
        AuditLogs struct {
                MaxAge             Duration
@@ -162,6 +167,7 @@ type Cluster struct {
                        URL                URL
                        StartTLS           bool
                        InsecureTLS        bool
+                       MinTLSVersion      TLSVersion
                        StripDomain        string
                        AppendDomain       string
                        SearchAttribute    string
@@ -217,9 +223,10 @@ 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
@@ -251,6 +258,12 @@ type Cluster struct {
                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
@@ -293,7 +306,7 @@ type Cluster struct {
                SSHHelpPageHTML        string
                SSHHelpHostSuffix      string
                IdleTimeout            Duration
-               BannerURL              string
+               BannerUUID             string
        }
 }
 
@@ -320,7 +333,6 @@ type S3VolumeDriverParameters struct {
        Bucket             string
        LocationConstraint bool
        V2Signature        bool
-       UseAWSS3v2Driver   bool
        IndexPageSize      int
        ConnectTimeout     Duration
        ReadTimeout        Duration
@@ -404,6 +416,51 @@ 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"`
@@ -450,7 +507,6 @@ type ContainersConfig struct {
        DefaultKeepCacheRAM           ByteSize
        DispatchPrivateKey            string
        LogReuseDecisions             bool
-       MaxComputeVMs                 int
        MaxDispatchAttempts           int
        MaxRetryAttempts              int
        MinRetryPeriod                Duration
@@ -509,11 +565,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