X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d5666a360beedb7036aae830bbc4058a6d9c82fc..ae92d144610446849eb568247a44f02ae985c281:/lib/config/deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 5e68bbfcef..c0a7921b36 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -103,18 +103,6 @@ func (ldr *Loader) applyDeprecatedConfig(cfg *arvados.Config) error {
 			*dst = *n
 		}
 
-		// Provider* moved to SSO.Provider*
-		if dst, n := &cluster.Login.SSO.ProviderAppID, dcluster.Login.ProviderAppID; n != nil && *n != *dst {
-			*dst = *n
-			if *n != "" {
-				// In old config, non-empty ID meant enable
-				cluster.Login.SSO.Enable = true
-			}
-		}
-		if dst, n := &cluster.Login.SSO.ProviderAppSecret, dcluster.Login.ProviderAppSecret; n != nil && *n != *dst {
-			*dst = *n
-		}
-
 		cfg.Clusters[id] = cluster
 	}
 	return nil
@@ -137,7 +125,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)
@@ -461,7 +448,6 @@ type oldKeepWebConfig struct {
 		UUIDTTL              *arvados.Duration
 		MaxCollectionEntries *int
 		MaxCollectionBytes   *int64
-		MaxPermissionEntries *int
 		MaxUUIDEntries       *int
 	}
 
@@ -517,9 +503,6 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
 	if oc.Cache.MaxCollectionBytes != nil {
 		cluster.Collections.WebDAVCache.MaxCollectionBytes = *oc.Cache.MaxCollectionBytes
 	}
-	if oc.Cache.MaxPermissionEntries != nil {
-		cluster.Collections.WebDAVCache.MaxPermissionEntries = *oc.Cache.MaxPermissionEntries
-	}
 	if oc.Cache.MaxUUIDEntries != nil {
 		cluster.Collections.WebDAVCache.MaxUUIDEntries = *oc.Cache.MaxUUIDEntries
 	}
@@ -552,7 +535,7 @@ func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error {
 		return nil
 	}
 	var oc oldGitHttpdConfig
-	err := ldr.loadOldConfigHelper("arv-git-httpd", ldr.GitHttpdPath, &oc)
+	err := ldr.loadOldConfigHelper("arvados-git-httpd", ldr.GitHttpdPath, &oc)
 	if os.IsNotExist(err) && ldr.GitHttpdPath == defaultGitHttpdConfigPath {
 		return nil
 	} else if err != nil {