Merge pull request #34 from kanmu/add_DMTS_CLUSTER

Add DMTS_CLUSTER env
kanmu · May 27, 2023 · 33144e5 · 33144e5
2 parents 9f028a7 + 22abebd
commit 33144e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,7 @@ Flags:
   -c, --container-overrides=STRING
                                    JSON/YAML string that overrides ECS container
                                    definition.
+      --cluster=STRING             ECS cluster name ($DMTS_CLUSTER).
 
 Commands:
   run --ecspresso-cmd="ecspresso" --conf-dir="~/.demitas" --config="ecspresso.yml" --container-def="ecs-container-def.jsonnet"

diff --git a/definition/definition.go b/definition/definition.go
@@ -16,6 +16,7 @@ type DefinitionOpts struct {
 	ServiceOverrides   string `short:"s" help:"JSON/YAML string that overrides ECS service definition."`
 	TaskOverrides      string `short:"t" help:"JSON/YAML string that overrides ECS task definition."`
 	ContainerOverrides string `short:"c" help:"JSON/YAML string that overrides ECS container definition."`
+	Cluster            string `env:"DMTS_CLUSTER" help:"ECS cluster name."`
 }
 
 type Definition struct {
@@ -87,10 +88,16 @@ func (opts *DefinitionOpts) Load(profile string, command string, image string, c
 		return nil, err
 	}
 
-	cluster, err := ecspressoConf.get("cluster")
+	var cluster string
 
-	if err != nil {
-		return nil, err
+	if opts.Cluster != "" {
+		cluster = opts.Cluster
+	} else {
+		cluster, err = ecspressoConf.get("cluster")
+
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return &Definition{