X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/217aba73f6366cf1af30683baa6d0d5d1e3407a9..2eb88069ea1a778e2a748e4d05244d31912398fa:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index ace33c9ff0..1257d7a838 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -61,13 +61,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 {
@@ -203,11 +200,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
@@ -227,6 +225,9 @@ type Cluster struct {
 		Certificate string
 		Key         string
 		Insecure    bool
+		ACME        struct {
+			Server string
+		}
 	}
 	Users struct {
 		ActivatedUsersAreVisibleToOthers      bool
@@ -248,6 +249,8 @@ type Cluster struct {
 		PreferDomainForUsername               string
 		UserSetupMailText                     string
 		RoleGroupsVisibleToAll                bool
+		CreateRoleGroups                      bool
+		ActivityLoggingPeriod                 Duration
 	}
 	StorageClasses map[string]StorageClassConfig
 	Volumes        map[string]Volume
@@ -260,6 +263,7 @@ type Cluster struct {
 		ArvadosDocsite                   string
 		ArvadosPublicDataDocURL          string
 		DefaultOpenIdPrefix              string
+		DisableSharingURLsUI             bool
 		EnableGettingStartedPopup        bool
 		EnablePublicProjectsPage         bool
 		FileViewersConfigURL             string
@@ -289,6 +293,7 @@ type Cluster struct {
 		SSHHelpPageHTML        string
 		SSHHelpHostSuffix      string
 		IdleTimeout            Duration
+		BannerURL              string
 	}
 }
 
@@ -392,7 +397,7 @@ 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 {
@@ -400,6 +405,7 @@ func (su URL) String() string {
 }
 
 type ServiceInstance struct {
+	ListenURL  URL
 	Rendezvous string `json:",omitempty"`
 }
 
@@ -425,11 +431,11 @@ type CUDAFeatures struct {
 }
 
 type InstanceType struct {
-	Name            string
+	Name            string `json:"-"`
 	ProviderType    string
 	VCPUs           int
 	RAM             ByteSize
-	Scratch         ByteSize
+	Scratch         ByteSize `json:"-"`
 	IncludedScratch ByteSize
 	AddedScratch    ByteSize
 	Price           float64
@@ -463,6 +469,7 @@ type ContainersConfig struct {
 	}
 	Logging struct {
 		MaxAge                       Duration
+		SweepInterval                Duration
 		LogBytesPerEvent             int
 		LogSecondsBetweenEvents      Duration
 		LogThrottlePeriod            Duration
@@ -529,49 +536,25 @@ type InstanceTypeMap map[string]InstanceType
 
 var errDuplicateInstanceTypeName = errors.New("duplicate instance type name")
 
-// UnmarshalJSON handles old config files that provide an array of
-// instance types instead of a hash.
+// 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
 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)
-		}
+		// If t.Scratch is set in the configuration file, it will be ignored and overwritten.
+		// It will also generate a "deprecated or unknown config entry" warning.
+		t.Scratch = t.IncludedScratch + t.AddedScratch
 		return t, nil
 	}
 
 	if len(data) > 0 && data[0] == '[' {
-		var arr []InstanceType
-		err := json.Unmarshal(data, &arr)
-		if err != nil {
-			return err
-		}
-		if len(arr) == 0 {
-			*it = nil
-			return nil
-		}
-		*it = make(map[string]InstanceType, len(arr))
-		for _, t := range arr {
-			if _, ok := (*it)[t.Name]; ok {
-				return errDuplicateInstanceTypeName
-			}
-			t, err := fixup(t)
-			if err != nil {
-				return err
-			}
-			(*it)[t.Name] = t
-		}
-		return nil
+		return fmt.Errorf("InstanceTypes must be specified as a map, not an array, see https://doc.arvados.org/admin/config.html")
 	}
 	var hash map[string]InstanceType
 	err := json.Unmarshal(data, &hash)