From 04f235b2a8caad20581ed6a0cfd249b8cb18a8f5 Mon Sep 17 00:00:00 2001 From: Sam Detnon Date: Thu, 11 Aug 2022 14:31:53 +0100 Subject: [PATCH 1/3] use the default image provided by amazon in the parameter store --- main.tf | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/main.tf b/main.tf index fe6174d..9aff8eb 100644 --- a/main.tf +++ b/main.tf @@ -62,32 +62,12 @@ resource "aws_security_group_rule" "egress" { } locals { - ami = var.ami == "" ? data.aws_ami.default.id : var.ami + ami = var.ami == "" ? data.aws_ssm_parameter.latest_amazon_ami.value : var.ami security_group_name = "${var.name}-session-manager-ec2" } -# https://www.terraform.io/docs/providers/aws/d/ami.html#attributes-reference -data "aws_ami" "default" { - most_recent = true - owners = ["amazon"] - - # Describe filters - # https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html - filter { - name = "owner-alias" - values = ["amazon"] - } - - # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html - filter { - name = "name" - values = ["amzn2-ami-hvm-2.0.????????-x86_64-gp2"] - } - - filter { - name = "state" - values = ["available"] - } +data "aws_ssm_parameter" "aws_ami_default" { + name = "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs" } # Session Manager IAM Instance Profile From a058889ff46f5aacf74134df9884233050eb9ff4 Mon Sep 17 00:00:00 2001 From: Sam Detnon Date: Thu, 11 Aug 2022 14:52:18 +0100 Subject: [PATCH 2/3] Change to gp2 --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 9aff8eb..e2ecb1a 100644 --- a/main.tf +++ b/main.tf @@ -67,7 +67,7 @@ locals { } data "aws_ssm_parameter" "aws_ami_default" { - name = "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs" + name = "/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2" } # Session Manager IAM Instance Profile From fa6f891e0b45333112ec0e6c558dc944bc8a62e5 Mon Sep 17 00:00:00 2001 From: Sam Detnon Date: Thu, 11 Aug 2022 14:57:39 +0100 Subject: [PATCH 3/3] enter correct resource name --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index e2ecb1a..bbb26e6 100644 --- a/main.tf +++ b/main.tf @@ -62,7 +62,7 @@ resource "aws_security_group_rule" "egress" { } locals { - ami = var.ami == "" ? data.aws_ssm_parameter.latest_amazon_ami.value : var.ami + ami = var.ami == "" ? data.aws_ssm_parameter.aws_ami_default.value : var.ami security_group_name = "${var.name}-session-manager-ec2" }