Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ecs-Add support for ECS IPC Mode/PID Mode #6515

Merged
merged 3 commits into from
Nov 19, 2018
Merged

Ecs-Add support for ECS IPC Mode/PID Mode #6515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03ced11
Add support for ECS IPC Mode/PID Mode
Nov 19, 2018
b9ddb02
add validation for ipcmode and pidmode for ecs task definition
Nov 19, 2018
1f84b6c
fix typos
Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions aws/resource_aws_ecs_task_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,18 @@ func resourceAwsEcsTaskDefinition() *schema.Resource {
Elem: &schema.Schema{Type: schema.TypeString},
},

"ipc_mode": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved

"pid_mode": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved

"tags": tagsSchema(),
},
}
Expand Down Expand Up @@ -241,6 +253,14 @@ func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{}
input.NetworkMode = aws.String(v.(string))
}

if v, ok := d.GetOk("ipc_mode"); ok {
input.IpcMode = aws.String(v.(string))
}

if v, ok := d.GetOk("pid_mode"); ok {
input.PidMode = aws.String(v.(string))
}

if v, ok := d.GetOk("volume"); ok {
volumes, err := expandEcsVolumes(v.(*schema.Set).List())
if err != nil {
Expand Down
182 changes: 182 additions & 0 deletions aws/resource_aws_ecs_task_definition_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,56 @@ func TestAccAWSEcsTaskDefinition_withNetworkMode(t *testing.T) {
})
}

func TestAccAWSEcsTaskDefinition_withIPCMode(t *testing.T) {
var def ecs.TaskDefinition

rString := acctest.RandString(8)
roleName := fmt.Sprintf("tf_acc_ecs_td_with_ipc_mode_%s", rString)
policyName := fmt.Sprintf("tf_acc_ecs_td_with_ipc_mode_%s", rString)
tdName := fmt.Sprintf("tf_acc_td_with_ipc_mode_%s", rString)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSEcsTaskDefinitionWithIpcMode(roleName, policyName, tdName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.sleep", &def),
resource.TestCheckResourceAttr(
"aws_ecs_task_definition.sleep", "ipc_mode", "host"),
),
},
},
})
}

func TestAccAWSEcsTaskDefinition_withPidMode(t *testing.T) {
var def ecs.TaskDefinition

rString := acctest.RandString(8)
roleName := fmt.Sprintf("tf_acc_ecs_td_with_pid_mode_%s", rString)
policyName := fmt.Sprintf("tf_acc_ecs_td_with_pid_mode_%s", rString)
tdName := fmt.Sprintf("tf_acc_td_with_pid_mode_%s", rString)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSEcsTaskDefinitionWithPidMode(roleName, policyName, tdName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.sleep", &def),
resource.TestCheckResourceAttr(
"aws_ecs_task_definition.sleep", "pid_mode", "host"),
),
},
},
})
}

func TestAccAWSEcsTaskDefinition_constraint(t *testing.T) {
var def ecs.TaskDefinition

Expand Down Expand Up @@ -1083,6 +1133,138 @@ TASK_DEFINITION
}`, roleName, policyName, tdName)
}

func testAccAWSEcsTaskDefinitionWithIpcMode(roleName, policyName, tdName string) string {
return fmt.Sprintf(`
resource "aws_iam_role" "role_test" {
name = "%s"
path = "/test/"
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Action": "sts:AssumeRole",
"Principal": {
"Service": "ec2.amazonaws.com"
},
"Effect": "Allow",
"Sid": ""
}
]
}
EOF
}

resource "aws_iam_role_policy" "role_test" {
name = "%s"
role = "${aws_iam_role.role_test.id}"
policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"s3:GetBucketLocation",
"s3:ListAllMyBuckets"
],
"Resource": "arn:aws:s3:::*"
}
]
}
EOF
}

resource "aws_ecs_task_definition" "sleep" {
family = "%s"
task_role_arn = "${aws_iam_role.role_test.arn}"
network_mode = "bridge"
ipc_mode = "host"
container_definitions = <<TASK_DEFINITION
[
{
"name": "sleep",
"image": "busybox",
"cpu": 10,
"command": ["sleep","360"],
"memory": 10,
"essential": true
}
]
TASK_DEFINITION

volume {
name = "database_scratch"
}
}`, roleName, policyName, tdName)
}

func testAccAWSEcsTaskDefinitionWithPidMode(roleName, policyName, tdName string) string {
return fmt.Sprintf(`
resource "aws_iam_role" "role_test" {
name = "%s"
path = "/test/"
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Action": "sts:AssumeRole",
"Principal": {
"Service": "ec2.amazonaws.com"
},
"Effect": "Allow",
"Sid": ""
}
]
}
EOF
}

resource "aws_iam_role_policy" "role_test" {
name = "%s"
role = "${aws_iam_role.role_test.id}"
policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"s3:GetBucketLocation",
"s3:ListAllMyBuckets"
],
"Resource": "arn:aws:s3:::*"
}
]
}
EOF
}

resource "aws_ecs_task_definition" "sleep" {
family = "%s"
task_role_arn = "${aws_iam_role.role_test.arn}"
network_mode = "bridge"
pid_mode = "host"
container_definitions = <<TASK_DEFINITION
[
{
"name": "sleep",
"image": "busybox",
"cpu": 10,
"command": ["sleep","360"],
"memory": 10,
"essential": true
}
]
TASK_DEFINITION

volume {
name = "database_scratch"
}
}`, roleName, policyName, tdName)
}

func testAccAWSEcsTaskDefinitionWithNetworkMode(roleName, policyName, tdName string) string {
return fmt.Sprintf(`
resource "aws_iam_role" "role_test" {
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/ecs_task_definition.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ official [Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/develope
* `task_role_arn` - (Optional) The ARN of IAM role that allows your Amazon ECS container task to make calls to other AWS services.
* `execution_role_arn` - (Optional) The Amazon Resource Name (ARN) of the task execution role that the Amazon ECS container agent and the Docker daemon can assume.
* `network_mode` - (Optional) The Docker networking mode to use for the containers in the task. The valid values are `none`, `bridge`, `awsvpc`, and `host`.
* `ipc_mode` - (Optional) The IPC resource namespace to be used for the containers in the task The valid values are `host`, `task`, and `none`.
* `pid_mode` - (Optional) TheThe process namespace to use for the containers in the task. The valid values are `host` and `task`.
sunilkumarmohanty marked this conversation as resolved.
Show resolved Hide resolved
* `volume` - (Optional) A set of [volume blocks](#volume-block-arguments) that containers in your task may use.
* `placement_constraints` - (Optional) A set of [placement constraints](#placement-constraints-arguments) rules that are taken into consideration during task placement. Maximum number of `placement_constraints` is `10`.
* `cpu` - (Optional) The number of cpu units used by the task. If the `requires_compatibilities` is `FARGATE` this field is required.
Expand Down