X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/400210f8c9d8b111a3efdaa76c8be579ea5666cb..5763409818cd2ab68c0f59b6a97d0c3df090907f:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 7c1c353809..817f5b7a69 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"os"
 
-	"git.curoverse.com/arvados.git/sdk/go/config"
+	"git.arvados.org/arvados.git/sdk/go/config"
 )
 
 var DefaultConfigFile = func() string {
@@ -23,7 +23,8 @@ var DefaultConfigFile = func() string {
 }()
 
 type Config struct {
-	Clusters map[string]Cluster
+	Clusters         map[string]Cluster
+	AutoReloadConfig bool
 }
 
 // GetConfig returns the current system config, loading it from
@@ -66,6 +67,7 @@ type WebDAVCacheConfig struct {
 	MaxPermissionEntries int
 	MaxUUIDEntries       int
 }
+
 type Cluster struct {
 	ClusterID       string `json:"-"`
 	ManagementToken string
@@ -115,9 +117,10 @@ type Cluster struct {
 			Function  string
 			Protected bool
 		}
-		PreserveVersionIfIdle Duration
-		TrashSweepInterval    Duration
-		TrustAllContent       bool
+		PreserveVersionIfIdle        Duration
+		TrashSweepInterval           Duration
+		TrustAllContent              bool
+		ForwardSlashNameSubstitution string
 
 		BlobMissingReport        string
 		BalancePeriod            Duration
@@ -132,10 +135,31 @@ type Cluster struct {
 		Repositories string
 	}
 	Login struct {
-		ProviderAppSecret  string
-		ProviderAppID      string
-		LoginCluster       string
-		RemoteTokenRefresh Duration
+		LDAP struct {
+			Enable             bool
+			URL                URL
+			StartTLS           bool
+			InsecureTLS        bool
+			StripDomain        string
+			AppendDomain       string
+			SearchAttribute    string
+			SearchBindUser     string
+			SearchBindPassword string
+			SearchBase         string
+			SearchFilters      string
+			EmailAttribute     string
+			UsernameAttribute  string
+		}
+		GoogleClientID                string
+		GoogleClientSecret            string
+		GoogleAlternateEmailAddresses bool
+		PAM                           bool
+		PAMService                    string
+		PAMDefaultEmailDomain         string
+		ProviderAppID                 string
+		ProviderAppSecret             string
+		LoginCluster                  string
+		RemoteTokenRefresh            Duration
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -171,6 +195,7 @@ type Cluster struct {
 		NewUsersAreActive                     bool
 		UserNotifierEmailFrom                 string
 		UserProfileNotificationAddress        string
+		PreferDomainForUsername               string
 	}
 	Volumes   map[string]Volume
 	Workbench struct {
@@ -207,9 +232,13 @@ type Cluster struct {
 		}
 		UserProfileFormMessage string
 		VocabularyURL          string
+		WelcomePageHTML        string
+		InactivePageHTML       string
+		SSHHelpPageHTML        string
+		SSHHelpHostSuffix      string
 	}
 
-	EnableBetaController14287 bool
+	ForceLegacyAPI14 bool
 }
 
 type Volume struct {
@@ -355,7 +384,7 @@ type ContainersConfig struct {
 	Logging struct {
 		MaxAge                       Duration
 		LogBytesPerEvent             int
-		LogSecondsBetweenEvents      int
+		LogSecondsBetweenEvents      Duration
 		LogThrottlePeriod            Duration
 		LogThrottleBytes             int
 		LogThrottleLines             int
@@ -384,6 +413,7 @@ type CloudVMsConfig struct {
 	Enable bool
 
 	BootProbeCommand     string
+	DeployRunnerBinary   string
 	ImageID              string
 	MaxCloudOpsPerSecond int
 	MaxProbesPerSecond   int
@@ -411,6 +441,24 @@ var errDuplicateInstanceTypeName = errors.New("duplicate instance type name")
 // UnmarshalJSON handles old config files that provide an array of
 // instance types instead of a hash.
 func (it *InstanceTypeMap) UnmarshalJSON(data []byte) error {
+	fixup := func(t InstanceType) (InstanceType, error) {
+		if t.ProviderType == "" {
+			t.ProviderType = t.Name
+		}
+		if t.Scratch == 0 {
+			t.Scratch = t.IncludedScratch + t.AddedScratch
+		} else if t.AddedScratch == 0 {
+			t.AddedScratch = t.Scratch - t.IncludedScratch
+		} else if t.IncludedScratch == 0 {
+			t.IncludedScratch = t.Scratch - t.AddedScratch
+		}
+
+		if t.Scratch != (t.IncludedScratch + t.AddedScratch) {
+			return t, fmt.Errorf("InstanceType %q: Scratch != (IncludedScratch + AddedScratch)", t.Name)
+		}
+		return t, nil
+	}
+
 	if len(data) > 0 && data[0] == '[' {
 		var arr []InstanceType
 		err := json.Unmarshal(data, &arr)
@@ -426,19 +474,9 @@ func (it *InstanceTypeMap) UnmarshalJSON(data []byte) error {
 			if _, ok := (*it)[t.Name]; ok {
 				return errDuplicateInstanceTypeName
 			}
-			if t.ProviderType == "" {
-				t.ProviderType = t.Name
-			}
-			if t.Scratch == 0 {
-				t.Scratch = t.IncludedScratch + t.AddedScratch
-			} else if t.AddedScratch == 0 {
-				t.AddedScratch = t.Scratch - t.IncludedScratch
-			} else if t.IncludedScratch == 0 {
-				t.IncludedScratch = t.Scratch - t.AddedScratch
-			}
-
-			if t.Scratch != (t.IncludedScratch + t.AddedScratch) {
-				return fmt.Errorf("%v: Scratch != (IncludedScratch + AddedScratch)", t.Name)
+			t, err := fixup(t)
+			if err != nil {
+				return err
 			}
 			(*it)[t.Name] = t
 		}
@@ -454,8 +492,9 @@ func (it *InstanceTypeMap) UnmarshalJSON(data []byte) error {
 	*it = InstanceTypeMap(hash)
 	for name, t := range *it {
 		t.Name = name
-		if t.ProviderType == "" {
-			t.ProviderType = name
+		t, err := fixup(t)
+		if err != nil {
+			return err
 		}
 		(*it)[name] = t
 	}