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

Add LoadBasedAutoscaling to OpsWorks Layer #10962

Merged
merged 11 commits into from
Oct 7, 2022
Merged

Add LoadBasedAutoscaling to OpsWorks Layer #10962

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8c609c
Initial commit
Nov 7, 2019
c98900e
Revert "Initial commit"
ewbankkit Oct 6, 2022
c49358f
Merge branch 'main' into HEAD
ewbankkit Oct 6, 2022
5a7065e
OpsWorks Layers: Switch to 'WithoutTimeout' CRUD handler signatures (…
ewbankkit Oct 6, 2022
e0e4dd4
OpsWorks Layers: Add Context to 'FindLayerByID'.
ewbankkit Oct 6, 2022
b143c2c
'SchemaResource' -> 'resourceSchema'.
ewbankkit Oct 6, 2022
150868c
r/aws_opsworks_custom_layer: Add 'load_based_auto_scaling' argument.
ewbankkit Oct 7, 2022
2d2351e
Add 'TestAccOpsWorksCustomLayer_loadBasedAutoScaling'.
ewbankkit Oct 7, 2022
3759e4c
Fix terrafmt error.
ewbankkit Oct 7, 2022
553f30e
Fix markdownlint 'MD025/single-title/single-h1'.
ewbankkit Oct 7, 2022
e3af370
OpsWorks Layers: Fix sweeper.
ewbankkit Oct 7, 2022
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
3 changes: 3 additions & 0 deletions .changelog/10962.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_opsworks_custom_layer: Add `load_based_auto_scaling` argument
```
2 changes: 1 addition & 1 deletion internal/service/opsworks/custom_layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ func ResourceCustomLayer() *schema.Resource {
Attributes: map[string]*opsworksLayerTypeAttribute{},
}

return layerType.SchemaResource()
return layerType.resourceSchema()
}
110 changes: 110 additions & 0 deletions internal/service/opsworks/custom_layer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ func TestAccOpsWorksCustomLayer_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "elastic_load_balancer", ""),
resource.TestCheckResourceAttr(resourceName, "instance_shutdown_timeout", "300"),
resource.TestCheckResourceAttr(resourceName, "install_updates_on_boot", "true"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.enable", "false"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "short_name", "tf-ops-acc-custom-layer"),
resource.TestCheckResourceAttr(resourceName, "system_packages.#", "2"),
Expand Down Expand Up @@ -226,6 +228,76 @@ func TestAccOpsWorksCustomLayer_cloudWatch(t *testing.T) {
})
}

func TestAccOpsWorksCustomLayer_loadBasedAutoScaling(t *testing.T) {
var v opsworks.Layer
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_opsworks_custom_layer.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(opsworks.EndpointsID, t) },
ErrorCheck: acctest.ErrorCheck(t, opsworks.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckCustomLayerDestroy,
Steps: []resource.TestStep{
{
Config: testAccCustomLayerConfig_loadBasedAutoScaling(rName, true),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckLayerExists(resourceName, &v),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.alarms.#", "0"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.cpu_threshold", "20"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.ignore_metrics_time", "15"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.instance_count", "2"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.load_threshold", "5"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.memory_threshold", "20"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.thresholds_wait_time", "30"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.enable", "true"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.alarms.#", "0"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.cpu_threshold", "80"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.ignore_metrics_time", "15"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.instance_count", "3"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.load_threshold", "10"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.memory_threshold", "80"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.thresholds_wait_time", "35"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccCustomLayerConfig_loadBasedAutoScaling(rName, false),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckLayerExists(resourceName, &v),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.alarms.#", "0"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.cpu_threshold", "20"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.ignore_metrics_time", "15"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.instance_count", "2"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.load_threshold", "5"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.memory_threshold", "20"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.downscaling.0.thresholds_wait_time", "30"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.enable", "false"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.#", "1"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.alarms.#", "0"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.cpu_threshold", "80"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.ignore_metrics_time", "15"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.instance_count", "3"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.load_threshold", "10"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.memory_threshold", "80"),
resource.TestCheckResourceAttr(resourceName, "load_based_auto_scaling.0.upscaling.0.thresholds_wait_time", "35"),
),
},
},
})
}

func testAccCheckCustomLayerDestroy(s *terraform.State) error {
return testAccCheckLayerDestroy("aws_opsworks_custom_layer", s)
}
Expand Down Expand Up @@ -383,3 +455,41 @@ resource "aws_opsworks_custom_layer" "test" {
}
`, rName))
}

func testAccCustomLayerConfig_loadBasedAutoScaling(rName string, enable bool) string {
return acctest.ConfigCompose(testAccLayerConfig_base(rName), fmt.Sprintf(`
resource "aws_opsworks_custom_layer" "test" {
stack_id = aws_opsworks_stack.test.id
name = %[1]q
short_name = "tf-ops-acc-custom-layer"
auto_assign_public_ips = true

custom_security_group_ids = aws_security_group.test[*].id

drain_elb_on_shutdown = true
instance_shutdown_timeout = 300

load_based_auto_scaling {
enable = %[2]t

downscaling {
cpu_threshold = 20
ignore_metrics_time = 15
instance_count = 2
load_threshold = 5
memory_threshold = 20
thresholds_wait_time = 30
}

upscaling {
cpu_threshold = 80
ignore_metrics_time = 15
instance_count = 3
load_threshold = 10
memory_threshold = 80
thresholds_wait_time = 35
}
}
}
`, rName, enable))
}
2 changes: 1 addition & 1 deletion internal/service/opsworks/ecs_cluster_layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ func ResourceECSClusterLayer() *schema.Resource {
},
}

return layerType.SchemaResource()
return layerType.resourceSchema()
}
2 changes: 1 addition & 1 deletion internal/service/opsworks/ganglia_layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ func ResourceGangliaLayer() *schema.Resource {
},
}

return layerType.SchemaResource()
return layerType.resourceSchema()
}
2 changes: 1 addition & 1 deletion internal/service/opsworks/haproxy_layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ func ResourceHAProxyLayer() *schema.Resource {
},
}

return layerType.SchemaResource()
return layerType.resourceSchema()
}
2 changes: 1 addition & 1 deletion internal/service/opsworks/java_app_layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ func ResourceJavaAppLayer() *schema.Resource {
},
}

return layerType.SchemaResource()
return layerType.resourceSchema()
}
Loading