Merge branch 'master' of github.com:mantil-io/mantil

mantil-io · Oct 19, 2021 · 3a0f222 · 3a0f222
2 parents 95fb015 + 23d78ae
commit 3a0f222
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 28 deletions.
diff --git a/workspace/project.go b/workspace/project.go
@@ -1,21 +1,5 @@
 package workspace
 
-const (
-	configDir             = "config"
-	configName            = "project.yml"
-	environmentConfigName = "environment.yml"
-)
-
-const (
-	EnvProjectName = "MANTIL_PROJECT"
-	EnvStageName   = "MANTIL_STAGE"
-	EnvApiURL      = "MANTIL_API_URL"
-)
-
-const (
-	TagProjectName = "MANTIL_PROJECT"
-)
-
 type Project struct {
 	Name        string   `yaml:"name"`
 	Stages      []*Stage `yaml:"stages,omitempty"`

diff --git a/workspace/stage.go b/workspace/stage.go
@@ -4,11 +4,6 @@ import (
 	"fmt"
 )
 
-const (
-	emptyStageName = "dev"
-	TagStageName   = "MANTIL_STAGE"
-)
-
 type Stage struct {
 	Name        string          `yaml:"name"`
 	Default     bool            `yaml:"default,omitempty"`

diff --git a/workspace/workspace.go b/workspace/workspace.go
@@ -14,15 +14,21 @@ import (
 
 const (
 	DefaultAccountName = "dev"
-)
+	defaultStageName   = "dev"
 
-const (
-	EnvKey = "MANTIL_KEY"
-)
+	EnvKey         = "MANTIL_KEY"
+	EnvProjectName = "MANTIL_PROJECT"
+	EnvStageName   = "MANTIL_STAGE"
+	EnvApiURL      = "MANTIL_API_URL"
 
-const (
-	TagWorkspace = "MANTIL_WORKSPACE"
-	TagKey       = "MANTIL_KEY"
+	TagWorkspace   = "MANTIL_WORKSPACE"
+	TagKey         = EnvKey
+	TagProjectName = EnvProjectName
+	TagStageName   = EnvStageName
+
+	configDir             = "config"
+	configName            = "project.yml"
+	environmentConfigName = "environment.yml"
 )
 
 var (