Merge branch '21666-provision-test-improvement'

[arvados.git] / lib / config / deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index d53e7ae34096363f5f22c810d02d2da75c682f58..0db3de7fc99d987cce1cf43dd5a982c590653272 100644 (file)
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -494,17 +494,8 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
        if oc.Cache.TTL != nil {
                cluster.Collections.WebDAVCache.TTL = *oc.Cache.TTL
        }
-       if oc.Cache.UUIDTTL != nil {
-               cluster.Collections.WebDAVCache.UUIDTTL = *oc.Cache.UUIDTTL
-       }
-       if oc.Cache.MaxCollectionEntries != nil {
-               cluster.Collections.WebDAVCache.MaxCollectionEntries = *oc.Cache.MaxCollectionEntries
-       }
        if oc.Cache.MaxCollectionBytes != nil {
-               cluster.Collections.WebDAVCache.MaxCollectionBytes = *oc.Cache.MaxCollectionBytes
-       }
-       if oc.Cache.MaxUUIDEntries != nil {
-               cluster.Collections.WebDAVCache.MaxUUIDEntries = *oc.Cache.MaxUUIDEntries
+               cluster.Collections.WebDAVCache.MaxCollectionBytes = arvados.ByteSize(*oc.Cache.MaxCollectionBytes)
        }
        if oc.AnonymousTokens != nil {
                if len(*oc.AnonymousTokens) > 0 {
@@ -519,56 +510,6 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
        return nil
 }
 
-const defaultGitHttpdConfigPath = "/etc/arvados/git-httpd/git-httpd.yml"
-
-type oldGitHttpdConfig struct {
-       Client          *arvados.Client
-       Listen          *string
-       GitCommand      *string
-       GitoliteHome    *string
-       RepoRoot        *string
-       ManagementToken *string
-}
-
-func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error {
-       if ldr.GitHttpdPath == "" {
-               return nil
-       }
-       var oc oldGitHttpdConfig
-       err := ldr.loadOldConfigHelper("arv-git-httpd", ldr.GitHttpdPath, &oc)
-       if os.IsNotExist(err) && ldr.GitHttpdPath == defaultGitHttpdConfigPath {
-               return nil
-       } else if err != nil {
-               return err
-       }
-
-       cluster, err := cfg.GetCluster("")
-       if err != nil {
-               return err
-       }
-
-       loadOldClientConfig(cluster, oc.Client)
-
-       if oc.Listen != nil {
-               cluster.Services.GitHTTP.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
-       }
-       if oc.ManagementToken != nil {
-               cluster.ManagementToken = *oc.ManagementToken
-       }
-       if oc.GitCommand != nil {
-               cluster.Git.GitCommand = *oc.GitCommand
-       }
-       if oc.GitoliteHome != nil {
-               cluster.Git.GitoliteHome = *oc.GitoliteHome
-       }
-       if oc.RepoRoot != nil {
-               cluster.Git.Repositories = *oc.RepoRoot
-       }
-
-       cfg.Clusters[cluster.ClusterID] = *cluster
-       return nil
-}
-
 const defaultKeepBalanceConfigPath = "/etc/arvados/keep-balance/keep-balance.yml"
 
 type oldKeepBalanceConfig struct {