From c94cfd941d5925629144ffa5229aba9c836e5462 Mon Sep 17 00:00:00 2001 From: Anshul Sharma Date: Wed, 24 Aug 2016 12:02:53 +0530 Subject: [PATCH] Add MemoryReservation To ECS Container Definition --- .../aws/data_source_aws_ecs_container_definition.go | 6 ++++++ .../aws/data_source_aws_ecs_container_definition_test.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/builtin/providers/aws/data_source_aws_ecs_container_definition.go b/builtin/providers/aws/data_source_aws_ecs_container_definition.go index 91750abe83..df72f80e66 100644 --- a/builtin/providers/aws/data_source_aws_ecs_container_definition.go +++ b/builtin/providers/aws/data_source_aws_ecs_container_definition.go @@ -41,6 +41,10 @@ func dataSourceAwsEcsContainerDefinition() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + "memoryReservation": &schema.Schema{ + Type: schema.TypeInt, + Computed: true, + }, "disable_networking": &schema.Schema{ Type: schema.TypeBool, Computed: true, @@ -65,6 +69,7 @@ func dataSourceAwsEcsContainerDefinitionRead(d *schema.ResourceData, meta interf desc, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{ TaskDefinition: aws.String(d.Get("task_definition").(string)), }) + if err != nil { return err } @@ -83,6 +88,7 @@ func dataSourceAwsEcsContainerDefinitionRead(d *schema.ResourceData, meta interf } d.Set("cpu", aws.Int64Value(def.Cpu)) d.Set("memory", aws.Int64Value(def.Memory)) + d.Set("memoryReservation", aws.Int64Value(def.MemoryReservation)) d.Set("disable_networking", aws.BoolValue(def.DisableNetworking)) d.Set("docker_labels", aws.StringValueMap(def.DockerLabels)) diff --git a/builtin/providers/aws/data_source_aws_ecs_container_definition_test.go b/builtin/providers/aws/data_source_aws_ecs_container_definition_test.go index 85f3d1fb7a..271b5b8359 100644 --- a/builtin/providers/aws/data_source_aws_ecs_container_definition_test.go +++ b/builtin/providers/aws/data_source_aws_ecs_container_definition_test.go @@ -17,6 +17,7 @@ func TestAccAWSEcsDataSource_ecsContainerDefinition(t *testing.T) { resource.TestCheckResourceAttr("data.aws_ecs_container_definition.mongo", "image", "mongo:latest"), resource.TestCheckResourceAttr("data.aws_ecs_container_definition.mongo", "image_digest", "latest"), resource.TestCheckResourceAttr("data.aws_ecs_container_definition.mongo", "memory", "128"), + resource.TestCheckResourceAttr("data.aws_ecs_container_definition.mongo", "memoryReservation", "64"), resource.TestCheckResourceAttr("data.aws_ecs_container_definition.mongo", "cpu", "128"), resource.TestCheckResourceAttr("data.aws_ecs_container_definition.mongo", "environment.SECRET", "KEY"), ), @@ -43,6 +44,7 @@ resource "aws_ecs_task_definition" "mongo" { "essential": true, "image": "mongo:latest", "memory": 128, + "memoryReservation": 64, "name": "mongodb" } ]