simplify terraform setup for now

testetson22 · testetson22 · commit 28fa4a171968 · 2025-03-26T22:47:19.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,6 @@ node_modules
 package-lock.json
 coverage
 junit.xml
-terraform/.terraform*
+**/.terraform*
 *tfstate*
 *.pem
diff --git a/terraform/db/main.tf b/terraform/db/main.tf
@@ -0,0 +1,19 @@
+resource "aws_docdb_cluster" "graphql-example-docdb" {
+  cluster_identifier      = "graphql-example-docdb-cluster"
+  engine                  = "docdb"
+  master_username         = "${var.DocDbUser}"
+  master_password         = "${var.DocDbPass}"
+  backup_retention_period = 5
+  preferred_backup_window = "07:00-09:00"
+  skip_final_snapshot     = true
+}
+
+resource "aws_docdb_cluster_instance" "graphql-example-docdb-instance" {
+  count              = 0
+  identifier         = "graphql-example-docdb-${count.index + 1}"
+  cluster_identifier = "${aws_docdb_cluster.graphql-example-docdb.id}"
+  apply_immediately  = true
+  instance_class     = "db.t3.medium"
+  engine             = "docdb"
+  ca_cert_identifier = null
+}
diff --git a/terraform/db/outputs.tf b/terraform/db/outputs.tf
@@ -0,0 +1,19 @@
+output "cluster_name" {
+  value       = try(aws_docdb_cluster.graphql-example-docdb.cluster_identifier, null)
+  description = "Cluster Identifier."
+}
+
+output "arn" {
+  value       = try(aws_docdb_cluster.graphql-example-docdb.arn, null)
+  description = "Amazon Resource Name (ARN) of the cluster."
+}
+
+output "writer_endpoint" {
+  value       = try(aws_docdb_cluster.graphql-example-docdb.endpoint, null)
+  description = "Endpoint of the DocumentDB cluster."
+}
+
+output "reader_endpoint" {
+  value       = try(aws_docdb_cluster.graphql-example-docdb.reader_endpoint, null)
+  description = "A read-only endpoint of the DocumentDB cluster"
+}
diff --git a/terraform/db/provider.tf b/terraform/db/provider.tf
@@ -0,0 +1,3 @@
+provider "aws" {
+  region  = "us-east-2"
+}
diff --git a/terraform/db/variables.tf b/terraform/db/variables.tf
@@ -0,0 +1,7 @@
+variable "DocDbUser" {
+  type = string
+}
+
+variable "DocDbPass" {
+  type = string
+}
diff --git a/terraform/ecs.tf b/terraform/ecs.tf
@@ -1,49 +1,71 @@
 resource "aws_ecs_task_definition" "graphql_server_task" {
-    family = "graphql_server_example_family"
-    requires_compatibilities = ["FARGATE"]
-    network_mode = "awsvpc"
-    memory = "512"
-    cpu = "256"
-    execution_role_arn = "${aws_iam_role.ecs_role.arn}"
-
-    container_definitions = <<EOT
+  family                   = "graphql_server_example_family"
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  memory                   = "512"
+  cpu                      = "256"
+  execution_role_arn       = aws_iam_role.ecs_role.arn
+
+  container_definitions = <<EOT
 [
     {
         "name": "${var.ecr_app_name}",
         "image": "${var.ecr_repo_uri}:${var.ecr_container_tag}",
         "memory": 512,
         "essential": true,
+        "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-group": "awslog-${var.ecr_app_name}",
+                    "awslogs-region": "${var.aws_region}",
+                    "awslogs-stream-prefix": "${var.ecr_app_name}"
+                }
+            },
         "portMappings": [
             {
                 "containerPort": ${var.ecr_container_port},
                 "hostPort": ${var.ecr_host_port}
             }
+        ],
+        "environment": [
+            {
+                "name": "MONGODB_HOST",
+                "value": "${var.DocDbHost}"
+            },
+            {
+                "name": "MONGODB_USERNAME",
+                "value": "${var.DocDbUser}"
+            },
+            {
+                "name": "MONGODB_PASSWORD",
+                "value": "${var.DocDbPass}"
+            }
         ]
     }
 ]
 EOT
 }
 
 resource "aws_ecs_cluster" "graphql_server_cluster" {
-    name = "graphql_server_example_app"
+  name = "graphql_server_example_app"
 }
 
 resource "aws_ecs_service" "graphql_server_service" {
-    name = "graphql_server_service"
+  name = "graphql_server_service"
 
-    cluster = "${aws_ecs_cluster.graphql_server_cluster.id}"
-    task_definition = "${aws_ecs_task_definition.graphql_server_task.arn}"
+  cluster         = aws_ecs_cluster.graphql_server_cluster.id
+  task_definition = aws_ecs_task_definition.graphql_server_task.arn
 
-    launch_type = "FARGATE"
-    desired_count = 1
+  launch_type   = "FARGATE"
+  desired_count = 1
 
-    network_configuration {
-        subnets = ["${aws_subnet.public_a.id}"]
-        security_groups = ["${aws_security_group.security_group_graphql_server_example.id}"]
-        assign_public_ip = true
-    }
-    enable_ecs_managed_tags = true
-    wait_for_steady_state   = true
+  network_configuration {
+    subnets          = ["${aws_default_subnet.public_a.id}"]
+    security_groups  = ["${aws_security_group.security_group_graphql_server_example.id}"]
+    assign_public_ip = true
+  }
+  enable_ecs_managed_tags = true
+  wait_for_steady_state   = true
 }
 
 data "aws_network_interface" "interface_tags" {
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -1,59 +1,60 @@
-# resource "aws_instance" "ubuntu_graphql_server" {
-#   ami                    = "ami-097a2df4ac947655f"
-#   instance_type          = "t2.micro"
-#   vpc_security_group_ids = [aws_security_group.security_group_graphql_server_example.id]
-#   subnet_id              = aws_subnet.public_a.id
-#   key_name = "aws-key"
-
-#   user_data = file("../scripts/apache-mkdocs.yaml")
-
-#   tags = {
-#     Name = "terraform-aws-ubuntu"
-#   }
+# resource "aws_vpc" "vpc_graphql_server_example" {
+#     cidr_block = "10.0.0.0/16"
+#     enable_dns_hostnames = true
+#     enable_dns_support = true
 # }
 
-resource "aws_vpc" "vpc_graphql_server_example" {
-    cidr_block = "10.0.0.0/16"
-    enable_dns_hostnames = true
-    enable_dns_support = true
+resource "aws_default_vpc" "vpc_graphql_server_example" {
+  tags = {
+    Name = "Default VPC"
+  }
 }
 
-resource "aws_subnet" "public_a" {
-    vpc_id = "${aws_vpc.vpc_graphql_server_example.id}"
-    cidr_block = "10.0.1.0/24"
-    availability_zone = "${var.aws_region}a"
+# resource "aws_subnet" "public_a" {
+#     vpc_id = "${aws_default_vpc.vpc_graphql_server_example.id}"
+#     cidr_block = "10.0.1.0/24"
+#     availability_zone = "${var.aws_region}a"
+# }
+
+resource "aws_default_subnet" "public_a" {
+  availability_zone = "${var.aws_region}a"
+  tags = {
+    Name = "Default subnet for ${var.aws_region}a"
+  }
 }
 
 resource "aws_internet_gateway" "internet_gateway" {
-    vpc_id = "${aws_vpc.vpc_graphql_server_example.id}"
+  tags = {
+    Name = "graphql_server_example"
+  }
 }
 
-resource "aws_route" "internet_access" {
-    route_table_id = "${aws_vpc.vpc_graphql_server_example.main_route_table_id}"
-    destination_cidr_block = "0.0.0.0/0"
-    gateway_id = "${aws_internet_gateway.internet_gateway.id}"
-}
+# resource "aws_route" "internet_access" {
+#     route_table_id = "${aws_default_vpc.vpc_graphql_server_example.main_route_table_id}"
+#     destination_cidr_block = "0.0.0.0/0"
+#     gateway_id = "${aws_internet_gateway.internet_gateway.id}"
+# }
 
 resource "aws_security_group" "security_group_graphql_server_example" {
-    name = "security_group_example_app"
-    description = "Allow TLS inbound traffic on port 80 (http)"
-    vpc_id = "${aws_vpc.vpc_graphql_server_example.id}"
-
-    ingress {
-        from_port = 80
-        to_port = 8080
-        protocol = "tcp"
-        cidr_blocks = ["0.0.0.0/0"]
-    }
-
-    egress {
-        from_port = 0
-        to_port = 0
-        protocol = "-1"
-        cidr_blocks = ["0.0.0.0/0"]
-    }
-
-    tags = {
+  name        = "security_group_example_app"
+  description = "Allow TLS inbound traffic on port 80 (http)"
+  vpc_id      = aws_default_vpc.vpc_graphql_server_example.id
+
+  ingress {
+    from_port   = 80
+    to_port     = 8080
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  tags = {
     Name = "terraform-aws-${var.ecr_app_name}-sg"
   }
 }
diff --git a/terraform/provider.tf b/terraform/provider.tf
@@ -1,3 +1,3 @@
 provider "aws" {
-  region  = "us-east-2"
+  region = "us-east-2"
 }
diff --git a/terraform/roles.tf b/terraform/roles.tf
@@ -19,6 +19,6 @@ POLICY
 }
 
 resource "aws_iam_role_policy_attachment" "ecs_policy_attachment" {
-  role = "${aws_iam_role.ecs_role.name}"
+  role       = aws_iam_role.ecs_role.name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
 }
diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -1,27 +1,36 @@
 variable "aws_region" {
-    default     = "us-east-2"
+  default = "us-east-2"
 }
 
 variable "ecr_repo_uri" {
-    default     = "440744247014.dkr.ecr.us-east-2.amazonaws.com/test/graphql-server-example"
+  default = "440744247014.dkr.ecr.us-east-2.amazonaws.com/test/graphql-server-example"
 }
 
 variable "ecr_container_tag" {
-    default     = "latest"
+  default = "latest"
 }
 
 variable "ecr_app_name" {
-    default     = "graphql-server-example"
+  default = "graphql-server-example"
 }
 
 variable "ecr_container_port" {
-    default  = 8080
+  default = 8080
 }
 
 variable "ecr_host_port" {
-    default  = 8080
+  default = 8080
 }
 
-variable "mongodb_uri" {
-    default  = "mongodb://localhost:27017"
+variable "DocDbHost" {
+  type    = string
+  default = "mongodb://localhost:27017"
+}
+
+variable "DocDbUser" {
+  type = string
+}
+
+variable "DocDbPass" {
+  type = string
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+provider "aws" {`
	`2`	`+ region = "us-east-2"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`provider "aws" {`
`2`		`- region = "us-east-2"`
	`2`	`+ region = "us-east-2"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ POLICY`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`resource "aws_iam_role_policy_attachment" "ecs_policy_attachment" {`
`22`		`- role = "${aws_iam_role.ecs_role.name}"`
	`22`	`+ role = aws_iam_role.ecs_role.name`
`23`	`23`	`policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,36 @@`
`1`	`1`	`variable "aws_region" {`
`2`		`- default = "us-east-2"`
	`2`	`+ default = "us-east-2"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`variable "ecr_repo_uri" {`
`6`		`- default = "440744247014.dkr.ecr.us-east-2.amazonaws.com/test/graphql-server-example"`
	`6`	`+ default = "440744247014.dkr.ecr.us-east-2.amazonaws.com/test/graphql-server-example"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`variable "ecr_container_tag" {`
`10`		`- default = "latest"`
	`10`	`+ default = "latest"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`variable "ecr_app_name" {`
`14`		`- default = "graphql-server-example"`
	`14`	`+ default = "graphql-server-example"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`variable "ecr_container_port" {`
`18`		`- default = 8080`
	`18`	`+ default = 8080`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`variable "ecr_host_port" {`
`22`		`- default = 8080`
	`22`	`+ default = 8080`
`23`	`23`	`}`
`24`	`24`
`25`		`-variable "mongodb_uri" {`
`26`		`- default = "mongodb://localhost:27017"`
	`25`	`+variable "DocDbHost" {`
	`26`	`+ type = string`
	`27`	`+ default = "mongodb://localhost:27017"`
	`28`	`+}`
	`29`	`+`
	`30`	`+variable "DocDbUser" {`
	`31`	`+ type = string`
	`32`	`+}`
	`33`	`+`
	`34`	`+variable "DocDbPass" {`
	`35`	`+ type = string`
`27`	`36`	`}`