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.

Sign up for GitHub

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

Jump to bottom

r/aws_ecs_capacity_provider: add manged_draining argument #35421

Merged
merged 9 commits into from
Jan 24, 2024
Merged

r/aws_ecs_capacity_provider: add manged_draining argument #35421

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2049389
r/aws_ecs_capacity_provider: add manged_draining argument
ari-hacks Jan 22, 2024
dc4b47c
changelog entry
ari-hacks Jan 22, 2024
8bc8bfe
Merge branch 'main' into HEAD
ewbankkit Jan 24, 2024
27e92ef
Tweak CHANGELOG entry.
ewbankkit Jan 24, 2024
1e73a7e
Fix terrafmt errors.
ewbankkit Jan 24, 2024
0346cc6
Fix markdownlint 'MD030/list-marker-space Spaces after list markers […
ewbankkit Jan 24, 2024
1882b74
Cosmetics.
ewbankkit Jan 24, 2024
80c6704
ecs: Fix failing CI acceptance tests.
ewbankkit Jan 24, 2024
3177a1b
Fix terrafmt errors.
ewbankkit Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/35421.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_ecs_capacity_provider: Add `managed_draining` argument
```
15 changes: 15 additions & 0 deletions internal/service/ecs/capacity_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ func ResourceCapacityProvider() *schema.Resource {
Computed: true,
ValidateFunc: validation.StringInSlice(ecs.ManagedTerminationProtection_Values(), false),
},
"managed_draining": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice(ecs.ManagedDraining_Values(), false),
},
},
},
},
Expand Down Expand Up @@ -285,6 +291,10 @@ func expandAutoScalingGroupProviderCreate(configured interface{}) *ecs.AutoScali
prov.ManagedTerminationProtection = aws.String(mtp)
}

if mtp := p["managed_draining"].(string); len(mtp) > 0 {
prov.ManagedDraining = aws.String(mtp)
}

prov.ManagedScaling = expandManagedScaling(p["managed_scaling"])

return &prov
Expand All @@ -306,6 +316,10 @@ func expandAutoScalingGroupProviderUpdate(configured interface{}) *ecs.AutoScali
prov.ManagedTerminationProtection = aws.String(mtp)
}

if mtp := p["managed_draining"].(string); len(mtp) > 0 {
prov.ManagedDraining = aws.String(mtp)
}

prov.ManagedScaling = expandManagedScaling(p["managed_scaling"])

return &prov
Expand Down Expand Up @@ -351,6 +365,7 @@ func flattenAutoScalingGroupProvider(provider *ecs.AutoScalingGroupProvider) []m
p := map[string]interface{}{
"auto_scaling_group_arn": aws.StringValue(provider.AutoScalingGroupArn),
"managed_termination_protection": aws.StringValue(provider.ManagedTerminationProtection),
"managed_draining": aws.StringValue(provider.ManagedDraining),
"managed_scaling": []map[string]interface{}{},
}

Expand Down
5 changes: 5 additions & 0 deletions internal/service/ecs/capacity_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func TestAccECSCapacityProvider_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
resource.TestCheckResourceAttrPair(resourceName, "auto_scaling_group_provider.0.auto_scaling_group_arn", "aws_autoscaling_group.test", "arn"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_draining", "ENABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.instance_warmup_period", "300"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.minimum_scaling_step_size", "1"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.maximum_scaling_step_size", "10000"),
Expand Down Expand Up @@ -100,6 +101,7 @@ func TestAccECSCapacityProvider_managedScaling(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttrPair(resourceName, "auto_scaling_group_provider.0.auto_scaling_group_arn", "aws_autoscaling_group.test", "arn"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_draining", "ENABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.instance_warmup_period", "300"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.minimum_scaling_step_size", "1"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.maximum_scaling_step_size", "10"),
Expand All @@ -120,6 +122,7 @@ func TestAccECSCapacityProvider_managedScaling(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttrPair(resourceName, "auto_scaling_group_provider.0.auto_scaling_group_arn", "aws_autoscaling_group.test", "arn"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_draining", "ENABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.instance_warmup_period", "400"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.minimum_scaling_step_size", "10"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.maximum_scaling_step_size", "100"),
Expand All @@ -134,6 +137,7 @@ func TestAccECSCapacityProvider_managedScaling(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttrPair(resourceName, "auto_scaling_group_provider.0.auto_scaling_group_arn", "aws_autoscaling_group.test", "arn"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_draining", "ENABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.instance_warmup_period", "0"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.minimum_scaling_step_size", "10"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.maximum_scaling_step_size", "100"),
Expand Down Expand Up @@ -164,6 +168,7 @@ func TestAccECSCapacityProvider_managedScalingPartial(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttrPair(resourceName, "auto_scaling_group_provider.0.auto_scaling_group_arn", "aws_autoscaling_group.test", "arn"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_draining", "ENABLED"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.instance_warmup_period", "300"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.minimum_scaling_step_size", "2"),
resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.maximum_scaling_step_size", "10000"),
Expand Down
2 changes: 2 additions & 0 deletions internal/service/events/target_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,7 @@ resource "aws_ecs_capacity_provider" "test" {
auto_scaling_group_provider {
auto_scaling_group_arn = aws_autoscaling_group.test.arn
managed_termination_protection = "DISABLED"
managed_draining = "ENABLED"

managed_scaling {
maximum_scaling_step_size = 1
Expand Down Expand Up @@ -1954,6 +1955,7 @@ resource "aws_ecs_capacity_provider" "test" {
auto_scaling_group_provider {
auto_scaling_group_arn = aws_autoscaling_group.test.arn
managed_termination_protection = "DISABLED"
managed_draining = "ENABLED"

managed_scaling {
maximum_scaling_step_size = 1
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/ecs_capacity_provider.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ This resource supports the following arguments:
* `auto_scaling_group_arn` - (Required) - ARN of the associated auto scaling group.
* `managed_scaling` - (Optional) - Configuration block defining the parameters of the auto scaling. Detailed below.
* `managed_termination_protection` - (Optional) - Enables or disables container-aware termination of instances in the auto scaling group when scale-in happens. Valid values are `ENABLED` and `DISABLED`.
* `managed_draining` - (Optional) - Enables or disables a graceful shutdown of instances without disturbing workloads. Valid values are `ENABLED` and `DISABLED`. The default value is `ENABLED` when a capacity provider is created.

### `managed_scaling`

Expand Down