Merge branch 'develop'

statgen · Apr 25, 2024 · dc8ba3f · dc8ba3f
2 parents 406581f + 5a84913
commit dc8ba3f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/main.tf b/main.tf
@@ -16,7 +16,7 @@ data "aws_region" "current" {}
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "3.1.0"
+  version = "5.5.3"
 
   name = "imputation-example-vpc"
   cidr = "10.120.0.0/16"

diff --git a/modules/imputation-iam/main.tf b/modules/imputation-iam/main.tf
@@ -50,7 +50,7 @@ resource "aws_iam_role" "emr" {
 
 resource "aws_iam_role_policy_attachment" "emr" {
   role       = aws_iam_role.emr.name
-  policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceRole"
+  policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonEMRServicePolicy_v2"
 }
 
 resource "aws_iam_role" "ec2" {
@@ -61,7 +61,8 @@ resource "aws_iam_role" "ec2" {
 }
 
 resource "aws_iam_role_policy_attachment" "ec2" {
-  role       = aws_iam_role.ec2.name
+  role = aws_iam_role.ec2.name
+  # NOTE: Deprecated, but with no replacement policy; we'd need to develop our own
   policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceforEC2Role"
 }
 

diff --git a/modules/imputation-iam/versions.tf b/modules/imputation-iam/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }
 

diff --git a/modules/imputation-lb/variables.tf b/modules/imputation-lb/variables.tf
@@ -69,7 +69,7 @@ variable "port" {
 
 variable "ssl_policy" {
   description = "The name of the SSL Policy for the listener"
-  default     = "ELBSecurityPolicy-2016-08"
+  default     = "ELBSecurityPolicy-TLS13-1-2-2021-06"
   type        = string
 }
 

diff --git a/modules/imputation-lb/versions.tf b/modules/imputation-lb/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }
 

diff --git a/modules/imputation-security-group-rules/versions.tf b/modules/imputation-security-group-rules/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }
 

diff --git a/modules/imputation-server/variables.tf b/modules/imputation-server/variables.tf
@@ -154,8 +154,10 @@ variable "ec2_iam_role_tags" {
 
 variable "emr_cluster_tags" {
   description = "Tags to be applied to the EMR cluster"
-  default     = {}
-  type        = map(string)
+  default = {
+    "for-use-with-amazon-emr-managed-policies" : true
+  }
+  type = map(string)
 }
 
 variable "emr_iam_role_tags" {

diff --git a/modules/imputation-server/versions.tf b/modules/imputation-server/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }
 

diff --git a/versions.tf b/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 5.0"
     }
   }