Upgrade AWS Provider and Terraform Versions (#84)

* Upgrade AWS Provider and Terraform Versions * fixed comment --------- Co-authored-by: mayank0202 <[email protected]>
sourcefuse · Aug 14, 2024 · ab977f3 · ab977f3
1 parent b5192e6
commit ab977f3
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+![Module Structure](./static/banner.png)
+
 # [terraform-aws-arc-network](https://github.com/sourcefuse/terraform-aws-arc-network)
 
 <a href="https://github.com/sourcefuse/terraform-aws-arc-network/releases/latest"><img src="https://img.shields.io/github/release/sourcefuse/terraform-aws-arc-network.svg?style=for-the-badge" alt="Latest Release"/></a> <a href="https://github.com/sourcefuse/terraform-aws-arc-network/commits"><img src="https://img.shields.io/github/last-commit/sourcefuse/terraform-aws-arc-network.svg?style=for-the-badge" alt="Last Updated"/></a> ![Terraform](https://img.shields.io/badge/terraform-%235835CC.svg?style=for-the-badge&logo=terraform&logoColor=white) ![GitHub Actions](https://img.shields.io/badge/github%20actions-%232671E5.svg?style=for-the-badge&logo=githubactions&logoColor=white)
@@ -171,9 +173,9 @@ respectively to use the ca certificate and key generated in this module for mutu
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0, >= 4.0.0, >= 4.9.0 |
-| <a name="requirement_awsutils"></a> [awsutils](#requirement\_awsutils) | ~> 0.15 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 2.0.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0, < 6.0 |
+| <a name="requirement_awsutils"></a> [awsutils](#requirement\_awsutils) | >= 0.15 |
 
 ## Providers
 

diff --git a/examples/custom-subnets/README.md b/examples/custom-subnets/README.md
@@ -16,9 +16,7 @@ This example shows how to pass in custom subnet configuration, overriding the de
 
 ## Providers
 
-| Name | Version |
-|------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.35.0 |
+No providers.
 
 ## Modules
 
@@ -29,10 +27,7 @@ This example shows how to pass in custom subnet configuration, overriding the de
 
 ## Resources
 
-| Name | Type |
-|------|------|
-| [aws_eip.nat_eip](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eip) | resource |
-| [aws_nat_gateway.example](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/nat_gateway) | resource |
+No resources.
 
 ## Inputs
 

diff --git a/examples/simple/.terraform-version b/examples/simple/.terraform-version
@@ -1 +1 @@
-latest:^1.4
+latest:^1.7
diff --git a/examples/simple/.terraform.lock.hcl b/examples/simple/.terraform.lock.hcl
diff --git a/examples/simple/README.md b/examples/simple/README.md
@@ -3,8 +3,8 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.7 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.0 |
 
 ## Providers
 
@@ -14,7 +14,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_network"></a> [network](#module\_network) | sourcefuse/arc-network/aws | 2.6.1 |
+| <a name="module_network"></a> [network](#module\_network) | sourcefuse/arc-network/aws | n/a |
 | <a name="module_tags"></a> [tags](#module\_tags) | sourcefuse/arc-tags/aws | 1.2.3 |
 
 ## Resources

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -2,12 +2,12 @@
 ## defaults
 ################################################################
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.7"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
   }
 }
@@ -33,7 +33,6 @@ module "tags" {
 ################################################################
 module "network" {
   source                      = "sourcefuse/arc-network/aws"
-  version                     = "2.6.1"
   namespace                   = var.namespace
   environment                 = var.environment
   availability_zones          = var.availability_zones

diff --git a/main.tf b/main.tf
@@ -1,22 +1,3 @@
-################################################################################
-## defaults
-################################################################################
-terraform {
-  required_version = "~> 1.3"
-
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 3.0.0, >= 4.0.0, >= 4.9.0"
-    }
-
-    awsutils = {
-      source  = "cloudposse/awsutils"
-      version = "~> 0.15"
-    }
-  }
-}
-
 ################################################################################
 ## vpc
 ################################################################################

diff --git a/modules/subnets/README.md b/modules/subnets/README.md
@@ -9,8 +9,8 @@ AWS Subnets for the ARC Infrastructure.
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3, < 2.0.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0, < 6.0 |
 
 ## Providers
 

diff --git a/modules/subnets/main.tf b/modules/subnets/main.tf
@@ -2,12 +2,12 @@
 ## defaults
 ################################################################################
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.3, < 2.0.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.0"
+      version = ">= 4.0, < 6.0"
     }
   }
 }
@@ -158,8 +158,6 @@ resource "aws_route_table_association" "public" {
 resource "aws_eip" "public" {
   for_each = { for x in var.public_subnets : x.name => x if var.nat_gateway_enabled == true }
 
-  vpc = true
-
   tags = merge(var.tags, tomap({
     Name = each.value.name
   }))

diff --git a/static/banner.png b/static/banner.png
diff --git a/versions.tf b/versions.tf
@@ -0,0 +1,18 @@
+################################################################################
+## defaults
+################################################################################
+terraform {
+  required_version = ">= 1.3, < 2.0.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 4.0, < 6.0"
+    }
+
+    awsutils = {
+      source  = "cloudposse/awsutils"
+      version = ">= 0.15"
+    }
+  }
+}