chore: Update Terraform versions and required providers in modules

Author: ulises-jeremias

live/common-infra/README.md

@@ -12,39 +12,64 @@
 
 ## Prerequisites
 
+- [Direnv](https://direnv.net/) for loading environment variables.
 - [Terraform](https://www.terraform.io/downloads.html) for infrastructure provisioning.
 - [TFswitch](https://tfswitch.warrensbox.com/) to switch between Terraform versions easily.
 
 ## Setup
 
-1. **Set Terraform Version:**
+1. **Change Directory:**
+
+   Navigate to the directory containing the Terraform configuration:
+
+   ```sh
+   cd live/common-infra
+   ```
+
+2. **Create .envrc file:**
+
+   Create a new `.envrc` file in this directory by copying the `.envrc.example` file:
+
+   ```sh
+   cp .envrc.example .envrc
+   ```
+
+   Then, update the `.envrc` file with the values for your environment!
+
+3. **Load Environment Variables:**
+
+   Load the environment variables using `direnv`:
+
+   ```sh
+   direnv allow
+   ```
+
+4. **Set Terraform Version:**
 
    Ensure you are using the correct Terraform version:
 
    ```sh
    tfswitch
    ```
 
-2. **Initialize Terraform:**
+5. **Initialize Terraform:**
 
    Initialize the working directory with the required providers and modules:
 
    ```sh
-   terraform init -backend-config="./configs/prod-backend.tfvars"
+   terraform init -backend-config="./configs/${ENVIRONMENT}-backend.tfvars"
    ```
 
-3. **Workspace Management:**
+6. **Workspace Management:**
 
    Select or create a new workspace tailored to your deployment environment:
 
    ```sh
    # Select an existing workspace
-   terraform workspace select prod
+   terraform workspace select "${TF_WORKSPACE}"
 
-   # Create a new workspace if it doesn't exist
-   # and select it
-   terraform workspace new prod
-   terraform workspace select prod
+   # Create a new workspace if it doesn't exist and select it
+   terraform workspace new "${TF_WORKSPACE}"
    ```
 
 ## Deploy
@@ -56,15 +81,15 @@
    Review and verify the deployment plan:
 
    ```sh
-   terraform plan -var-file ./configs/prod.tfvars -out prod.tfplan
+   terraform plan -var-file "./configs/${ENVIRONMENT}.tfvars" -out "${ENVIRONMENT}.tfplan"
    ```
 
 2. **Execute the Plan:**
 
    Apply the planned configuration to provision the infrastructure:
 
    ```sh
-   terraform apply "prod.tfplan"
+   terraform apply "${ENVIRONMENT}.tfplan"
    ```
 
 ## Post Deployment Steps
@@ -139,12 +164,10 @@ These steps will help you verify the successful setup of the database and ensure
 
 ## Destroy
 
-💣 **NOTE:** In this example, we are using the `prod` environment and the `us-west-2` region. Modify these values according to your environment and region.
-
 To destroy the infrastructure, run the following command:
 
 ```sh
-terraform destroy -var-file ./configs/prod.tfvars
+terraform destroy -var-file "./configs/${ENVIRONMENT}.tfvars"
 ```
 
 ## Module Documentation

live/common-infra/main.tf

@@ -5,6 +5,7 @@ provider "aws" {
     tags = merge(module.label.tags, {
       ManagedBy      = "terraform"
       Owner          = "NaNLABS"
+      Project        = "[Project Name]"
       Repository     = "https://github.com/nanlabs/terraform-aws-starter"
       RepositoryPath = "live/common-infra"
     })

live/common-infra/vpc.tf

@@ -3,18 +3,43 @@ variable "core_networking_ssm_parameter_prefix" {
   type        = string
 }
 
+variable "bastion_security_group_name" {
+  description = "The name of the bastion security group"
+  type        = string
+}
+
+locals {
+  vpc_id          = data.aws_ssm_parameter.vpc_id.value
+  private_subnets = split(",", data.aws_ssm_parameter.private_subnets.value)
+  public_subnets  = split(",", data.aws_ssm_parameter.public_subnets.value)
+}
+
 data "aws_ssm_parameter" "vpc_id" {
   name = "${var.core_networking_ssm_parameter_prefix}/vpc_id"
 }
 
-data "aws_ssm_parameter" "app_subnets" {
-  name = "${var.core_networking_ssm_parameter_prefix}/app_subnets"
+data "aws_ssm_parameter" "private_subnets" {
+  name = "${var.core_networking_ssm_parameter_prefix}/private_subnets"
+}
+
+data "aws_ssm_parameter" "public_subnets" {
+  name = "${var.core_networking_ssm_parameter_prefix}/public_subnets"
+}
+
+data "aws_security_group" "default" {
+  vpc_id = local.vpc_id
+
+  filter {
+    name   = "group-name"
+    values = ["default"]
+  }
 }
 
-data "aws_ssm_parameter" "database_subnets" {
-  name = "${var.core_networking_ssm_parameter_prefix}/database_subnets"
+data "aws_vpc" "vpc" {
+  id = local.vpc_id
 }
 
-data "aws_ssm_parameter" "database_subnet_group" {
-  name = "${var.core_networking_ssm_parameter_prefix}/database_subnet_group"
+data "aws_security_group" "bastion_security_group" {
+  name   = var.bastion_security_group_name
+  vpc_id = local.vpc_id
 }