Adds back --config-file and adds tests around initConfigFile

README.md

@@ -9,10 +9,9 @@ Easily run one-off tasks against an ECS Task Definition.
 
 - [x] Support basic CLI usage
 - [x] Support local config file
-- [ ] Refactor root.go to be cleaner.
-- [ ] Add more tests
-- [] Support `--dryrun` Flag
-- [] Support selection of resources similar to gossm (cluster, task def, task def version, etc etc)
+- [x] Support `--dryrun` Flag
+- [x] Add more tests
 - [] Support log group / stream tailing of initiated task
+- [] Support selection of resources similar to gossm (cluster, task def, task def version, etc etc)
 - [] Support validation of given params: cluster, definition name, revision, subnet ID, SG ID, ect.
 - [] Support EC2 usage.

cmd/root.go

@@ -40,8 +40,6 @@ func (v VersionInfo) String() string {
 		v.BuiltBy)
 }
 
-var cfgFile string
-
 var log = logrus.New()
 
 var fs = afero.NewOsFs()
@@ -116,8 +114,7 @@ func init() {
 	rootCmd.PersistentFlags().Bool("version", false, "version output")
 
 	// Config File Flags
-	// TODO: Add this back at another time
-	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config-file", "", "config file (default is $PWD/escrun.yml)")
+	rootCmd.PersistentFlags().String("config-file", "", "config file to read config entries from (default is $PWD/escrun.yml)")
 	rootCmd.PersistentFlags().String("config", "default", "config entry to read in the config file (default is 'default')")
 	rootCmd.PersistentFlags().Bool("dry-run", false, "dry-run your ecsrun execution to check config (default is false)")
 
@@ -232,7 +229,17 @@ func initAwsSession(profile string) (*session.Session, error) {
 }
 
 func initConfigFile() error {
-	filename, err := findConfigFile()
+	var filename string
+	var err error
+
+	cfgFile := viper.GetString("config-file")
+
+	if cfgFile == "" {
+		filename, err = findConfigFile()
+	} else {
+		filename, err = findCustomConfigFile(cfgFile)
+	}
+
 	if err != nil {
 		return err
 	}
@@ -252,21 +259,37 @@ func initConfigFile() error {
 	log.Debug("Full config file contents: ", config)
 
 	configEntry := viper.GetString("config")
+
+	log.Debug("Config entry: ", configEntry, " result: ", config[configEntry])
 	if err = viper.MergeConfigMap(config[configEntry]); err != nil {
 		return err
 	}
 
 	return nil
 }
 
+func findCustomConfigFile(filename string) (string, error) {
+	log.Info("filename: ", filename)
+	exists, err := afero.Exists(fs, filename)
+	if err != nil {
+		return "", err
+	}
+
+	if exists {
+		return filename, nil
+	}
+
+	return "", errors.New("custom config file not found")
+}
+
 func findConfigFile() (string, error) {
 	supportedExts := []string{"yaml", "yml"}
 
 	for _, extension := range supportedExts {
 		filename := filepath.Join(".", "ecsrun"+"."+extension)
 		exists, err := afero.Exists(fs, filename)
 		if err != nil {
-			log.Fatal("Failed to check if file exists: ", err)
+			return "", err
 		}
 
 		if exists {

cmd/root_test.go

@@ -190,8 +190,17 @@ func TestConfigFile(t *testing.T) {
 	assert := assert.New(t)
 	setup()
 
-	t.Skip("TODO")
-	assert.Equal(true, true)
+	setRequired()
+	viper.Set("config", "default")
+	viper.Set("config-file", "../example/configs/ecsrun.yaml")
+
+	err := initConfigFile()
+
+	assert.Nil(err)
+	viper.Debug()
+	assert.Equal("test-cluster", viper.Get("cluster"))
+	assert.Equal("test-task", viper.Get("task"))
+	assert.Equal("sg1", viper.Get("security-group"))
 
 	teardown()
 }

ecsrun.yaml → example/configs/ecsrun.yaml

@@ -1,6 +1,6 @@
 default: &default
-  cluster: "testing"
-  task: "testing2"
+  cluster: "test-cluster"
+  task: "test-task"
   security-group: "sg1"
 
 custom: