Add top-level targetContext for backwards compatibility

cisco-sso · Jul 13, 2018 · 8dcdc43 · 8dcdc43
1 parent 95c658a
commit 8dcdc43
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/cmd/helpers.go b/cmd/helpers.go
@@ -50,6 +50,13 @@ func unmarshalConfig(logger *logrus.Entry) lib.MHConfigFile {
 	if err := viper.Unmarshal(&mhConfigFile); err != nil {
 		logger.WithField("error", err).Fatal("Failed to unmarshal mh configuration file")
 	}
+
+	// Check top-level targetContext for backwards compatibility
+	if mhConfigFile.TargetContext != "" {
+		logger.Warn("Top-level configuration is deprecated, move to the 'mh' key")
+		mhConfigFile.MH.TargetContext = mhConfigFile.TargetContext
+	}
+
 	logger = logger.WithField("configFile", viper.ConfigFileUsed())
 
 	return mhConfigFile

diff --git a/mhlib/mhConfigFile.go b/mhlib/mhConfigFile.go
@@ -22,9 +22,11 @@ import (
 
 // MHConfigFile is the structure of a mh configuration file.
 type MHConfigFile struct {
-	MH         MHConfig         `yaml:"mh"`
-	Apps       AppConfigs       `yaml:"apps"`
-	AppSources AppSourceConfigs `yaml:"appSources"`
+	// TargetContext for backwards compatibility
+	TargetContext string           `yaml:"targetContext"`
+	MH            MHConfig         `yaml:"mh"`
+	Apps          AppConfigs       `yaml:"apps"`
+	AppSources    AppSourceConfigs `yaml:"appSources"`
 }
 
 // EffectiveApps returns all Apps that are configured in a MHConfigFile,