Merge pull request #35 from kanmu/fix_cluster_opt

Fix cluster option bug

definition/definition.go

@@ -1,6 +1,7 @@
 package definition
 
 import (
+	"encoding/json"
 	"fmt"
 	"path/filepath"
 
@@ -42,6 +43,7 @@ func (opts *DefinitionOpts) Load(profile string, command string, image string, c
 	if profile != "" {
 		confDir = filepath.Join(confDir, profile)
 	}
+
 	ecspressoConf, err := loadEcsecspressoConf(confDir, opts)
 
 	if err != nil {
@@ -88,16 +90,10 @@ func (opts *DefinitionOpts) Load(profile string, command string, image string, c
 		return nil, err
 	}
 
-	var cluster string
-
-	if opts.Cluster != "" {
-		cluster = opts.Cluster
-	} else {
-		cluster, err = ecspressoConf.get("cluster")
+	cluster, err := ecspressoConf.get("cluster")
 
-		if err != nil {
-			return nil, err
-		}
+	if err != nil {
+		return nil, err
 	}
 
 	return &Definition{
@@ -115,6 +111,22 @@ func loadEcsecspressoConf(confDir string, opts *DefinitionOpts) (*EcspressoConfi
 		return nil, err
 	}
 
+	if opts.Cluster != "" {
+		js, err := json.Marshal(map[string]string{
+			"cluster": opts.Cluster,
+		})
+
+		if err != nil {
+			panic(err)
+		}
+
+		err = ecspressoConf.patch(string(js))
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	err = ecspressoConf.patch(opts.ConfigOverrides)
 
 	if err != nil {