Update ECS client and task defs (#2256)

aws · Dec 5, 2019 · 743dac5 · 743dac5
1 parent 7ed7ae3
commit 743dac5
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/agent/ecs_client/model/api/api-2.json b/agent/ecs_client/model/api/api-2.json
@@ -1169,6 +1169,13 @@
       "type":"list",
       "member":{"shape":"KeyValuePair"}
     },
+    "EFSVolumeConfiguration": {
+      "type":"structure",
+      "members":{
+        "fileSystemId":{"shape":"String"},
+        "rootDirectory":{"shape":"String"}
+      }
+    },
     "Failure":{
       "type":"structure",
       "members":{
@@ -2322,7 +2329,8 @@
       "members":{
         "name":{"shape":"String"},
         "host":{"shape":"HostVolumeProperties"},
-        "dockerVolumeConfiguration":{"shape":"DockerVolumeConfiguration"}
+        "dockerVolumeConfiguration":{"shape":"DockerVolumeConfiguration"},
+        "efsVolumeConfiguration":{"shape":"EFSVolumeConfiguration"}
       }
     },
     "VolumeFrom":{

diff --git a/agent/ecs_client/model/ecs/api.go b/agent/ecs_client/model/ecs/api.go
diff --git a/agent/functional_tests/testdata/taskdefinitions/task-efs-vol-read/task-definition.json b/agent/functional_tests/testdata/taskdefinitions/task-efs-vol-read/task-definition.json
@@ -5,7 +5,7 @@
             "name": "task-efs-vol-read",
             "image": "127.0.0.1:51670/busybox:latest",
             "cpu": 10,
-            "command": ["sh", "-c", "while true; do sleep 1; [ -f /ecs/success ] && if grep -q 'can you read me' /ecs/success; then exit 42; fi done"],
+            "command": ["sh", "-c", "while true;  do sleep 1; [ -f /ecs/success ] && if grep -q 'can you read me' /ecs/success; then exit 42; fi done"],
             "memory": 256,
             "memoryReservation": 128,
             "mountPoints": [

diff --git a/agent/functional_tests/testdata/taskdefinitions/task-efs-vol-write/task-definition.json b/agent/functional_tests/testdata/taskdefinitions/task-efs-vol-write/task-definition.json
@@ -5,7 +5,7 @@
             "name": "task-efs-vol-write",
             "image": "127.0.0.1:51670/busybox:latest",
             "cpu": 10,
-            "command": ["sh", "-c", "echo 'can you read me'> /ecs/success; [ -f /ecs/success ] && exit 42 || exit 1"],
+            "command": ["sh", "-c", "echo 'can you read me' > /ecs/success; [ -f /ecs/success ] && exit 42 || exit 1"],
             "memory": 256,
             "memoryReservation": 128,
             "mountPoints": [