diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs/api.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs/api.go index bd9a75b4e7..6d98dc80c2 100644 --- a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs/api.go +++ b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs/api.go @@ -622,8 +622,6 @@ type Container struct { ContainerArn *string `locationName:"containerArn" type:"string"` - ContainerRestartPolicy *ContainerRestartPolicy `locationName:"containerRestartPolicy" type:"structure"` - Cpu *int64 `locationName:"cpu" type:"integer"` CredentialSpecs []*string `locationName:"credentialSpecs" type:"list"` @@ -673,9 +671,7 @@ type Container struct { RegistryAuthentication *RegistryAuthenticationData `locationName:"registryAuthentication" type:"structure"` - RestartMaxAttempts *int64 `locationName:"restartMaxAttempts" type:"integer"` - - RestartPolicy *string `locationName:"restartPolicy" type:"string" enum:"RestartPolicy"` + RestartPolicy *RestartPolicy `locationName:"restartPolicy" type:"structure"` Secrets []*Secret `locationName:"secrets" type:"list"` @@ -745,34 +741,6 @@ func (s ContainerDependency) GoString() string { return s.String() } -type ContainerRestartPolicy struct { - _ struct{} `type:"structure"` - - Enabled *bool `locationName:"enabled" type:"boolean"` - - IgnoredExitCodes []*int64 `locationName:"ignoredExitCodes" type:"list"` - - RestartAttemptPeriod *int64 `locationName:"restartAttemptPeriod" type:"integer"` -} - -// String returns the string representation. -// -// API parameter values that are decorated as "sensitive" in the API will not -// be included in the string output. The member name will be present, but the -// value will be replaced with "sensitive". -func (s ContainerRestartPolicy) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation. -// -// API parameter values that are decorated as "sensitive" in the API will not -// be included in the string output. The member name will be present, but the -// value will be replaced with "sensitive". -func (s ContainerRestartPolicy) GoString() string { - return s.String() -} - type Device struct { _ struct{} `type:"structure"` @@ -2395,6 +2363,34 @@ func (s RegistryAuthenticationData) GoString() string { return s.String() } +type RestartPolicy struct { + _ struct{} `type:"structure"` + + Enabled *bool `locationName:"enabled" type:"boolean"` + + IgnoredExitCodes []*int64 `locationName:"ignoredExitCodes" type:"list"` + + RestartAttemptPeriod *int64 `locationName:"restartAttemptPeriod" type:"integer"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RestartPolicy) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RestartPolicy) GoString() string { + return s.String() +} + type Secret struct { _ struct{} `type:"structure"` diff --git a/ecs-agent/acs/model/api/api-2.json b/ecs-agent/acs/model/api/api-2.json index 6056c22455..a0ddb3bcae 100644 --- a/ecs-agent/acs/model/api/api-2.json +++ b/ecs-agent/acs/model/api/api-2.json @@ -289,7 +289,6 @@ "environmentFiles":{"shape":"EnvironmentFiles"}, "essential":{"shape":"Boolean"}, "restartPolicy":{"shape":"RestartPolicy"}, - "restartMaxAttempts":{"shape":"Integer"}, "image":{"shape":"String"}, "links":{"shape":"StringList"}, "memory":{"shape":"Integer"}, @@ -311,11 +310,10 @@ "startTimeout":{"shape":"Integer"}, "stopTimeout":{"shape":"Integer"}, "firelensConfiguration":{"shape":"FirelensConfiguration"}, - "containerArn":{"shape":"String"}, - "containerRestartPolicy":{"shape":"ContainerRestartPolicy"} + "containerArn":{"shape":"String"} } }, - "ContainerRestartPolicy":{ + "RestartPolicy":{ "type":"structure", "members":{ "enabled":{"shape":"Boolean"}, @@ -796,14 +794,6 @@ "asmAuthData":{"shape":"ASMAuthData"} } }, - "RestartPolicy":{ - "type":"string", - "enum":[ - "NEVER", - "UNLESS_TASK_STOPPED", - "ON_FAILURE" - ] - }, "RoleType":{ "type":"string", "enum":[ diff --git a/ecs-agent/acs/model/ecsacs/api.go b/ecs-agent/acs/model/ecsacs/api.go index bd9a75b4e7..6d98dc80c2 100644 --- a/ecs-agent/acs/model/ecsacs/api.go +++ b/ecs-agent/acs/model/ecsacs/api.go @@ -622,8 +622,6 @@ type Container struct { ContainerArn *string `locationName:"containerArn" type:"string"` - ContainerRestartPolicy *ContainerRestartPolicy `locationName:"containerRestartPolicy" type:"structure"` - Cpu *int64 `locationName:"cpu" type:"integer"` CredentialSpecs []*string `locationName:"credentialSpecs" type:"list"` @@ -673,9 +671,7 @@ type Container struct { RegistryAuthentication *RegistryAuthenticationData `locationName:"registryAuthentication" type:"structure"` - RestartMaxAttempts *int64 `locationName:"restartMaxAttempts" type:"integer"` - - RestartPolicy *string `locationName:"restartPolicy" type:"string" enum:"RestartPolicy"` + RestartPolicy *RestartPolicy `locationName:"restartPolicy" type:"structure"` Secrets []*Secret `locationName:"secrets" type:"list"` @@ -745,34 +741,6 @@ func (s ContainerDependency) GoString() string { return s.String() } -type ContainerRestartPolicy struct { - _ struct{} `type:"structure"` - - Enabled *bool `locationName:"enabled" type:"boolean"` - - IgnoredExitCodes []*int64 `locationName:"ignoredExitCodes" type:"list"` - - RestartAttemptPeriod *int64 `locationName:"restartAttemptPeriod" type:"integer"` -} - -// String returns the string representation. -// -// API parameter values that are decorated as "sensitive" in the API will not -// be included in the string output. The member name will be present, but the -// value will be replaced with "sensitive". -func (s ContainerRestartPolicy) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation. -// -// API parameter values that are decorated as "sensitive" in the API will not -// be included in the string output. The member name will be present, but the -// value will be replaced with "sensitive". -func (s ContainerRestartPolicy) GoString() string { - return s.String() -} - type Device struct { _ struct{} `type:"structure"` @@ -2395,6 +2363,34 @@ func (s RegistryAuthenticationData) GoString() string { return s.String() } +type RestartPolicy struct { + _ struct{} `type:"structure"` + + Enabled *bool `locationName:"enabled" type:"boolean"` + + IgnoredExitCodes []*int64 `locationName:"ignoredExitCodes" type:"list"` + + RestartAttemptPeriod *int64 `locationName:"restartAttemptPeriod" type:"integer"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RestartPolicy) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RestartPolicy) GoString() string { + return s.String() +} + type Secret struct { _ struct{} `type:"structure"`