Merge branch 'master' into study/aws-ecr-1

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.1 (UNRELEASED)
+
+BUG FIXES:
+  * client: Allow dashes in variable names during interprelation [GH-857]
+
 ## 0.3.0
 
 __BACKWARDS INCOMPATIBILITIES:__

helper/args/args.go

@@ -3,7 +3,7 @@ package args
 import "regexp"
 
 var (
-	envRe = regexp.MustCompile(`\${[a-zA-Z0-9_\.]+}`)
+	envRe = regexp.MustCompile(`\${[a-zA-Z0-9_\-\.]+}`)
 )
 
 // ReplaceEnv takes an arg and replaces all occurences of environment variables.

helper/args/args_test.go

@@ -13,6 +13,8 @@ const (
 	portVal   = ":80"
 	periodKey = "NOMAD.PERIOD"
 	periodVal = "period"
+	dashKey   = "NOMAD-DASH"
+	dashVal   = "dash"
 )
 
 var (
@@ -20,6 +22,7 @@ var (
 		ipKey:     ipVal,
 		portKey:   portVal,
 		periodKey: periodVal,
+		dashKey:   dashVal,
 	}
 )
 
@@ -53,6 +56,16 @@ func TestArgs_ReplaceEnv_Period(t *testing.T) {
 	}
 }
 
+func TestArgs_ReplaceEnv_Dash(t *testing.T) {
+	input := fmt.Sprintf(`"${%v}"!`, dashKey)
+	exp := fmt.Sprintf("\"%s\"!", dashVal)
+	act := ReplaceEnv(input, envVars)
+
+	if !reflect.DeepEqual(act, exp) {
+		t.Fatalf("ReplaceEnv(%v, %v) returned %#v; want %#v", input, envVars, act, exp)
+	}
+}
+
 func TestArgs_ReplaceEnv_Chained(t *testing.T) {
 	input := fmt.Sprintf("${%s}${%s}", ipKey, portKey)
 	exp := fmt.Sprintf("%s%s", ipVal, portVal)

version.go

@@ -5,9 +5,9 @@ var GitCommit string
 var GitDescribe string
 
 // The main version number that is being run at the moment.
-const Version = "0.3.0"
+const Version = "0.3.1"
 
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release
 // such as "dev" (in development), "beta", "rc1", etc.
-const VersionPrerelease = ""
+const VersionPrerelease = "dev"