DPC-4966 remove redis

docker-compose.portals.yml

@@ -27,10 +27,10 @@ services:
       - "./dpc-web/package-lock.json:/dpc-web/package-lock.json"
       - "./dpc-web/app:/dpc-web/app"
       - "./dpc-web/db:/dpc-web/db"
+      - "./dpc-web/lib:/dpc-web/lib"
       - "./dpc-web/spec:/dpc-web/spec"
 
     environment:
-      - REDIS_URL=redis://redis
       - DATABASE_URL=postgresql://db/dpc-website_development
       - TEST_DATABASE_URL=postgresql://db/dpc-website_test
       - API_METADATA_URL=http://api:3002/api/v1
@@ -47,8 +47,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-      redis:
-        condition: service_healthy
     healthcheck:
       test: curl --fail http://localhost:3500/health_check || exit 1
       interval: 10s
@@ -68,9 +66,9 @@ services:
       - "./dpc-admin/Gemfile.lock:/dpc-admin/Gemfile.lock"
       - "./dpc-admin/package-lock.json:/dpc-admin/package-lock.json"
       - "./dpc-admin/app:/dpc-admin/app"
+      - "./dpc-admin/lib:/dpc-admin/lib"
       - "./dpc-admin/spec:/dpc-admin/spec"
     environment:
-      - REDIS_URL=redis://redis
       - GOLDEN_MACAROON=${GOLDEN_MACAROON}
       - API_METADATA_URL=http://api:3002/api/v1
       - API_ADMIN_URL=http://api:9900
@@ -86,8 +84,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-      redis:
-        condition: service_healthy
     healthcheck:
       test: curl --fail http://localhost:3000/admin/health_check || exit 1
       interval: 10s

dpc-admin/Gemfile

@@ -19,7 +19,6 @@ gem 'railties', '~> 8.0.2.1'
 gem 'bundler', '>= 1.15.0'
 gem 'dotenv-rails', groups: [:development, :test]
 gem 'puma', '~> 6.4.3'
-gem 'redis', '~> 4.0'
 gem 'luhnacy', '~> 0.2.1'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'solid_queue', '~> 1.2'
@@ -41,7 +40,6 @@ gem 'fhir_models'
 gem 'sidekiq_alive', '~> 2.4'
 gem 'rack', '>= 3.2.3'
 gem 'rack-session', '>= 2.1.1'
-gem 'redis-namespace'
 gem 'kaminari'
 gem 'active_model_serializers'
 gem 'lograge'
@@ -95,7 +93,6 @@ group :test do
   gem 'rails-controller-testing'
   gem 'selenium-webdriver'
   gem 'fakefs', require: 'fakefs/safe'
-  gem 'fakeredis'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 end

dpc-admin/Gemfile.lock

@@ -168,8 +168,6 @@ GEM
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     fakefs (2.5.0)
-    fakeredis (0.9.2)
-      redis (~> 4.8)
     faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
@@ -187,7 +185,6 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    gserver (0.0.1)
     hashdiff (1.1.0)
     hashie (5.0.0)
     health_check (3.1.0)
@@ -366,11 +363,6 @@ GEM
     rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-    redis (4.8.1)
-    redis-client (0.22.1)
-      connection_pool
-    redis-namespace (1.11.0)
-      redis (>= 4)
     regexp_parser (2.9.3)
     reline (0.6.2)
       io-console (~> 0.5)
@@ -430,14 +422,6 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (7.2.4)
-      concurrent-ruby (< 2)
-      connection_pool (>= 2.3.0)
-      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
-    sidekiq_alive (2.4.0)
-      gserver (~> 0.0.1)
-      sidekiq (>= 5, < 8)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -538,7 +522,6 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   fakefs
-  fakeredis
   fhir_models
   health_check
   kaminari
@@ -564,16 +547,12 @@ DEPENDENCIES
   railties (~> 8.0.2.1)
   rbnacl
   rbnacl-libsodium
-  redis (~> 4.0)
-  redis-namespace
   rexml (>= 3.4.2)
   rspec-rails
   rubocop
   rubocop-performance
   sassc-rails (>= 2.1.2)
   selenium-webdriver
-  sidekiq (~> 7.2.4)
-  sidekiq_alive (~> 2.4)
   simplecov (<= 0.17)
   solid_queue (~> 1.2)
   spring

dpc-admin/README.md

@@ -79,6 +79,6 @@ Port mappings can be changed in:\
 `docker-compose.portals.yml`
 
 Helpful make commands:\
-`make start-portals` : Starts Web,Admin,Impl,Redis,and db\
-`make stop-portals` : Stops Web,Admin,Impl,Redis,and db\
-`make down-portals` : Removes Web,Admin,Impl,Redis,db and docker network.
+`make start-portals` : Starts Web,Admin,Portal and db\
+`make stop-portals` : Stops Web,Admin,Portal and db\
+`make down-portals` : Removes Web,Admin,Portal, db and docker network.

dpc-admin/app/jobs/application_job.rb

@@ -2,7 +2,7 @@
 
 class ApplicationJob < ActiveJob::Base
   # Ensure jobs get sent to a specialized admin queue. Our web applications share
-  # a single Redis instance and process jobs based on their queue name.
+  # a single solid queue database and process jobs based on their queue name.
   queue_as :admin
 
   # Automatically retry jobs that encountered a deadlock

dpc-admin/config/application.rb

@@ -29,7 +29,7 @@ class Application < Rails::Application
     config.action_mailer.delivery_job = 'ActionMailer::MailDeliveryJob'
 
     # Ensure mailer jobs get sent to a specialized admin queue. Our web applications share
-    # a single Redis instance and process jobs based on their queue name.
+    # a single solid queue database and process jobs based on their queue name.
     config.action_mailer.deliver_later_queue_name = "admin"
 
     config.to_prepare { Devise::Mailer.layout 'mailer' }

dpc-admin/config/environments/development.rb

@@ -12,8 +12,6 @@
   # Show full error reports.
   config.consider_all_requests_local = true
 
-  config.redis_host = 'localhost'
-
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp', 'caching-dev.txt').exist?

dpc-admin/config/environments/production.rb

@@ -71,8 +71,6 @@
   # Use a different cache store in production.
   config.action_controller.perform_caching = true
 
-  config.cache_store = :redis_cache_store, { url: "#{ENV.fetch('REDIS_URL', 'redis://localhost')}:6379/1" }
-
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "dpc-website_#{Rails.env}"

dpc-admin/config/environments/test.rb

@@ -23,7 +23,6 @@
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false

dpc-admin/lib/redis_store/mail_throttle_store.rb

@@ -1,36 +1,32 @@
 # frozen_string_literal: true
 
-require 'redis-namespace'
-
 module RedisStore
   class MailThrottleStore
-    # Redis interface for rate limiting user mail
-
     NAMESPACE = 'mail_throttle'
+    # Interface for rate limiting user mail
 
     def initialize
       # Retrieve redis instance with a provided namespace
       @limit = Rails.configuration.x.mail_throttle.limit
       @expiration = Rails.configuration.x.mail_throttle.expiration
-      redis_url = "#{ENV.fetch('REDIS_URL', 'redis://localhost')}:6379/1"
-      @redis = Redis::Namespace.new(NAMESPACE, redis: Redis.new(url: redis_url))
     end
 
     def can_email?(key)
-      return false if get_value(key) >= @limit
+      namespaced_key = "#{NAMESPACE}/#{key}"
+      return false if get_value(namespaced_key) >= @limit
 
-      increment(key)
+      increment(namespaced_key)
+      true
     end
 
     private
 
     def increment(key)
-      @redis.incr(key)
-      @redis.expire(key, @expiration)
+      Rails.cache.write(key, get_value(key) + 1, expires_in: @expiration.seconds)
     end
 
     def get_value(key)
-      @redis.get(key).to_i
+      Rails.cache.fetch(key) { 0 }
     end
   end
 end

dpc-admin/spec/lib/redis_store/mail_throttle_store_spec.rb

@@ -11,6 +11,7 @@
   around(:each) do |spec|
     default_limit = Rails.configuration.x.mail_throttle.limit
     default_expiration = Rails.configuration.x.mail_throttle.expiration
+    Rails.cache.clear
     Rails.configuration.x.mail_throttle.limit = limit
     Rails.configuration.x.mail_throttle.expiration = expiration
     spec.run

dpc-admin/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'fakeredis/rspec'
 require 'simplecov'
 
 SimpleCov.start 'rails' do

dpc-portal/Gemfile

@@ -46,8 +46,6 @@ gem 'puma', '~> 6.4.3'
 gem 'rack', '>= 3.2.3'
 gem 'rack-session', '>= 2.1.1'
 gem 'railties', '~> 8.0.2.1'
-gem 'redis', '~> 4.0'
-gem 'redis-namespace'
 gem 'rexml', '>= 3.4.2'
 gem 'sassc-rails', '>= 2.1.2'
 gem 'sinatra', '>= 4.2.0'
@@ -94,7 +92,6 @@ group :test do
   gem 'capybara'
   gem 'climate_control'
   gem 'fakefs', require: 'fakefs/safe'
-  gem 'fakeredis'
   gem 'rails-controller-testing'
   gem 'selenium-webdriver'
   gem 'timecop'

dpc-portal/Gemfile.lock

@@ -202,8 +202,6 @@ GEM
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     fakefs (2.5.0)
-    fakeredis (0.9.2)
-      redis (~> 4.8)
     faraday (2.10.1)
       faraday-net_http (>= 2.0, < 3.2)
       logger
@@ -436,9 +434,6 @@ GEM
       erb
       psych (>= 4.0.0)
     redcarpet (3.6.0)
-    redis (4.8.1)
-    redis-namespace (1.11.0)
-      redis (>= 4)
     regexp_parser (2.9.3)
     reline (0.6.2)
       io-console (~> 0.5)
@@ -620,7 +615,6 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   fakefs
-  fakeredis
   fhir_models
   health_check
   jbuilder (~> 2.7)
@@ -646,8 +640,6 @@ DEPENDENCIES
   railties (~> 8.0.2.1)
   rbnacl
   rbnacl-libsodium
-  redis (~> 4.0)
-  redis-namespace
   rexml (>= 3.4.2)
   rspec-rails
   rubocop

dpc-portal/app/jobs/application_job.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationJob < ActiveJob::Base
-  # Ensure jobs get sent to a specialized admin queue. Our web applications share
-  # a single Redis instance and process jobs based on their queue name.
   queue_as :portal
 
   # Automatically retry jobs that encountered a deadlock

dpc-portal/config/application.rb

@@ -28,8 +28,7 @@ class Application < Rails::Application
     config.active_support.to_time_preserves_timezone = :zone
     config.active_job.queue_adapter = :solid_queue
 
-    # Ensure mailer jobs get sent to a specialized admin queue. Our web applications share
-    # a single Redis instance and process jobs based on their queue name.
+    # Ensure mailer jobs get sent to a specialized queue.
     config.action_mailer.deliver_later_queue_name = "portal"
 
     # Look up previews directly in the path and set default layout

dpc-portal/config/initializers/health_check.rb

@@ -63,7 +63,4 @@
     # http status code used when the ip is not allowed for the request
   #   config.http_status_for_ip_whitelist_error = 403
 
-    # When redis url is non-standard
-  #   config.redis_url = 'redis_url'
-
-  end
+  end

dpc-web/Gemfile

@@ -22,7 +22,6 @@ gem 'csv'
 gem 'bundler', '>= 1.15.0'
 gem 'sprockets-rails', '>= 3.4.2'
 gem 'puma', '~> 6.4.3'
-gem 'redis', '~> 4.0'
 gem 'coffee-rails', '~> 5.0', '>= 5.0.0'
 gem 'kramdown', '~> 2.3', '>= 2.3.1'
 gem 'luhnacy', '~> 0.2.1'
@@ -46,7 +45,6 @@ gem 'macaroons'
 gem 'lograge', '>= 0.12.0'
 gem 'rack', '>= 3.2.3'
 gem 'rack-session', '>= 2.1.1'
-gem 'redis-namespace'
 gem 'bootstrap-table-rails'
 gem 'nokogiri', '>= 1.18.9'
 gem 'net-imap', '>= 0.5.8'
@@ -81,7 +79,6 @@ group :test do
   gem 'climate_control'
   gem 'rails-controller-testing', '>= 1.0.5'
   gem 'fakefs', require: 'fakefs/safe'
-  gem 'fakeredis'
 end
 
 group :development do

dpc-web/Gemfile.lock

@@ -197,8 +197,6 @@ GEM
     fakefs (2.5.0)
     faker (3.3.1)
       i18n (>= 1.8.11, < 2)
-    fakeredis (0.9.2)
-      redis (~> 4.8)
     faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
@@ -382,9 +380,6 @@ GEM
     rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-    redis (4.8.1)
-    redis-namespace (1.11.0)
-      redis (>= 4)
     regexp_parser (2.9.3)
     reline (0.6.2)
       io-console (~> 0.5)
@@ -542,7 +537,6 @@ DEPENDENCIES
   factory_bot_rails (>= 6.2.0)
   fakefs
   faker
-  fakeredis
   fhir_models
   health_check (>= 3.1.0)
   kaminari (>= 1.2.2)
@@ -565,8 +559,6 @@ DEPENDENCIES
   rack-session (>= 2.1.1)
   rails-controller-testing (>= 1.0.5)
   railties (~> 8.0.2.1)
-  redis (~> 4.0)
-  redis-namespace
   rexml (>= 3.4.2)
   rspec-rails (>= 5.1.2)
   rubocop

dpc-web/app/jobs/application_job.rb

@@ -1,5 +1,5 @@
 class ApplicationJob < ActiveJob::Base
-  # Ensure jobs get sent to a specialized web queue. Our web applications share
-  # a single Redis instance and process jobs based on their queue name.
+  # Ensure jobs get sent to a specialized web queue. Our sandbox web applications share
+  # a single solid queue database and process jobs based on their queue name.
   queue_as :web
 end