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

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 6a90c30ce4..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
 	}
 }
 
@@ -348,6 +353,7 @@ type Services struct {
 	Controller     Service
 	DispatchCloud  Service
 	DispatchLSF    Service
+	DispatchSLURM  Service
 	GitHTTP        Service
 	GitSSH         Service
 	Health         Service
@@ -391,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 {
@@ -399,6 +405,7 @@ func (su URL) String() string {
 }
 
 type ServiceInstance struct {
+	ListenURL  URL
 	Rendezvous string `json:",omitempty"`
 }
 
@@ -462,6 +469,7 @@ type ContainersConfig struct {
 	}
 	Logging struct {
 		MaxAge                       Duration
+		SweepInterval                Duration
 		LogBytesPerEvent             int
 		LogSecondsBetweenEvents      Duration
 		LogThrottlePeriod            Duration
@@ -529,9 +537,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 == "" {
@@ -605,6 +615,7 @@ const (
 	ServiceNameController    ServiceName = "arvados-controller"
 	ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
 	ServiceNameDispatchLSF   ServiceName = "arvados-dispatch-lsf"
+	ServiceNameDispatchSLURM ServiceName = "crunch-dispatch-slurm"
 	ServiceNameGitHTTP       ServiceName = "arvados-git-httpd"
 	ServiceNameHealth        ServiceName = "arvados-health"
 	ServiceNameKeepbalance   ServiceName = "keep-balance"
@@ -624,6 +635,7 @@ func (svcs Services) Map() map[ServiceName]Service {
 		ServiceNameController:    svcs.Controller,
 		ServiceNameDispatchCloud: svcs.DispatchCloud,
 		ServiceNameDispatchLSF:   svcs.DispatchLSF,
+		ServiceNameDispatchSLURM: svcs.DispatchSLURM,
 		ServiceNameGitHTTP:       svcs.GitHTTP,
 		ServiceNameHealth:        svcs.Health,
 		ServiceNameKeepbalance:   svcs.Keepbalance,