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

Support AWS Provider V5 #113

Merged
merged 10 commits into from
May 31, 2023
Merged

Support AWS Provider V5 #113

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
47d4ed2
Support AWS Provider V5
max-lobur May 30, 2023
9aadffd
Bump tf
max-lobur May 30, 2023
8fcf414
Bump tf
max-lobur May 30, 2023
f10bf17
bump vpc
max-lobur May 30, 2023
c6784ee
bump subnets
max-lobur May 30, 2023
7588200
bump vpc
max-lobur May 30, 2023
07d26f4
bump vpc
max-lobur May 30, 2023
6d7247c
bump vpc
max-lobur May 30, 2023
dc40205
bump subnets
max-lobur May 30, 2023
5dcf118
fix tests
max-lobur May 30, 2023
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: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Available targets:

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |

## Providers
Expand Down Expand Up @@ -340,7 +340,6 @@ Available targets:
| <a name="output_autoscaling_group_max_size"></a> [autoscaling\_group\_max\_size](#output\_autoscaling\_group\_max\_size) | The maximum size of the autoscale group |
| <a name="output_autoscaling_group_min_size"></a> [autoscaling\_group\_min\_size](#output\_autoscaling\_group\_min\_size) | The minimum size of the autoscale group |
| <a name="output_autoscaling_group_name"></a> [autoscaling\_group\_name](#output\_autoscaling\_group\_name) | The AutoScaling Group name |
| <a name="output_autoscaling_group_tags"></a> [autoscaling\_group\_tags](#output\_autoscaling\_group\_tags) | A list of tag settings associated with the AutoScaling Group |
| <a name="output_autoscaling_policy_scale_down_arn"></a> [autoscaling\_policy\_scale\_down\_arn](#output\_autoscaling\_policy\_scale\_down\_arn) | ARN of the AutoScaling policy scale down |
| <a name="output_autoscaling_policy_scale_up_arn"></a> [autoscaling\_policy\_scale\_up\_arn](#output\_autoscaling\_policy\_scale\_up\_arn) | ARN of the AutoScaling policy scale up |
| <a name="output_launch_template_arn"></a> [launch\_template\_arn](#output\_launch\_template\_arn) | The ARN of the launch template |
Expand Down
12 changes: 6 additions & 6 deletions autoscaling.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_autoscaling_policy" "scale_up" {
adjustment_type = var.scale_up_adjustment_type
policy_type = var.scale_up_policy_type
cooldown = var.scale_up_cooldown_seconds
autoscaling_group_name = join("", aws_autoscaling_group.default.*.name)
autoscaling_group_name = one(aws_autoscaling_group.default[*].name)
}

resource "aws_autoscaling_policy" "scale_down" {
Expand All @@ -20,7 +20,7 @@ resource "aws_autoscaling_policy" "scale_down" {
adjustment_type = var.scale_down_adjustment_type
policy_type = var.scale_down_policy_type
cooldown = var.scale_down_cooldown_seconds
autoscaling_group_name = join("", aws_autoscaling_group.default.*.name)
autoscaling_group_name = one(aws_autoscaling_group.default[*].name)
}

locals {
Expand All @@ -36,9 +36,9 @@ locals {
extended_statistic = null
threshold = var.cpu_utilization_high_threshold_percent
dimensions_name = "AutoScalingGroupName"
dimensions_target = join("", aws_autoscaling_group.default.*.name)
dimensions_target = one(aws_autoscaling_group.default[*].name)
alarm_description = "Scale up if CPU utilization is above ${var.cpu_utilization_high_threshold_percent} for ${var.cpu_utilization_high_period_seconds} * ${var.cpu_utilization_high_evaluation_periods} seconds"
alarm_actions = [join("", aws_autoscaling_policy.scale_up.*.arn)]
alarm_actions = [one(aws_autoscaling_policy.scale_up[*].arn)]
treat_missing_data = "missing"
ok_actions = []
insufficient_data_actions = []
Expand All @@ -54,9 +54,9 @@ locals {
extended_statistic = null
threshold = var.cpu_utilization_low_threshold_percent
dimensions_name = "AutoScalingGroupName"
dimensions_target = join("", aws_autoscaling_group.default.*.name)
dimensions_target = one(aws_autoscaling_group.default[*].name)
alarm_description = "Scale down if the CPU utilization is below ${var.cpu_utilization_low_threshold_percent} for ${var.cpu_utilization_low_period_seconds} * ${var.cpu_utilization_high_evaluation_periods} seconds"
alarm_actions = [join("", aws_autoscaling_policy.scale_down.*.arn)]
alarm_actions = [one(aws_autoscaling_policy.scale_down[*].arn)]
treat_missing_data = "missing"
ok_actions = []
insufficient_data_actions = []
Expand Down
3 changes: 1 addition & 2 deletions docs/terraform.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |

## Providers
Expand Down Expand Up @@ -133,7 +133,6 @@
| <a name="output_autoscaling_group_max_size"></a> [autoscaling\_group\_max\_size](#output\_autoscaling\_group\_max\_size) | The maximum size of the autoscale group |
| <a name="output_autoscaling_group_min_size"></a> [autoscaling\_group\_min\_size](#output\_autoscaling\_group\_min\_size) | The minimum size of the autoscale group |
| <a name="output_autoscaling_group_name"></a> [autoscaling\_group\_name](#output\_autoscaling\_group\_name) | The AutoScaling Group name |
| <a name="output_autoscaling_group_tags"></a> [autoscaling\_group\_tags](#output\_autoscaling\_group\_tags) | A list of tag settings associated with the AutoScaling Group |
| <a name="output_autoscaling_policy_scale_down_arn"></a> [autoscaling\_policy\_scale\_down\_arn](#output\_autoscaling\_policy\_scale\_down\_arn) | ARN of the AutoScaling policy scale down |
| <a name="output_autoscaling_policy_scale_up_arn"></a> [autoscaling\_policy\_scale\_up\_arn](#output\_autoscaling\_policy\_scale\_up\_arn) | ARN of the AutoScaling policy scale up |
| <a name="output_launch_template_arn"></a> [launch\_template\_arn](#output\_launch\_template\_arn) | The ARN of the launch template |
Expand Down
6 changes: 3 additions & 3 deletions examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ provider "aws" {

module "vpc" {
source = "cloudposse/vpc/aws"
version = "0.18.1"
cidr_block = "172.16.0.0/16"
version = "2.1.0"
max-lobur marked this conversation as resolved.
Show resolved Hide resolved
ipv4_primary_cidr_block = "172.16.0.0/16"

context = module.this.context
}

module "subnets" {
source = "cloudposse/dynamic-subnets/aws"
version = "0.38.0"
version = "2.3.0"
availability_zones = var.availability_zones
vpc_id = module.vpc.vpc_id
igw_id = module.vpc.igw_id
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
4 changes: 2 additions & 2 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ resource "aws_launch_template" "default" {

locals {
launch_template_block = {
id = join("", aws_launch_template.default.*.id)
version = var.launch_template_version != "" ? var.launch_template_version : join("", aws_launch_template.default.*.latest_version)
id = one(aws_launch_template.default[*].id)
version = var.launch_template_version != "" ? var.launch_template_version : one(aws_launch_template.default[*].latest_version)
}
launch_template = (
var.mixed_instances_policy == null ? local.launch_template_block
Expand Down
31 changes: 13 additions & 18 deletions outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,64 @@
output "launch_template_id" {
description = "The ID of the launch template"
value = join("", aws_launch_template.default.*.id)
value = one(aws_launch_template.default[*].id)
}

output "launch_template_arn" {
description = "The ARN of the launch template"
value = join("", aws_launch_template.default.*.arn)
value = one(aws_launch_template.default[*].arn)
}

output "autoscaling_group_id" {
description = "The AutoScaling Group id"
value = join("", aws_autoscaling_group.default.*.id)
value = one(aws_autoscaling_group.default[*].id)
}

output "autoscaling_group_name" {
description = "The AutoScaling Group name"
value = join("", aws_autoscaling_group.default.*.name)
}

output "autoscaling_group_tags" {
description = "A list of tag settings associated with the AutoScaling Group"
value = module.this.enabled ? aws_autoscaling_group.default[0].tags : []
value = one(aws_autoscaling_group.default[*].name)
}

output "autoscaling_group_arn" {
description = "ARN of the AutoScaling Group"
value = join("", aws_autoscaling_group.default.*.arn)
value = one(aws_autoscaling_group.default[*].arn)
}

output "autoscaling_group_min_size" {
description = "The minimum size of the autoscale group"
value = join("", aws_autoscaling_group.default.*.min_size)
value = one(aws_autoscaling_group.default[*].min_size)
}

output "autoscaling_group_max_size" {
description = "The maximum size of the autoscale group"
value = join("", aws_autoscaling_group.default.*.max_size)
value = one(aws_autoscaling_group.default[*].max_size)
}

output "autoscaling_group_desired_capacity" {
description = "The number of Amazon EC2 instances that should be running in the group"
value = join("", aws_autoscaling_group.default.*.desired_capacity)
value = one(aws_autoscaling_group.default[*].desired_capacity)
}

output "autoscaling_group_default_cooldown" {
description = "Time between a scaling activity and the succeeding scaling activity"
value = join("", aws_autoscaling_group.default.*.default_cooldown)
value = one(aws_autoscaling_group.default[*].default_cooldown)
}

output "autoscaling_group_health_check_grace_period" {
description = "Time after instance comes into service before checking health"
value = join("", aws_autoscaling_group.default.*.health_check_grace_period)
value = one(aws_autoscaling_group.default[*].health_check_grace_period)
}

output "autoscaling_group_health_check_type" {
description = "`EC2` or `ELB`. Controls how health checking is done"
value = join("", aws_autoscaling_group.default.*.health_check_type)
value = one(aws_autoscaling_group.default[*].health_check_type)
}

output "autoscaling_policy_scale_down_arn" {
description = "ARN of the AutoScaling policy scale down"
value = join("", aws_autoscaling_policy.scale_down.*.arn)
value = one(aws_autoscaling_policy.scale_down[*].arn)
}

output "autoscaling_policy_scale_up_arn" {
description = "ARN of the AutoScaling policy scale up"
value = join("", aws_autoscaling_policy.scale_up.*.arn)
value = one(aws_autoscaling_policy.scale_up[*].arn)
}
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down