Add deployment changes

Signed-off-by: Chris M <christopher.mills@enginetransform.com>

Author: Christopher Mills

.github/actions/Dockerfile

@@ -9,7 +9,7 @@ RUN apk add --no-cache \
 	git \
 	make
 
-COPY ../../terraform /usr/src/terraform
+COPY ./terraform /usr/src/terraform
 COPY Makefile /usr/src
 COPY deploy.sh /usr/local/bin/deploy
 

.github/actions/deploy.sh

@@ -44,7 +44,7 @@ resource "aws_route" "internet_access" {
 resource "aws_eip" "gw" {
   count      = var.az_count
   vpc        = true
-  depends_on = aws_internet_gateway.gw
+  depends_on = [aws_internet_gateway.gw]
 }
 
 resource "aws_nat_gateway" "gw" {
@@ -77,8 +77,8 @@ resource "aws_route_table_association" "private" {
 # Load balancer security group.
 # This is the group you need to edit if you want to restrict access to your application.
 resource "aws_security_group" "ecs_lb" {
-  name        = "ecs-lb"
-  description = "controls access to the ALB"
+  name        = "terraform-ecs-lb"
+  description = "Controls access to the ALB"
   vpc_id      = aws_vpc.main.id
 
   ingress {
@@ -119,13 +119,13 @@ resource "aws_security_group" "ecs_tasks" {
 
 ### Load balancer.
 resource "aws_alb" "main" {
-  name            = "github-actions-deploy"
-  subnets         = [aws_subnet.public.*.id]
+  name            = var.alb_name
+  subnets         = aws_subnet.public.*.id
   security_groups = [aws_security_group.ecs_lb.id]
 }
 
 resource "aws_alb_target_group" "app" {
-  name        = "github-actions-deploy"
+  name        = aws_alb.main.name
   port        = 80
   protocol    = "HTTP"
   vpc_id      = aws_vpc.main.id
@@ -146,5 +146,5 @@ resource "aws_alb_listener" "front_end" {
 
 ### ECS
 resource "aws_ecs_cluster" "main" {
-  name = "ecs-cluster"
+  name = var.ecs_cluster_name
 }

terraform/ecs.tf .github/actions/terraform/ecs.tfterraform/ecs.tf renamed to .github/actions/terraform/ecs.tf

@@ -2,16 +2,16 @@ locals {
   container_definitions = <<DEFINITION
 [
   {
-    "cpu": var.cpu
-    "image": var.image,
-    "memory": var.memory,
+    "cpu": ${var.cpu},
+    "image": "${var.image}",
+    "memory": ${var.memory},
     "name": "app",
     "networkMode": "awsvpc",
     "pseudoTerminal": true,
     "portMappings": [
       {
-        "containerPort": var.port,
-        "hostPort": var.port
+        "containerPort": ${var.port},
+        "hostPort": ${var.port}
       }
     ]
   }
@@ -32,15 +32,15 @@ resource "aws_ecs_task_definition" "app" {
 }
 
 resource "aws_ecs_service" "main" {
-  name = "tf-ecs-service"
+  name = var.service_name
   cluster = aws_ecs_cluster.main.id
   task_definition = aws_ecs_task_definition.app.arn
   desired_count = var.desired_count
   launch_type = "FARGATE"
 
   network_configuration {
     security_groups = [aws_security_group.ecs_tasks.id]
-    subnets = [aws_subnet.private.*.id]
+    subnets = aws_subnet.private.*.id
   }
 
   load_balancer {

terraform/outputs.tf .github/actions/terraform/outputs.tfterraform/outputs.tf renamed to .github/actions/terraform/outputs.tf

@@ -19,10 +19,13 @@ variable "az_count" {
 
 variable "image" {
   description = "Docker image to run in the ECS cluster"
+  default     = "445220836204.dkr.ecr.eu-west-1.amazonaws.com/etdashboard:latest"
+
 }
 
 variable "port" {
   description = "Port exposed by the docker image to redirect traffic to"
+  default     = "3000"
 }
 
 variable "desired_count" {
@@ -32,35 +35,46 @@ variable "desired_count" {
 }
 
 variable "cpu" {
-  type        = number
   description = "Fargate instance CPU units to provision (1 vCPU = 1024 CPU units)"
-  default     = 256
+  default     = "256"
 }
 
 variable "memory" {
-  type        = number
   description = "Fargate instance memory to provision (in MiB)"
-  default     = 512
+  default     = "512"
 }
 
 variable "bucket" {
   default = "aws-github-actions"
   type    = string
 }
 
+variable "service_name" {
+  type    = string
+  default = "terraform-et-dash"
+}
+
+variable "alb_name" {
+  type    = string
+  default = "et-dash-alb"
+}
+
+variable "ecs_cluster_name" {
+  type    = string
+  default = "terraform-et-dash"
+}
+
 provider "aws" {
   version    = ">= 1.47.0"
-  access_key = var.access_key
-  secret_key = var.secret_key
+  access_key = var.aws_access_key_id
+  secret_key = var.aws_secret_access_key
 
   region = var.region
 }
 
 terraform {
   backend "s3" {
     encrypt = true
-
-    # Path to write state to.
-    key = "terraform.github.state/dashboard"
+    key     = "terraform.github.state/dashboard"
   }
 }

terraform/service.tf .github/actions/terraform/service.tfterraform/service.tf renamed to .github/actions/terraform/service.tf

@@ -37,16 +37,16 @@ action "Push" {
 }
 
 action "Deploy to Fargate" {
-  uses = "jessfraz/aws-fargate-action@master"
+  uses = "./.github/actions"
   needs = ["Push"]
   env = {
     AWS_REGION = "eu-west-1"
-    IMAGE = "445220836204.dkr.ecr.eu-west-1.amazonaws.com/etdashboard"
+    IMAGE = "445220836204.dkr.ecr.eu-west-1.amazonaws.com/etdashboard:latest"
     PORT = "8081"
-    COUNT = "2"
+    COUNT = "1"
     CPU = "256"
     MEMORY = "512"
-    BUCKET = "et-dash-actions"
+    BUCKET = "et-dash-dev"
   }
   secrets = ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY"]
 }

terraform/variables.tf .github/actions/terraform/variables.tfterraform/variables.tf renamed to .github/actions/terraform/variables.tf

@@ -13,6 +13,6 @@ RUN npm i --silent
 
 COPY --chown=node:node . .
 
-EXPOSE 8081
+EXPOSE 3000
 
 CMD [ "npm", "start" ]