X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bebedf99016c2a784bbeb4c64ce4a579b8649b13..7407f41105f8000bb3908d41a31daaf3a30d9440:/lib/config/load.go

diff --git a/lib/config/load.go b/lib/config/load.go
index 2dacd5c26c..be6181bbe9 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -15,7 +15,7 @@ import (
 	"os"
 	"strings"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"github.com/ghodss/yaml"
 	"github.com/imdario/mergo"
 	"github.com/sirupsen/logrus"
@@ -26,12 +26,18 @@ var ErrNoClustersDefined = errors.New("config does not define any clusters")
 type Loader struct {
 	Stdin          io.Reader
 	Logger         logrus.FieldLogger
-	SkipDeprecated bool // Don't load legacy/deprecated config keys/files
+	SkipDeprecated bool // Don't load deprecated config keys
+	SkipLegacy     bool // Don't load legacy config files
+	SkipAPICalls   bool // Don't do checks that call RailsAPI/controller
 
 	Path                    string
 	KeepstorePath           string
+	KeepWebPath             string
 	CrunchDispatchSlurmPath string
 	WebsocketPath           string
+	KeepproxyPath           string
+	GitHttpdPath            string
+	KeepBalancePath         string
 
 	configdata []byte
 }
@@ -58,9 +64,16 @@ func NewLoader(stdin io.Reader, logger logrus.FieldLogger) *Loader {
 //	// ldr.Path == "/tmp/c.yaml"
 func (ldr *Loader) SetupFlags(flagset *flag.FlagSet) {
 	flagset.StringVar(&ldr.Path, "config", arvados.DefaultConfigFile, "Site configuration `file` (default may be overridden by setting an ARVADOS_CONFIG environment variable)")
-	flagset.StringVar(&ldr.KeepstorePath, "legacy-keepstore-config", defaultKeepstoreConfigPath, "Legacy keepstore configuration `file`")
-	flagset.StringVar(&ldr.CrunchDispatchSlurmPath, "legacy-crunch-dispatch-slurm-config", defaultCrunchDispatchSlurmConfigPath, "Legacy crunch-dispatch-slurm configuration `file`")
-	flagset.StringVar(&ldr.WebsocketPath, "legacy-ws-config", defaultWebsocketConfigPath, "Legacy arvados-ws configuration `file`")
+	if !ldr.SkipLegacy {
+		flagset.StringVar(&ldr.KeepstorePath, "legacy-keepstore-config", defaultKeepstoreConfigPath, "Legacy keepstore configuration `file`")
+		flagset.StringVar(&ldr.KeepWebPath, "legacy-keepweb-config", defaultKeepWebConfigPath, "Legacy keep-web configuration `file`")
+		flagset.StringVar(&ldr.CrunchDispatchSlurmPath, "legacy-crunch-dispatch-slurm-config", defaultCrunchDispatchSlurmConfigPath, "Legacy crunch-dispatch-slurm configuration `file`")
+		flagset.StringVar(&ldr.WebsocketPath, "legacy-ws-config", defaultWebsocketConfigPath, "Legacy arvados-ws configuration `file`")
+		flagset.StringVar(&ldr.KeepproxyPath, "legacy-keepproxy-config", defaultKeepproxyConfigPath, "Legacy keepproxy configuration `file`")
+		flagset.StringVar(&ldr.GitHttpdPath, "legacy-git-httpd-config", defaultGitHttpdConfigPath, "Legacy arv-git-httpd configuration `file`")
+		flagset.StringVar(&ldr.KeepBalancePath, "legacy-keepbalance-config", defaultKeepBalanceConfigPath, "Legacy keep-balance configuration `file`")
+		flagset.BoolVar(&ldr.SkipLegacy, "skip-legacy", false, "Don't load legacy config files")
+	}
 }
 
 // MungeLegacyConfigArgs checks args for a -config flag whose argument
@@ -119,6 +132,31 @@ func (ldr *Loader) MungeLegacyConfigArgs(lgr logrus.FieldLogger, args []string,
 			}
 		}
 	}
+
+	// Disable legacy config loading for components other than the
+	// one that was specified
+	if legacyConfigArg != "-legacy-keepstore-config" {
+		ldr.KeepstorePath = ""
+	}
+	if legacyConfigArg != "-legacy-crunch-dispatch-slurm-config" {
+		ldr.CrunchDispatchSlurmPath = ""
+	}
+	if legacyConfigArg != "-legacy-ws-config" {
+		ldr.WebsocketPath = ""
+	}
+	if legacyConfigArg != "-legacy-keepweb-config" {
+		ldr.KeepWebPath = ""
+	}
+	if legacyConfigArg != "-legacy-keepproxy-config" {
+		ldr.KeepproxyPath = ""
+	}
+	if legacyConfigArg != "-legacy-git-httpd-config" {
+		ldr.GitHttpdPath = ""
+	}
+	if legacyConfigArg != "-legacy-keepbalance-config" {
+		ldr.KeepBalancePath = ""
+	}
+
 	return munged
 }
 
@@ -207,14 +245,21 @@ func (ldr *Loader) Load() (*arvados.Config, error) {
 		if err != nil {
 			return nil, err
 		}
+	}
+	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
@@ -224,9 +269,14 @@ func (ldr *Loader) Load() (*arvados.Config, error) {
 
 	// Check for known mistakes
 	for id, cc := range cfg.Clusters {
-		err = checkKeyConflict(fmt.Sprintf("Clusters.%s.PostgreSQL.Connection", id), cc.PostgreSQL.Connection)
-		if err != nil {
-			return nil, err
+		for _, err = range []error{
+			checkKeyConflict(fmt.Sprintf("Clusters.%s.PostgreSQL.Connection", id), cc.PostgreSQL.Connection),
+			ldr.checkEmptyKeepstores(cc),
+			ldr.checkUnlistedKeepstores(cc),
+		} {
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 	return &cfg, nil