Merge branch '21815-trigrams-exclude-ids'

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

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index e9c5da1064848fe5917cfa882d937302e2b33c29..b567cdbaa5c3cf808e5d0e399f3169f2d3648fe5 100644 (file)
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -31,6 +31,10 @@ type deprCluster struct {
                ProviderAppID                 *string
                ProviderAppSecret             *string
        }
+       Mail struct {
+               SendUserSetupNotificationEmail *bool
+               SupportEmailAddress            *string
+       }
 }
 
 type deprecatedConfig struct {
@@ -87,6 +91,14 @@ func (ldr *Loader) applyDeprecatedConfig(cfg *arvados.Config) error {
                if dst, n := &cluster.API.MaxRequestAmplification, dcluster.RequestLimits.MultiClusterRequestConcurrency; n != nil && *n != *dst {
                        *dst = *n
                }
+               if dst, addr := &cluster.Users.SupportEmailAddress, dcluster.Mail.SupportEmailAddress; addr != nil {
+                       *dst = *addr
+                       ldr.Logger.Warnf("using your old config key Mail.SupportEmailAddress -- but you should rename it to Users.SupportEmailAddress")
+               }
+               if dst, b := &cluster.Users.SendUserSetupNotificationEmail, dcluster.Mail.SendUserSetupNotificationEmail; b != nil {
+                       *dst = *b
+                       ldr.Logger.Warnf("using your old config key Mail.SendUserSetupNotificationEmail -- but you should rename it to Users.SendUserSetupNotificationEmail")
+               }
 
                // Google* moved to Google.*
                if dst, n := &cluster.Login.Google.ClientID, dcluster.Login.GoogleClientID; n != nil && *n != *dst {
@@ -125,7 +137,6 @@ func (ldr *Loader) applyDeprecatedVolumeDriverParameters(cfg *arvados.Config) er
                                if params.AccessKey != "" || params.SecretKey != "" {
                                        if params.AccessKeyID != "" || params.SecretAccessKey != "" {
                                                return fmt.Errorf("cannot use old keys (AccessKey/SecretKey) and new keys (AccessKeyID/SecretAccessKey) at the same time in %s.Volumes.%s.DriverParameters -- you must remove the old config keys", clusterID, volID)
-                                               continue
                                        }
                                        var allparams map[string]interface{}
                                        err = json.Unmarshal(vol.DriverParameters, &allparams)
@@ -495,17 +506,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 {
@@ -520,56 +522,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 {