X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5bc5b8c150860a22d7a66b14aedddf30e270c7b6..75b4699bdfe75c714cc4163e0f726f4987541fa1:/sdk/go/arvados/config.go?ds=sidebyside

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index ca39d6b265..38de6b8ea4 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -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
@@ -135,6 +138,9 @@ type Cluster struct {
 		GoogleClientID                string
 		GoogleClientSecret            string
 		GoogleAlternateEmailAddresses bool
+		PAM                           bool
+		PAMService                    string
+		PAMDefaultEmailDomain         string
 		ProviderAppID                 string
 		ProviderAppSecret             string
 		LoginCluster                  string
@@ -213,6 +219,8 @@ type Cluster struct {
 		VocabularyURL          string
 		WelcomePageHTML        string
 		InactivePageHTML       string
+		SSHHelpPageHTML        string
+		SSHHelpHostSuffix      string
 	}
 
 	ForceLegacyAPI14 bool
@@ -361,7 +369,7 @@ type ContainersConfig struct {
 	Logging struct {
 		MaxAge                       Duration
 		LogBytesPerEvent             int
-		LogSecondsBetweenEvents      int
+		LogSecondsBetweenEvents      Duration
 		LogThrottlePeriod            Duration
 		LogThrottleBytes             int
 		LogThrottleLines             int
@@ -418,6 +426,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)
@@ -433,19 +459,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
 		}
@@ -461,8 +477,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
 	}