resource/aws_ecs_task_definition: Add docker volume configuration #5727
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ewilde
force-pushed
the
ecs-docker-volume-config
branch
2 times, most recently
from
324b074 to
c627eb3
Compare
bflad
added
enhancement
ewilde
force-pushed
the
ecs-docker-volume-config
branch
2 times, most recently
from
38ec4a2 to
7c54f50
Compare
ewilde
changed the title
bflad
reviewed
Sep 4, 2018
| @@ -108,6 +108,44 @@ func resourceAwsEcsTaskDefinition() *schema.Resource { | |||
| Optional: true, | |||
| ForceNew: true, | |||
| }, | |||
|
|
|||
| "docker_volume_configuration": { | |||
| Type: schema.TypeSet, | |||
There was a problem hiding this comment.
When using MaxItems: 1 we should prefer schema.TypeList instead of schema.TypeSet for simplification (e.g. no hash function).
| "docker_volume_configuration": { | ||
| Type: schema.TypeSet, | ||
| Optional: true, | ||
| ForceNew: true, |
There was a problem hiding this comment.
Should all underlying elements be ForceNew: true as well? I believe in Terraform 0.11 the behavior of ForceNew: true propagating to all children attributes was changed/removed.
| Optional: true, | ||
| }, | ||
| "driver_opts": { | ||
| Type: schema.TypeMap, |
There was a problem hiding this comment.
While the schema validator errantly allows it in Terraform 0.11, we should always set Elem with schema.TypeMap, e.g.
Elem: &schema.Schema{Type: schema.TypeString},
See also: #5350
| Optional: true, | ||
| }, | ||
| "labels": { | ||
| Type: schema.TypeMap, |
There was a problem hiding this comment.
Same note about Elem with this attribute as well. 👍
| return hashcode.String(buf.String()) | ||
| } | ||
|
|
||
| func dockerVolumeConfigurationHash(v interface{}) int { |
There was a problem hiding this comment.
This function goes away when converting TypeSet to TypeList 👍
bflad
added
the
waiting-response
Add support for docker volume configuration to ecs task definitions Resolves hashicorp#5523 Signed-off-by: Edward Wilde <[email protected]>
ewilde
force-pushed
the
ecs-docker-volume-config
branch
from
24c8f17 to
a106e1f
Compare
|
@bflad thanks for the great feedback 👏 . All changes made, tests re-ran and all pass as before Test output: |
bflad
removed
the
waiting-response
bflad
approved these changes
Sep 12, 2018
There was a problem hiding this comment.
LGTM, thanks @ewilde! 🚀
13 tests passed (all tests)
--- PASS: TestAccAWSEcsTaskDefinition_withDockerVolume (4.40s)
--- PASS: TestAccAWSEcsTaskDefinition_arrays (4.54s)
--- PASS: TestAccAWSEcsTaskDefinition_withDockerVolumeMinimalConfig (4.48s)
--- PASS: TestAccAWSEcsTaskDefinition_constraint (4.62s)
--- PASS: TestAccAWSEcsTaskDefinition_withScratchVolume (4.63s)
--- PASS: TestAccAWSEcsTaskDefinition_ExecutionRole (10.04s)
--- PASS: TestAccAWSEcsTaskDefinition_Fargate (10.71s)
--- PASS: TestAccAWSEcsTaskDefinition_Inactive (11.89s)
--- PASS: TestAccAWSEcsTaskDefinition_basic (12.13s)
--- PASS: TestAccAWSEcsTaskDefinition_withNetworkMode (12.73s)
--- PASS: TestAccAWSEcsTaskDefinition_changeVolumesForcesNewResource (20.56s)
--- PASS: TestAccAWSEcsTaskDefinition_withTaskRoleArn (21.08s)
--- PASS: TestAccAWSEcsTaskDefinition_withEcsService (53.02s)
| @@ -621,15 +647,47 @@ func flattenEcsVolumes(list []*ecs.Volume) []map[string]interface{} { | |||
| "name": *volume.Name, | |||
| } | |||
|
|
|||
| if volume.Host.SourcePath != nil { | |||
| if volume.Host != nil && volume.Host.SourcePath != nil { | |||
| @@ -113,6 +113,32 @@ func expandEcsVolumes(configured []interface{}) ([]*ecs.Volume, error) { | |||
| } | |||
| } | |||
|
|
|||
| configList, ok := data["docker_volume_configuration"].([]interface{}) | |||
| if ok && len(configList) > 0 { | |||
| config := configList[0].(map[string]interface{}) | |||
There was a problem hiding this comment.
We may also want to add a nil check for configList[0] for this at some point in the future to prevent a potential panic, since things can get a little weird if the nested configuration has all zero-values -- see also: #5852
|
This has been released in version 1.36.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. |
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks! |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Todo
Description
Adds docker volume support to ECS task definitions
Resolves #5523
Testing
I've added a new acceptance test
TestAccAWSEcsTaskDefinition_withDockerVolumeandTestAccAWSEcsTaskDefinition_withDockerVolumeMinimalConfigHere is the output of all the ecs task definition acceptance tests including the new one: