Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ gem "solid_cache"

gem "bootsnap", require: false
gem "thruster", require: false
gem "redis", "~> 5.4.1"
gem "sidekiq", "~> 8.0"

gem "view_component", "~> 4.0"
gem "kaminari", "~> 1.2"
Expand Down
12 changes: 0 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,6 @@ GEM
rdoc (6.14.2)
erb
psych (>= 4.0.0)
redis (5.4.1)
redis-client (>= 0.22.0)
redis-client (0.25.2)
connection_pool
regexp_parser (2.11.3)
reline (0.6.2)
io-console (~> 0.5)
Expand Down Expand Up @@ -435,12 +431,6 @@ GEM
shoulda-context (2.0.0)
shoulda-matchers (4.5.1)
activesupport (>= 4.2.0)
sidekiq (8.0.7)
connection_pool (>= 2.5.0)
json (>= 2.9.0)
logger (>= 1.6.2)
rack (>= 3.1.0)
redis-client (>= 0.23.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -556,15 +546,13 @@ DEPENDENCIES
puma (>= 5.0)
rails (~> 8.0.2)
rails-controller-testing
redis (~> 5.4.1)
rspec (~> 3.13)
rspec-rails (~> 8.0)
ruby-lsp (~> 0.26)
rubyzip
selenium-webdriver (~> 4.11)
shoulda (~> 4.0)
shoulda-matchers (~> 4.5)
sidekiq (~> 8.0)
simplecov
smarter_csv
solid_cache
Expand Down
1 change: 0 additions & 1 deletion Procfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
web: env RUBY_DEBUG_OPEN=true bin/rails server
js: yarn build --watch
css: yarn build:css --watch
worker: bundle exec sidekiq -C config/sidekiq.yml
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Before you begin, ensure you have the following installed:
* Node.js 18.17.0 (we recommend using `nvm` for version management)
* Yarn (latest version)
* PostgreSQL locally or in a container.
* Docker and Docker Compose (for LocalStack S3 in development)
* Docker and Docker Compose (for LocalStack AWS services in development)

## Rails App Development Setup

Expand Down Expand Up @@ -53,16 +53,14 @@ This command starts the following processes (defined in `Procfile.dev`):
- Rails server
- JavaScript build process (with esbuild)
- CSS build process (with Tailwind CSS)
- Sidekiq worker for background jobs

The application will be available at http://localhost:3000

## Architecture Overview
## Rails Architecture Overview

- **Frontend**: Built with Hotwired (Turbo + Stimulus) and Tailwind CSS
- **Backend**: Ruby on Rails 7.0
- **Background Jobs**: Sidekiq with Redis
- **Testing**: RSpec
- **Testing**: RSpec, Capybara

## Python Components

Expand Down
9 changes: 0 additions & 9 deletions config/initializers/sidekiq.rb

This file was deleted.

2 changes: 0 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require "sidekiq/web"

Rails.application.routes.draw do
devise_for :users, controllers: {
sessions: "users/sessions",
Expand Down
6 changes: 0 additions & 6 deletions config/sidekiq.yml

This file was deleted.

3 changes: 0 additions & 3 deletions docs/windows_localdev.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ We've tested two approaches for Windows development:

**Prerequisites:**
- Clone the repository to your WSL home directory (this avoids file permission issues)
- Install Redis: `apt install redis-server` (required but not actively used yet)
- Install Yarn: `npm install yarn -y`

**Configuration Steps:**
Expand Down Expand Up @@ -149,8 +148,6 @@ services:

# Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
# (Adding the "ports" property to this file will not forward from a Codespace.)
redis:
image: redis:latest
db:
image: postgres:latest
restart: unless-stopped
Expand Down
15 changes: 0 additions & 15 deletions terraform/config/prod/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@ output "db_password_secret_arn" {
sensitive = true
}

output "redis_endpoint" {
description = "Endpoint of the Redis cluster"
value = module.asap_pdf.redis_endpoint
}

output "redis_port" {
description = "Port of the Redis cluster"
value = module.asap_pdf.redis_port
}

output "ecs_cluster_name" {
description = "Name of the ECS cluster"
value = module.asap_pdf.ecs_cluster_name
Expand All @@ -66,11 +56,6 @@ output "database_url" {
sensitive = true
}

output "redis_url" {
description = "Redis connection URL"
value = module.asap_pdf.redis_url
}

output "github_actions_role_arn" {
description = "The ARN of the IAM role for GitHub Actions"
value = module.asap_pdf.github_actions_role_arn
Expand Down
15 changes: 0 additions & 15 deletions terraform/config/staging/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@ output "db_password_secret_arn" {
sensitive = true
}

output "redis_endpoint" {
description = "Endpoint of the Redis cluster"
value = module.asap_pdf.redis_endpoint
}

output "redis_port" {
description = "Port of the Redis cluster"
value = module.asap_pdf.redis_port
}

output "ecs_cluster_name" {
description = "Name of the ECS cluster"
value = module.asap_pdf.ecs_cluster_name
Expand All @@ -66,11 +56,6 @@ output "database_url" {
sensitive = true
}

output "redis_url" {
description = "Redis connection URL"
value = module.asap_pdf.redis_url
}

output "github_actions_role_arn" {
description = "The ARN of the IAM role for GitHub Actions"
value = module.asap_pdf.github_actions_role_arn
Expand Down
18 changes: 1 addition & 17 deletions terraform/modules/asap_pdf/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,13 @@ module "secrets" {
DB_PASSWORD = {
description = "Database password"
}

# Redis credentials
# Rails credentials
RAILS_MASTER_KEY = {
description = "Rails master key"
}
SECRET_KEY_BASE = {
description = "Rails secret key"
}
REDIS_URL = {
description = "Redis/Elasticache URL"
}

# SMTP credentials
SMTP_ENDPOINT = {
description = "SMTP endpoint"
Expand Down Expand Up @@ -105,16 +100,6 @@ module "database" {
multi_az = var.rds_multi_az
}

# Redis for Sidekiq
module "cache" {
source = "../cache"

project_name = var.project_name
environment = var.environment
subnet_ids = module.networking.private_subnet_ids
security_group_id = module.networking.redis_security_group_id
}

# Deployment resources (ECR, GitHub Actions, Secrets)
module "deployment" {
source = "../deployment"
Expand Down Expand Up @@ -148,7 +133,6 @@ module "ecs" {
smtp_endpoint_secret_arn = module.secrets.secrets["SMTP_ENDPOINT"].secret_arn
smtp_user_secret_arn = module.secrets.secrets["SMTP_USER"].secret_arn
smtp_password_secret_arn = module.secrets.secrets["SMTP_PASSWORD"].secret_arn
redis_url_secret_arn = module.secrets.secrets["REDIS_URL"].secret_arn
google_analytics_key_arn = module.secrets.secrets["GOOGLE_ANALYTICS_KEY"].secret_arn

vpc_id = module.networking.vpc_id
Expand Down
18 changes: 0 additions & 18 deletions terraform/modules/asap_pdf/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@ output "db_password_secret_arn" {
sensitive = true
}

output "redis_endpoint" {
description = "Endpoint of the Redis cluster"
value = module.cache.redis_endpoint
}

output "redis_port" {
description = "Port of the Redis cluster"
value = module.cache.redis_port
}

output "ecs_cluster_name" {
description = "Name of the ECS cluster"
value = module.ecs.cluster_name
Expand Down Expand Up @@ -76,14 +66,6 @@ output "database_url" {
sensitive = true
}

output "redis_url" {
description = "Redis connection URL"
value = format("redis://%s:%s",
module.cache.redis_endpoint,
module.cache.redis_port
)
}

output "github_actions_role_arn" {
description = "The ARN of the IAM role for GitHub Actions"
value = module.deployment.github_actions_role_arn
Expand Down
47 changes: 0 additions & 47 deletions terraform/modules/cache/main.tf

This file was deleted.

19 changes: 0 additions & 19 deletions terraform/modules/cache/outputs.tf

This file was deleted.

19 changes: 0 additions & 19 deletions terraform/modules/cache/variables.tf

This file was deleted.

2 changes: 0 additions & 2 deletions terraform/modules/ecs/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ module "fargate_service" {
DB_PASSWORD : var.db_password_secret_arn
SECRET_KEY_BASE : var.secret_key_base_secret_arn
RAILS_MASTER_KEY : var.rails_master_key_secret_arn
REDIS_URL : var.redis_url_secret_arn,
SMTP_ENDPOINT : var.smtp_endpoint_secret_arn,
SMTP_USER : var.smtp_user_secret_arn,
SMTP_PASSWORD : var.smtp_password_secret_arn,
Expand All @@ -68,7 +67,6 @@ resource "aws_iam_policy" "ecs_task_secrets_policy" {
var.db_password_secret_arn,
var.secret_key_base_secret_arn,
var.rails_master_key_secret_arn,
var.redis_url_secret_arn,
var.smtp_endpoint_secret_arn,
var.smtp_user_secret_arn,
var.smtp_password_secret_arn,
Expand Down
5 changes: 0 additions & 5 deletions terraform/modules/ecs/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ variable "google_analytics_key_arn" {
type = string
}

variable "redis_url_secret_arn" {
description = "ARN of the Redis URL secret in Secrets Manager"
type = string
}

variable "vpc_id" {
description = "The VPC id from our network friend."
type = string
Expand Down
Loading