Merge pull request #176 from cHYzZQo/env-vars

docker-runtime: Use single quotes in bash env file template

executor/runtime/docker/docker.go

@@ -67,7 +67,7 @@ const (
 const envFileTemplateStr = `
 # This file was autogenerated by the titus executor
 {{ range $key, $val := . }}
-export {{ $key }}="{{ $val }}"
+export {{ $key }}='{{ $val | escape_sq }}'
 {{ end }}
 `
 
@@ -187,8 +187,12 @@ func GenerateConfiguration(args []string) (*Config, error) {
 	return cfg, app.Run(args)
 }
 
+func escapeSQ(str string) string {
+	return strings.Replace(str, "'", "'\"'\"'", -1)
+}
+
 var (
-	envFileTemplate = template.Must(template.New("").Parse(envFileTemplateStr))
+	envFileTemplate = template.Must(template.New("").Funcs(template.FuncMap{"escape_sq": escapeSQ}).Parse(envFileTemplateStr))
 )
 
 // NoEntrypointError indicates that the Titus job does not have an entrypoint, or command

executor/runtime/docker/docker_test.go

@@ -93,6 +93,49 @@ func TestWriteTitusEnvironmentComplicatedVariable(t *testing.T) {
 	assert.Equal(t, "", buf.String())
 }
 
+func TestEnvFileTemplate(t *testing.T) {
+	var buf bytes.Buffer
+	env := map[string]string{"NORMAL": "normal"}
+	assert.NoError(t, envFileTemplate.Execute(&buf, env))
+	assert.Equal(t, `
+# This file was autogenerated by the titus executor
+
+export NORMAL='normal'
+
+`, buf.String())
+
+	buf.Reset()
+	env = map[string]string{"JSON": `{"json": "value"}`}
+	assert.NoError(t, envFileTemplate.Execute(&buf, env))
+	assert.Equal(t, `
+# This file was autogenerated by the titus executor
+
+export JSON='{"json": "value"}'
+
+`, buf.String())
+
+	buf.Reset()
+	env = map[string]string{"NL": "new\nline"}
+	assert.NoError(t, envFileTemplate.Execute(&buf, env))
+	assert.Equal(t, `
+# This file was autogenerated by the titus executor
+
+export NL='new
+line'
+
+`, buf.String())
+
+	buf.Reset()
+	env = map[string]string{"SQ": "I'm an env var"}
+	assert.NoError(t, envFileTemplate.Execute(&buf, env))
+	assert.Equal(t, `
+# This file was autogenerated by the titus executor
+
+export SQ='I'"'"'m an env var'
+
+`, buf.String())
+}
+
 func TestValidEnvironmentKeys(t *testing.T) {
 	assert.True(t, environmentVariableKeyRegexp.MatchString("HELLO"))
 	assert.True(t, environmentVariableKeyRegexp.MatchString("HELLO1"))