feat: reorganize resources by services (#2)

Author: g-otn

api-gateway.tf

@@ -0,0 +1,15 @@
+resource "aws_apigatewayv2_api" "main" {
+  name          = "SOAT Tech Challenge API"
+  description   = "API for SOAT Tech Challenge HTTP communication"
+  protocol_type = "HTTP"
+}
+
+resource "aws_apigatewayv2_stage" "main" {
+  api_id      = aws_apigatewayv2_api.main.id
+  name        = "$default"
+  auto_deploy = true
+
+  tags = {
+    Name = "SOAT-TC API Default Stage"
+  }
+}

api_gateway_integrations.tf

@@ -0,0 +1,7 @@
+resource "aws_apigatewayv2_integration" "debug_integration" {
+  api_id           = aws_apigatewayv2_api.main.id
+  integration_type = "HTTP_PROXY"
+
+  integration_method = "ANY"
+  integration_uri    = "https://example.com/"
+}

api_gateway_outputs.tf

@@ -0,0 +1,23 @@
+output "api_gateway_api" {
+  description = "HTTP API"
+  value = {
+    "api_endpoint" : aws_apigatewayv2_api.main.api_endpoint
+    "arn" : aws_apigatewayv2_api.main.arn
+    "execution_arn" : aws_apigatewayv2_api.main.execution_arn
+    "id" : aws_apigatewayv2_api.main.id
+    "name" : aws_apigatewayv2_api.main.name
+    "tags" : aws_apigatewayv2_api.main.tags
+    "version" : aws_apigatewayv2_api.main.version
+  }
+}
+
+output "api_gateway_stage" {
+  description = "Default Stage"
+  value = {
+    "api_id" : aws_apigatewayv2_stage.main.api_id
+    "arn" : aws_apigatewayv2_stage.main.arn
+    "execution_arn" : aws_apigatewayv2_stage.main.execution_arn
+    "id" : aws_apigatewayv2_stage.main.id
+    "tags" : aws_apigatewayv2_stage.main.tags
+  }
+}

api_gateway_routes.tf

@@ -0,0 +1,6 @@
+resource "aws_apigatewayv2_route" "debug_route" {
+  api_id    = aws_apigatewayv2_api.main.id
+  route_key = "GET /debug"
+
+  target = "integrations/${aws_apigatewayv2_integration.debug_integration.id}"
+}

main.tf

@@ -1,75 +1 @@
-#tfsec:ignore:aws-ec2-require-vpc-flow-logs-for-all-vpcs
-resource "aws_vpc" "main" {
-  cidr_block = "10.0.0.0/16"
-
-  tags = {
-    Name = "SOAT Tech Challenge VPC"
-  }
-}
-
-resource "aws_subnet" "public_subnets" {
-  count = length(var.private_subnet_cidrs)
-
-  vpc_id            = aws_vpc.main.id
-  cidr_block        = element(var.public_subnet_cidrs, count.index)
-  availability_zone = element(local.azs, count.index)
-
-  tags = {
-    Name = "SOAT-TC Public Subnet ${count.index + 1}"
-  }
-}
-
-resource "aws_subnet" "private_subnets" {
-  count = length(var.private_subnet_cidrs)
-
-  vpc_id            = aws_vpc.main.id
-  cidr_block        = element(var.private_subnet_cidrs, count.index)
-  availability_zone = element(local.azs, count.index)
-
-  tags = {
-    Name = "SOAT-TC Private Subnet ${count.index + 1}"
-  }
-}
-
-
-resource "aws_internet_gateway" "main" {
-  vpc_id = aws_vpc.main.id
-
-  tags = {
-    Name = "SOAT-TC Internet Gateway"
-  }
-}
-
-resource "aws_route_table" "public_rt" {
-  vpc_id = aws_vpc.main.id
-
-
-  route {
-    cidr_block = "0.0.0.0/0"
-    gateway_id = aws_internet_gateway.main.id
-  }
-
-  tags = {
-    Name = "SOAT-TC Public Route Table"
-  }
-}
-
-resource "aws_route_table" "private_rt" {
-  vpc_id = aws_vpc.main.id
-
-  tags = {
-    Name = "SOAT-TC Private Route Table"
-  }
-}
-
-resource "aws_route_table_association" "public_rt_association" {
-  count          = length(var.public_subnet_cidrs)
-  subnet_id      = element(aws_subnet.public_subnets[*].id, count.index)
-  route_table_id = aws_route_table.public_rt.id
-}
-
-resource "aws_route_table_association" "private_rt_association" {
-  count          = length(var.private_subnet_cidrs)
-  subnet_id      = element(aws_subnet.private_subnets[*].id, count.index)
-  route_table_id = aws_route_table.private_rt.id
-}
+// modules here

outputs.tf

@@ -1,3 +1,27 @@
+terraform {
+  required_version = ">= 0.12.26"
+
+  cloud {
+    organization = "soat-tech-challenge"
+
+    workspaces {
+      name = "network-staging"
+    }
+  }
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "4.67.0"
+    }
+
+    tfe = {
+      source  = "hashicorp/tfe"
+      version = "~> 0.49.2"
+    }
+  }
+}
+
 provider "aws" {
   region = var.aws_region
 
@@ -12,4 +36,3 @@ provider "aws" {
     }
   }
 }
-

providers.tf

@@ -20,23 +20,3 @@ variable "aws_session_token" {
   description = "AWS Secret Key"
   type        = string
 }
-
-// Workspace variables
-
-locals {
-  // Availability Zones
-  azs = ["${var.aws_region}a", "${var.aws_region}b"]
-}
-
-variable "public_subnet_cidrs" {
-  type        = list(string)
-  description = "Public Subnet CIDR values"
-  default     = ["10.0.10.0/24", "10.0.11.0/24"]
-}
-
-variable "private_subnet_cidrs" {
-  type        = list(string)
-  description = "Private Subnet CIDR values"
-  default     = ["10.0.20.0/24", "10.0.21.0/24"]
-}
-

variables.tf

@@ -0,0 +1,76 @@
+
+#tfsec:ignore:aws-ec2-require-vpc-flow-logs-for-all-vpcs
+resource "aws_vpc" "main" {
+  cidr_block = "10.0.0.0/16"
+
+  tags = {
+    Name = "SOAT Tech Challenge VPC"
+  }
+}
+
+resource "aws_subnet" "public_subnets" {
+  count = length(var.private_subnet_cidrs)
+
+  vpc_id            = aws_vpc.main.id
+  cidr_block        = element(var.public_subnet_cidrs, count.index)
+  availability_zone = element(local.azs, count.index)
+
+  tags = {
+    Name = "SOAT-TC VPC Public Subnet ${count.index + 1}"
+  }
+}
+
+resource "aws_subnet" "private_subnets" {
+  count = length(var.private_subnet_cidrs)
+
+  vpc_id            = aws_vpc.main.id
+  cidr_block        = element(var.private_subnet_cidrs, count.index)
+  availability_zone = element(local.azs, count.index)
+
+  tags = {
+    Name = "SOAT-TC VPC Private Subnet ${count.index + 1}"
+  }
+}
+
+
+resource "aws_internet_gateway" "main" {
+  vpc_id = aws_vpc.main.id
+
+  tags = {
+    Name = "SOAT-TC VPC Internet Gateway"
+  }
+}
+
+resource "aws_route_table" "public_rt" {
+  vpc_id = aws_vpc.main.id
+
+
+  route {
+    cidr_block = "0.0.0.0/0"
+    gateway_id = aws_internet_gateway.main.id
+  }
+
+  tags = {
+    Name = "SOAT-TC VPC Public Route Table"
+  }
+}
+
+resource "aws_route_table" "private_rt" {
+  vpc_id = aws_vpc.main.id
+
+  tags = {
+    Name = "SOAT-TC VPC Private Route Table"
+  }
+}
+
+resource "aws_route_table_association" "public_rt_association" {
+  count          = length(var.public_subnet_cidrs)
+  subnet_id      = element(aws_subnet.public_subnets[*].id, count.index)
+  route_table_id = aws_route_table.public_rt.id
+}
+
+resource "aws_route_table_association" "private_rt_association" {
+  count          = length(var.private_subnet_cidrs)
+  subnet_id      = element(aws_subnet.private_subnets[*].id, count.index)
+  route_table_id = aws_route_table.private_rt.id
+}