Update all modules, examples and tests to the latest versions and pat…

…terns (#57) * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns * Update all modules, examples and tests to the latest versions and patterns
cloudposse · Aug 12, 2022 · a21c44b · a21c44b
1 parent f57eb66
commit a21c44b
Show file tree

Hide file tree

Showing 14 changed files with 813 additions and 434 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2020 Cloud Posse, LLC
+   Copyright 2018-2022 Cloud Posse, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -104,34 +104,35 @@ provider "aws" {
 }
 
 module "vpc" {
-  source = "cloudposse/vpc/aws"
+  source  = "cloudposse/vpc/aws"
   # Cloud Posse recommends pinning every module to a specific version
   # version     = "x.x.x"
-  namespace  = var.namespace
-  stage      = var.stage
-  name       = var.name
-  cidr_block = "172.16.0.0/16"
+
+  ipv4_primary_cidr_block = "172.19.0.0/16"
+
+  context = module.this.context
 }
 
 module "subnets" {
   source = "cloudposse/dynamic-subnets/aws"
   # Cloud Posse recommends pinning every module to a specific version
   # version     = "x.x.x"
+
   availability_zones   = var.availability_zones
-  namespace            = var.namespace
-  stage                = var.stage
-  name                 = var.name
   vpc_id               = module.vpc.vpc_id
-  igw_id               = module.vpc.igw_id
-  cidr_block           = module.vpc.vpc_cidr_block
+  igw_id               = [module.vpc.igw_id]
+  ipv4_cidr_block      = [module.vpc.vpc_cidr_block]
   nat_gateway_enabled  = false
   nat_instance_enabled = false
+
+  context = module.this.context
 }
 
 module "s3_log_storage" {
   source = "cloudposse/s3-log-storage/aws"
   # Cloud Posse recommends pinning every module to a specific version
   # version     = "x.x.x"
+  
   region        = var.region
   namespace     = var.namespace
   stage         = var.stage
@@ -156,6 +157,7 @@ module "emr_cluster" {
   source = "cloudposse/emr-cluster/aws"
   # Cloud Posse recommends pinning every module to a specific version
   # version     = "x.x.x"
+  
   namespace                                      = var.namespace
   stage                                          = var.stage
   name                                           = var.name
@@ -209,7 +211,7 @@ Available targets:
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.5.0 |
 
 ## Providers

diff --git a/README.yaml b/README.yaml
@@ -65,34 +65,35 @@ usage: |2-
   }
 
   module "vpc" {
-    source = "cloudposse/vpc/aws"
+    source  = "cloudposse/vpc/aws"
     # Cloud Posse recommends pinning every module to a specific version
     # version     = "x.x.x"
-    namespace  = var.namespace
-    stage      = var.stage
-    name       = var.name
-    cidr_block = "172.16.0.0/16"
+
+    ipv4_primary_cidr_block = "172.19.0.0/16"
+
+    context = module.this.context
   }
 
   module "subnets" {
     source = "cloudposse/dynamic-subnets/aws"
     # Cloud Posse recommends pinning every module to a specific version
     # version     = "x.x.x"
+
     availability_zones   = var.availability_zones
-    namespace            = var.namespace
-    stage                = var.stage
-    name                 = var.name
     vpc_id               = module.vpc.vpc_id
-    igw_id               = module.vpc.igw_id
-    cidr_block           = module.vpc.vpc_cidr_block
+    igw_id               = [module.vpc.igw_id]
+    ipv4_cidr_block      = [module.vpc.vpc_cidr_block]
     nat_gateway_enabled  = false
     nat_instance_enabled = false
+  
+    context = module.this.context
   }
 
   module "s3_log_storage" {
     source = "cloudposse/s3-log-storage/aws"
     # Cloud Posse recommends pinning every module to a specific version
     # version     = "x.x.x"
+    
     region        = var.region
     namespace     = var.namespace
     stage         = var.stage
@@ -117,6 +118,7 @@ usage: |2-
     source = "cloudposse/emr-cluster/aws"
     # Cloud Posse recommends pinning every module to a specific version
     # version     = "x.x.x"
+    
     namespace                                      = var.namespace
     stage                                          = var.stage
     name                                           = var.name

diff --git a/docs/terraform.md b/docs/terraform.md
@@ -3,7 +3,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.5.0 |
 
 ## Providers

diff --git a/examples/complete/fixtures.us-east-2.tfvars b/examples/complete/fixtures.us-east-2.tfvars
@@ -6,16 +6,18 @@ namespace = "eg"
 
 stage = "test"
 
-# name will be passed in by terratest, see 'examples_complete_test.go'
-//name = "emr-test"
+name = "emr"
 
 ebs_root_volume_size = 10
 
 visible_to_all_users = true
 
 # https://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-release-components.html
-release_label = "emr-6.1.0"
+release_label = "emr-6.7.0"
 
+# https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-plan-ha-applications.html
+# https://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-670-release.html
+# https://github.com/hashicorp/terraform-provider-aws/issues/23226
 applications = ["Hive", "Presto"]
 
 core_instance_group_instance_type = "m4.large"

diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -4,21 +4,21 @@ provider "aws" {
 
 module "vpc" {
   source  = "cloudposse/vpc/aws"
-  version = "0.25.0"
+  version = "1.1.0"
 
-  cidr_block = "172.16.0.0/16"
+  ipv4_primary_cidr_block = "172.19.0.0/16"
 
   context = module.this.context
 }
 
 module "subnets" {
   source  = "cloudposse/dynamic-subnets/aws"
-  version = "0.39.4"
+  version = "2.0.2"
 
   availability_zones   = var.availability_zones
   vpc_id               = module.vpc.vpc_id
-  igw_id               = module.vpc.igw_id
-  cidr_block           = module.vpc.vpc_cidr_block
+  igw_id               = [module.vpc.igw_id]
+  ipv4_cidr_block      = [module.vpc.vpc_cidr_block]
   nat_gateway_enabled  = false
   nat_instance_enabled = false
 
@@ -27,23 +27,23 @@ module "subnets" {
 
 module "s3_log_storage" {
   source  = "cloudposse/s3-log-storage/aws"
-  version = "0.24.1"
+  version = "0.26.0"
 
-  attributes    = ["logs"]
   force_destroy = true
+  attributes    = ["logs"]
 
   context = module.this.context
 }
 
 module "aws_key_pair" {
-  source              = "cloudposse/key-pair/aws"
-  version             = "0.18.2"
-  namespace           = var.namespace
-  stage               = var.stage
-  name                = var.name
-  attributes          = ["ssh", "key"]
+  source  = "cloudposse/key-pair/aws"
+  version = "0.18.3"
+
   ssh_public_key_path = var.ssh_public_key_path
   generate_ssh_key    = var.generate_ssh_key
+  attributes          = ["ssh", "key"]
+
+  context = module.this.context
 }
 
 module "emr_cluster" {
@@ -53,8 +53,8 @@ module "emr_cluster" {
   slave_allowed_security_groups                  = [module.vpc.vpc_default_security_group_id]
   region                                         = var.region
   vpc_id                                         = module.vpc.vpc_id
-  subnet_id                                      = module.subnets.private_subnet_ids[0]
-  route_table_id                                 = module.subnets.private_route_table_ids[0]
+  subnet_id                                      = module.this.enabled ? module.subnets.private_subnet_ids[0] : null
+  route_table_id                                 = module.this.enabled ? module.subnets.private_route_table_ids[0] : null
   subnet_type                                    = "private"
   ebs_root_volume_size                           = var.ebs_root_volume_size
   visible_to_all_users                           = var.visible_to_all_users

diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13.0"
+  required_version = ">= 1.1"
 
   required_providers {
     aws = {