X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/42fff42165a0fa1602758a078746f8697f265f83..cef860fc944f66b4b52aa2ea6d66561944a7c065:/lib/config/load.go

diff --git a/lib/config/load.go b/lib/config/load.go
index b42e1a3c1e..cc26cdaecc 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -241,30 +241,33 @@ func (ldr *Loader) Load() (*arvados.Config, error) {
 		return nil, fmt.Errorf("transcoding config data: %s", err)
 	}
 
+	var loadFuncs []func(*arvados.Config) error
 	if !ldr.SkipDeprecated {
-		err = ldr.applyDeprecatedConfig(&cfg)
-		if err != nil {
-			return nil, err
-		}
+		loadFuncs = append(loadFuncs,
+			ldr.applyDeprecatedConfig,
+			ldr.applyDeprecatedVolumeDriverParameters,
+		)
 	}
 	if !ldr.SkipLegacy {
 		// legacy file is required when either:
 		// * a non-default location was specified
 		// * no primary config was loaded, and this is the
 		// legacy config file for the current component
-		for _, err := range []error{
-			ldr.loadOldEnvironmentVariables(&cfg),
-			ldr.loadOldKeepstoreConfig(&cfg),
-			ldr.loadOldKeepWebConfig(&cfg),
-			ldr.loadOldCrunchDispatchSlurmConfig(&cfg),
-			ldr.loadOldWebsocketConfig(&cfg),
-			ldr.loadOldKeepproxyConfig(&cfg),
-			ldr.loadOldGitHttpdConfig(&cfg),
-			ldr.loadOldKeepBalanceConfig(&cfg),
-		} {
-			if err != nil {
-				return nil, err
-			}
+		loadFuncs = append(loadFuncs,
+			ldr.loadOldEnvironmentVariables,
+			ldr.loadOldKeepstoreConfig,
+			ldr.loadOldKeepWebConfig,
+			ldr.loadOldCrunchDispatchSlurmConfig,
+			ldr.loadOldWebsocketConfig,
+			ldr.loadOldKeepproxyConfig,
+			ldr.loadOldGitHttpdConfig,
+			ldr.loadOldKeepBalanceConfig,
+		)
+	}
+	for _, f := range loadFuncs {
+		err = f(&cfg)
+		if err != nil {
+			return nil, err
 		}
 	}
 
@@ -313,11 +316,15 @@ var acceptableTokenLength = 32
 
 func (ldr *Loader) checkToken(label, token string) error {
 	if token == "" {
-		ldr.Logger.Warnf("%s: secret token is not set (use %d+ random characters from a-z, A-Z, 0-9)", label, acceptableTokenLength)
+		if ldr.Logger != nil {
+			ldr.Logger.Warnf("%s: secret token is not set (use %d+ random characters from a-z, A-Z, 0-9)", label, acceptableTokenLength)
+		}
 	} else if !acceptableTokenRe.MatchString(token) {
 		return fmt.Errorf("%s: unacceptable characters in token (only a-z, A-Z, 0-9 are acceptable)", label)
 	} else if len(token) < acceptableTokenLength {
-		ldr.Logger.Warnf("%s: token is too short (should be at least %d characters)", label, acceptableTokenLength)
+		if ldr.Logger != nil {
+			ldr.Logger.Warnf("%s: token is too short (should be at least %d characters)", label, acceptableTokenLength)
+		}
 	}
 	return nil
 }