Support TTY (pseudoTerminal) field in ContainerDefinition

SoManyHs · SoManyHs · commit f2f28a7d0f5c · 2019-01-22T15:01:49.000-08:00
diff --git a/ecs-cli/modules/cli/compose/adapter/containerconfig.go b/ecs-cli/modules/cli/compose/adapter/containerconfig.go
@@ -28,6 +28,7 @@ type ContainerConfig struct {
 	MountPoints           []*ecs.MountPoint
 	PortMappings          []*ecs.PortMapping
 	Privileged            bool
+	PseudoTerminal        bool
 	ReadOnly              bool
 	ShmSize               int64
 	Tmpfs                 []*ecs.Tmpfs
diff --git a/ecs-cli/modules/cli/compose/logger/logger.go b/ecs-cli/modules/cli/compose/logger/logger.go
@@ -54,6 +54,7 @@ var supportedComposeV1V2YamlOptions = []string{
 	"security_opt",
 	"shm_size",
 	"tmpfs",
+	"tty",
 	"ulimits",
 	"user",
 	"volumes", // v2
@@ -85,6 +86,7 @@ var supportedFieldsInV3 = map[string]bool{
 	"ReadOnly":    true,
 	"SecurityOpt": true,
 	"Tmpfs":       true,
+	"Tty":         true,
 	"Ulimits":     true,
 	"User":        true,
 	"Volumes":     true,
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV1V2.go b/ecs-cli/modules/cli/compose/project/project_parseV1V2.go
@@ -129,6 +129,7 @@ func convertV1V2ToContainerConfig(context *project.Context, serviceName string,
 		MemoryReservation:     memoryReservation,
 		MountPoints:           mountPoints,
 		PortMappings:          portMappings,
+		PseudoTerminal:        service.Tty,
 		Privileged:            service.Privileged,
 		ReadOnly:              service.ReadOnly,
 		ShmSize:               shmSize,
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV1V2_test.go b/ecs-cli/modules/cli/compose/project/project_parseV1V2_test.go
@@ -85,6 +85,7 @@ func TestParseV1V2_Version1_HappyPath(t *testing.T) {
 	}
 	privileged := true
 	readonly := true
+	tty := true
 	securityOpts := []string{"label:type:test_virt"}
 	shmSize := int64(128)
 	user := "user"
@@ -144,6 +145,7 @@ func TestParseV1V2_Version1_HappyPath(t *testing.T) {
   security_opt:
    - label:type:test_virt
   shm_size: 128M
+  tty: true
   ulimits:
     nproc: 65535
     nofile:
@@ -207,6 +209,7 @@ redis:
 	assert.Equal(t, mountPoints, web.MountPoints, "Expected MountPoints to match")
 	assert.ElementsMatch(t, ports, web.PortMappings, "Expected PortMappings to match")
 	assert.Equal(t, privileged, web.Privileged, "Expected Privileged to match")
+	assert.Equal(t, tty, web.PseudoTerminal, "Expected PseudoTerminal to match")
 	assert.Equal(t, readonly, web.ReadOnly, "Expected ReadOnly to match")
 	assert.Equal(t, shmSize, web.ShmSize, "Expected ShmSize to match")
 	assert.Equal(t, user, web.User, "Expected User to match")
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV3.go b/ecs-cli/modules/cli/compose/project/project_parseV3.go
@@ -103,6 +103,7 @@ func convertToContainerConfig(serviceConfig types.ServiceConfig, serviceVols *ad
 		Links:                 serviceConfig.Links,
 		Name:                  serviceConfig.Name,
 		Privileged:            serviceConfig.Privileged,
+		PseudoTerminal:        serviceConfig.Tty,
 		ReadOnly:              serviceConfig.ReadOnly,
 		User:                  serviceConfig.User,
 		WorkingDirectory:      serviceConfig.WorkingDir,
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV3_test.go b/ecs-cli/modules/cli/compose/project/project_parseV3_test.go
@@ -82,6 +82,7 @@ func TestParseV3WithOneFile(t *testing.T) {
 	}
 	wordpressCon.Privileged = true
 	wordpressCon.ReadOnly = true
+	wordpressCon.PseudoTerminal = true
 	wordpressCon.DockerSecurityOptions = []string{"label:role:ROLE", "label:user:USER"}
 	wordpressCon.Ulimits = []*ecs.Ulimit{
 		{
@@ -160,6 +161,7 @@ services:
         awslogs-stream-prefix: wordpress
     tmpfs:
       - "/run:rw,size=1gb"
+    tty: true
     read_only: true
     hostname: wrdhost
     security_opt:
@@ -746,6 +748,7 @@ func verifyContainerConfig(t *testing.T, expected, actual adapter.ContainerConfi
 	assert.Equal(t, expected.Privileged, actual.Privileged, "Expected Privileged to match")
 	assert.Equal(t, expected.ReadOnly, actual.ReadOnly, "Expected ReadOnly to match")
 	assert.ElementsMatch(t, expected.Tmpfs, actual.Tmpfs, "Expected Tmpfs to match")
+	assert.Equal(t, expected.PseudoTerminal, actual.PseudoTerminal, "Expected PseuoTerminal to match")
 	assert.ElementsMatch(t, expected.Ulimits, actual.Ulimits, "Expected Ulimits to match")
 	assert.Equal(t, expected.User, actual.User, "Expected User to match")
 	assert.Equal(t, expected.WorkingDirectory, actual.WorkingDirectory, "Expected WorkingDirectory to match")
diff --git a/ecs-cli/modules/utils/compose/reconcile_container_def.go b/ecs-cli/modules/utils/compose/reconcile_container_def.go
@@ -53,6 +53,7 @@ func reconcileContainerDef(inputCfg *adapter.ContainerConfig, ecsConDef *Contain
 	outputContDef.SetName(inputCfg.Name)
 	outputContDef.SetPrivileged(inputCfg.Privileged)
 	outputContDef.SetPortMappings(inputCfg.PortMappings)
+	outputContDef.SetPseudoTerminal(inputCfg.PseudoTerminal)
 	outputContDef.SetReadonlyRootFilesystem(inputCfg.ReadOnly)
 	outputContDef.SetUlimits(inputCfg.Ulimits)
 
