Merge pull request #598 from docker/encode_env_values

Properly send env variables containing “=“ in their value in ACI payload. Also properly send quoted values

Author: gtardif

aci/convert/container.go

@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/compose-spec/compose-go/types"
-
 	"github.com/docker/compose-cli/api/containers"
 )
 
@@ -71,7 +70,7 @@ func ContainerToComposeProject(r containers.ContainerConfig) (types.Project, err
 func toComposeEnvs(opts []string) types.MappingWithEquals {
 	result := map[string]*string{}
 	for _, env := range opts {
-		tokens := strings.Split(env, "=")
+		tokens := strings.SplitN(env, "=", 2)
 		if len(tokens) > 1 {
 			result[tokens[0]] = &tokens[1]
 		} else {

aci/convert/container_test.go

@@ -53,3 +53,21 @@ func TestConvertRestartPolicy(t *testing.T) {
 	assert.Equal(t, service1.Name, container.ID)
 	assert.Equal(t, service1.Deploy.RestartPolicy.Condition, "none")
 }
+
+func TestConvertEnvVariables(t *testing.T) {
+	container := containers.ContainerConfig{
+		ID: "container1",
+		Environment: []string{
+			"key=value",
+			"key2=value=with=equal",
+		},
+	}
+	project, err := ContainerToComposeProject(container)
+	assert.NilError(t, err)
+	service1 := project.Services[0]
+	assert.Equal(t, service1.Name, container.ID)
+	assert.DeepEqual(t, service1.Environment, types.MappingWithEquals{
+		"key":  to.StringPtr("value"),
+		"key2": to.StringPtr("value=with=equal"),
+	})
+}

aci/convert/convert.go

@@ -424,6 +424,18 @@ func ContainerGroupToContainer(containerID string, cg containerinstance.Containe
 	status := GetStatus(cc, cg)
 	platform := string(cg.OsType)
 
+	var envVars map[string]string = nil
+	if cc.EnvironmentVariables != nil && len(*cc.EnvironmentVariables) != 0 {
+		envVars = map[string]string{}
+		for _, envVar := range *cc.EnvironmentVariables {
+			envVars[*envVar.Name] = *envVar.Value
+		}
+	}
+
+	var config *containers.RuntimeConfig = nil
+	if envVars != nil {
+		config = &containers.RuntimeConfig{Env: envVars}
+	}
 	c := containers.Container{
 		ID:                     containerID,
 		Status:                 status,
@@ -439,6 +451,7 @@ func ContainerGroupToContainer(containerID string, cg containerinstance.Containe
 		Ports:                  ToPorts(cg.IPAddress, *cc.Ports),
 		Platform:               platform,
 		RestartPolicyCondition: toContainerRestartPolicy(cg.RestartPolicy),
+		Config:                 config,
 	}
 
 	return c

api/containers/api.go

@@ -47,12 +47,18 @@ type Container struct {
 	MemoryLimit            uint64
 	PidsCurrent            uint64
 	PidsLimit              uint64
-	Labels                 []string
-	Ports                  []Port
+	Config                 *RuntimeConfig `json:",omitempty"`
+	Labels                 []string       `json:",omitempty"`
+	Ports                  []Port         `json:",omitempty"`
 	Platform               string
 	RestartPolicyCondition string
 }
 
+// RuntimeConfig config of a created container
+type RuntimeConfig struct {
+	Env map[string]string `json:",omitempty"`
+}
+
 // Port represents a published port of a container
 type Port struct {
 	// HostPort is the port number on the host

cli/cmd/testdata/inspect-out-id.golden

@@ -9,8 +9,6 @@
     "MemoryLimit": 0,
     "PidsCurrent": 0,
     "PidsLimit": 0,
-    "Labels": null,
-    "Ports": null,
     "Platform": "Linux",
     "RestartPolicyCondition": "none"
 }

tests/aci-e2e/e2e-aci_test.go

@@ -592,6 +592,7 @@ func TestRunEnvVars(t *testing.T) {
 			"-e", "MYSQL_DATABASE=mytestdb",
 			"-e", "MYSQL_USER",
 			"-e", "MYSQL_PASSWORD=userpwd",
+			"-e", "DATASOURCE_URL=jdbc:mysql://mydb.mysql.database.azure.com/db1?useSSL=true&requireSSL=false&serverTimezone=America/Recife",
 			"mysql:5.7",
 		)
 		cmd.Env = append(cmd.Env, "MYSQL_USER=user1")
@@ -604,7 +605,16 @@ func TestRunEnvVars(t *testing.T) {
 
 		containerInspect, err := ParseContainerInspect(res.Stdout())
 		assert.NilError(t, err)
+		assert.Assert(t, containerInspect.Config != nil, "nil container config")
+		assert.Assert(t, containerInspect.Config.Env != nil, "nil container env variables")
 		assert.Equal(t, containerInspect.Image, "mysql:5.7")
+		envVars := containerInspect.Config.Env
+		assert.Equal(t, len(envVars), 5)
+		assert.Equal(t, envVars["MYSQL_ROOT_PASSWORD"], "rootpwd")
+		assert.Equal(t, envVars["MYSQL_DATABASE"], "mytestdb")
+		assert.Equal(t, envVars["MYSQL_USER"], "user1")
+		assert.Equal(t, envVars["MYSQL_PASSWORD"], "userpwd")
+		assert.Equal(t, envVars["DATASOURCE_URL"], "jdbc:mysql://mydb.mysql.database.azure.com/db1?useSSL=true&requireSSL=false&serverTimezone=America/Recife")
 
 		check := func(t poll.LogT) poll.Result {
 			res := c.RunDockerOrExitError("logs", container)

tests/e2e/testdata/inspect-id.golden

@@ -9,8 +9,6 @@
     "MemoryLimit": 0,
     "PidsCurrent": 0,
     "PidsLimit": 0,
-    "Labels": null,
-    "Ports": null,
     "Platform": "Linux",
     "RestartPolicyCondition": "none"
 }