Remove Good Job from infrastructure

This removes references to Good Job from the infrastructure code as it
is no longer being used.

Jira-Issue: MAV-1948

Author: thomasleese

.github/workflows/deploy-application.yml

@@ -23,7 +23,6 @@ on:
         options:
           - all
           - web
-          - good-job
           - sidekiq
         default: all
   workflow_call:
@@ -82,8 +81,6 @@ jobs:
           "application=" + .codedeploy_application_name.value,
           "application_group=" + .codedeploy_deployment_group_name.value,
           "cluster_name=" + .ecs_variables.value.cluster_name,
-          "good_job_service=" + .ecs_variables.value.good_job.service_name,
-          "good_job_task_definition=" + .ecs_variables.value.good_job.task_definition.arn,
           "sidekiq_service=" + .ecs_variables.value.sidekiq.service_name,
           "sidekiq_task_definition=" + .ecs_variables.value.sidekiq.task_definition.arn
           ' > ${{ runner.temp }}/DEPLOYMENT_ENVS
@@ -126,50 +123,6 @@ jobs:
           aws deploy wait deployment-successful --deployment-id "$deployment_id"
           echo "Deployment successful"
 
-  create-good-job-deployment:
-    name: Create good-job deployment
-    runs-on: ubuntu-latest
-    needs: prepare-deployment
-    if: inputs.server_types == 'good-job' || inputs.server_types == 'all'
-    permissions:
-      id-token: write
-    steps:
-      - name: Download Artifact
-        uses: actions/download-artifact@v5
-        with:
-          name: DEPLOYMENT_ENVS-${{ inputs.environment }}
-          path: ${{ runner.temp }}
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          role-to-assume: ${{ env.aws-role }}
-          aws-region: eu-west-2
-      - name: Trigger ECS Deployment
-        run: |
-          set -e
-          source ${{ runner.temp }}/DEPLOYMENT_ENVS
-          DEPLOYMENT_ID=$(aws ecs update-service --cluster $cluster_name --service $good_job_service \
-          --task-definition $good_job_task_definition --force-new-deployment \
-          --query 'service.deployments[?rolloutState==`IN_PROGRESS`].[id][0]' --output text)
-          echo "Deployment started: $DEPLOYMENT_ID"
-          echo "deployment_id=$DEPLOYMENT_ID" >> $GITHUB_ENV
-      - name: Wait for deployment to complete
-        run: |
-          set -e
-          source ${{ runner.temp }}/DEPLOYMENT_ENVS
-          DEPLOYMENT_STATE=IN_PROGRESS
-          while [ "$DEPLOYMENT_STATE" == "IN_PROGRESS" ]; do
-            echo "Waiting for deployment to complete..."
-            sleep 30
-            DEPLOYMENT_STATE="$(aws ecs describe-services --cluster $cluster_name --services $good_job_service \
-            --query "services[0].deployments[?id == \`$deployment_id\`].[rolloutState][0]" --output text)"
-          done
-          if [ "$DEPLOYMENT_STATE" != "COMPLETED" ]; then
-            echo "Deployment failed with state: $DEPLOYMENT_STATE"
-            exit 1
-          fi
-          echo "Deployment successful"
-
   create-sidekiq-deployment:
     name: Create sidekiq deployment
     runs-on: ubuntu-latest

.github/workflows/deploy.yml

@@ -40,7 +40,6 @@ on:
         options:
           - all
           - web
-          - good-job
           - sidekiq
           - none
         default: all

Dockerfile

@@ -85,6 +85,5 @@ VOLUME ["/rails/db/data", "/rails/tmp", "/rails/log", "/tmp", "/var/log", "/var/
 # Start web server by default, this can be overwritten by environment variable
 EXPOSE 4000
 ENV HTTP_PORT=4000
-ENV GOOD_JOB_PROBE_PORT=4000
 ENV SERVER_TYPE=web
 CMD ["./bin/docker-start"]

bin/docker-start

@@ -5,16 +5,13 @@ BIN_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ "$SERVER_TYPE" == "web" ]; then
   echo "Starting web server..."
   exec "$BIN_DIR"/thrust "$BIN_DIR"/rails server
-elif [ "$SERVER_TYPE" == "good-job" ]; then
-  echo "Starting good-job server..."
-  exec "$BIN_DIR"/good_job start
 elif [ "$SERVER_TYPE" == "sidekiq" ]; then
   echo "Starting sidekiq server..."
   exec "$BIN_DIR"/sidekiq
 elif [ "$SERVER_TYPE" == "none" ]; then
   echo "No server started"
   exec tail -f /dev/null  # Keep container running
 else
-  echo "SERVER_TYPE variable: '$SERVER_TYPE' unknown. Allowed values ['web','good-job', 'none']"
+  echo "SERVER_TYPE variable: '$SERVER_TYPE' unknown. Allowed values: web, sidekiq, none"
   exit 1
 fi

bin/good_job

@@ -1,7 +1,7 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS", 5).to_i + ENV.fetch("GOOD_JOB_MAX_THREADS", 4).to_i + ENV.fetch("SIDEKIQ_CONCURRENCY", 4).to_i %>
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS", 5).to_i + ENV.fetch("SIDEKIQ_CONCURRENCY", 4).to_i %>
 
 development:
   <<: *default

config/database.yml

@@ -106,6 +106,6 @@ tf apply -var-file=env/$env.tfvars -var="image_digest=<image_digest_from_ECR>"
 ```
 
 Step 3: Run Codedeploy from the AWS Console
-Step 4: If needed, trigger a deployment for the good-job service from the AWS ECS Console
+Step 4: If needed, trigger a deployment for the sidekiq service from the AWS ECS Console
 
 For a more high-level description of the process see [deployment-process.md](../terraform/documentation/deployment-process.md)

docs/terraform.md

@@ -58,32 +58,6 @@ module "web_service" {
   deployment_controller = "CODE_DEPLOY"
 }
 
-module "good_job_service" {
-  source = "./modules/ecs_service"
-  task_config = {
-    environment          = local.task_envs
-    secrets              = local.task_secrets
-    cpu                  = 1024
-    memory               = 2048
-    docker_image         = "${var.account_id}.dkr.ecr.eu-west-2.amazonaws.com/${var.docker_image}@${var.image_digest}"
-    execution_role_arn   = aws_iam_role.ecs_task_execution_role.arn
-    task_role_arn        = aws_iam_role.ecs_task_role.arn
-    log_group_name       = aws_cloudwatch_log_group.ecs_log_group.name
-    region               = var.region
-    health_check_command = ["CMD-SHELL", "./bin/internal_healthcheck http://localhost:4000/status/connected"]
-  }
-  network_params = {
-    subnets = [aws_subnet.private_subnet_a.id, aws_subnet.private_subnet_b.id]
-    vpc_id  = aws_vpc.application_vpc.id
-  }
-  minimum_replica_count = var.good_job_replicas
-  maximum_replica_count = var.good_job_replicas
-  cluster_id            = aws_ecs_cluster.cluster.id
-  cluster_name          = aws_ecs_cluster.cluster.name
-  environment           = var.environment
-  server_type           = "good-job"
-}
-
 module "sidekiq_service" {
   source = "./modules/ecs_service"
   task_config = {

terraform/app/ecs.tf

@@ -21,7 +21,6 @@ minimum_web_replicas     = 1
 maximum_web_replicas     = 2
 minimum_sidekiq_replicas = 1
 maximum_sidekiq_replicas = 2
-good_job_replicas        = 1
 
 valkey_node_type          = "cache.t4g.micro"
 valkey_log_retention_days = 3

terraform/app/env/sandbox-alpha.tfvars

@@ -21,7 +21,6 @@ minimum_web_replicas     = 1
 maximum_web_replicas     = 2
 minimum_sidekiq_replicas = 1
 maximum_sidekiq_replicas = 2
-good_job_replicas        = 1
 
 # Valkey serverless configuration - minimal settings for sandbox
 valkey_node_type          = "cache.t4g.micro"