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.

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

Update ECS client and task defs #2256

Merged
merged 1 commit into from
Nov 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion agent/ecs_client/model/api/api-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,13 @@
"type":"list",
"member":{"shape":"KeyValuePair"}
},
"EFSVolumeConfiguration": {
"type":"structure",
"members":{
"fileSystemId":{"shape":"String"},
"rootDirectory":{"shape":"String"}
}
},
"Failure":{
"type":"structure",
"members":{
Expand Down Expand Up @@ -2322,7 +2329,8 @@
"members":{
"name":{"shape":"String"},
"host":{"shape":"HostVolumeProperties"},
"dockerVolumeConfiguration":{"shape":"DockerVolumeConfiguration"}
"dockerVolumeConfiguration":{"shape":"DockerVolumeConfiguration"},
"efsVolumeConfiguration":{"shape":"EFSVolumeConfiguration"}
}
},
"VolumeFrom":{
Expand Down
38 changes: 38 additions & 0 deletions agent/ecs_client/model/ecs/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -6982,6 +6982,36 @@ func (s *DockerVolumeConfiguration) SetScope(v string) *DockerVolumeConfiguratio
return s
}

type EFSVolumeConfiguration struct {
_ struct{} `type:"structure"`

FileSystemId *string `locationName:"fileSystemId" type:"string"`

RootDirectory *string `locationName:"rootDirectory" type:"string"`
}

// String returns the string representation
func (s EFSVolumeConfiguration) String() string {
return awsutil.Prettify(s)
}

// GoString returns the string representation
func (s EFSVolumeConfiguration) GoString() string {
return s.String()
}

// SetFileSystemId sets the FileSystemId field's value.
func (s *EFSVolumeConfiguration) SetFileSystemId(v string) *EFSVolumeConfiguration {
s.FileSystemId = &v
return s
}

// SetRootDirectory sets the RootDirectory field's value.
func (s *EFSVolumeConfiguration) SetRootDirectory(v string) *EFSVolumeConfiguration {
s.RootDirectory = &v
return s
}

// A failed resource.
type Failure struct {
_ struct{} `type:"structure"`
Expand Down Expand Up @@ -12283,6 +12313,8 @@ type Volume struct {

DockerVolumeConfiguration *DockerVolumeConfiguration `locationName:"dockerVolumeConfiguration" type:"structure"`

EfsVolumeConfiguration *EFSVolumeConfiguration `locationName:"efsVolumeConfiguration" type:"structure"`

// The contents of the host parameter determine whether your data volume persists
// on the host container instance and where it is stored. If the host parameter
// is empty, then the Docker daemon assigns a host path for your data volume,
Expand Down Expand Up @@ -12317,6 +12349,12 @@ func (s *Volume) SetDockerVolumeConfiguration(v *DockerVolumeConfiguration) *Vol
return s
}

// SetEfsVolumeConfiguration sets the EfsVolumeConfiguration field's value.
func (s *Volume) SetEfsVolumeConfiguration(v *EFSVolumeConfiguration) *Volume {
s.EfsVolumeConfiguration = v
return s
}

// SetHost sets the Host field's value.
func (s *Volume) SetHost(v *HostVolumeProperties) *Volume {
s.Host = v
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down