Remove redis-namespace gem (#7971)

changelog: Internal, Redis, Remove redis-namespace gem

Gemfile

@@ -51,7 +51,6 @@ gem 'rack-headers_filter'
 gem 'rack-timeout', require: false
 gem 'redacted_struct'
 gem 'redis', '>= 3.2.0'
-gem 'redis-namespace'
 gem 'redis-session-store', github: '18F/redis-session-store', tag: 'v0.12-18f'
 gem 'retries'
 gem 'rotp', '~> 6.1'

Gemfile.lock

@@ -534,8 +534,6 @@ GEM
       redis-client (>= 0.9.0)
     redis-client (0.14.0)
       connection_pool
-    redis-namespace (1.8.1)
-      redis (>= 3.0.4)
     regexp_parser (2.6.1)
     reline (0.2.7)
       io-console (~> 0.5)
@@ -802,7 +800,6 @@ DEPENDENCIES
   rails-erd (>= 1.6.0)
   redacted_struct
   redis (>= 3.2.0)
-  redis-namespace
   redis-session-store!
   retries
   rotp (~> 6.1)

app/services/irs_attempts_api/redis_client.rb

@@ -2,10 +2,7 @@ module IrsAttemptsApi
   class RedisClient
     cattr_accessor :redis_pool do
       ConnectionPool.new(size: IdentityConfig.store.redis_irs_attempt_api_pool_size) do
-        Redis::Namespace.new(
-          'irs-attempt-api',
-          redis: Redis.new(url: IdentityConfig.store.redis_irs_attempt_api_url),
-        )
+        Redis.new(url: IdentityConfig.store.redis_irs_attempt_api_url)
       end
     end
 
@@ -29,7 +26,7 @@ def read_events(timestamp:, batch_size: 5000)
     end
 
     def key(timestamp)
-      timestamp.in_time_zone('UTC').change(min: 0, sec: 0).iso8601
+      'irs-attempt-api:' + timestamp.in_time_zone('UTC').change(min: 0, sec: 0).iso8601
     end
 
     def self.clear_attempts!

app/services/redis_rate_limiter.rb

@@ -47,6 +47,6 @@ def increment(now = Time.zone.now)
   # @return [String]
   def build_key(now)
     rounded_seconds = (now.to_i / interval) * interval
-    "redis-rate-limiter:#{key}:#{rounded_seconds}"
+    "throttle:redis-rate-limiter:#{key}:#{rounded_seconds}"
   end
 end

app/services/throttle.rb

@@ -143,9 +143,9 @@ def increment_to_throttled!
 
   def key
     if @user
-      "throttle:#{@user.id}:#{throttle_type}"
+      "throttle:throttle:#{@user.id}:#{throttle_type}"
     else
-      "throttle:#{@target}:#{throttle_type}"
+      "throttle:throttle:#{@target}:#{throttle_type}"
     end
   end
 

config/initializers/redis.rb

@@ -3,8 +3,5 @@
 end
 
 REDIS_THROTTLE_POOL = ConnectionPool.new(size: IdentityConfig.store.redis_throttle_pool_size) do
-  Redis::Namespace.new(
-    'throttle',
-    redis: Redis.new(url: IdentityConfig.store.redis_throttle_url),
-  )
+  Redis.new(url: IdentityConfig.store.redis_throttle_url)
 end

spec/jobs/risc_delivery_job_spec.rb

@@ -2,9 +2,9 @@
 
 RSpec.describe RiscDeliveryJob do
   around do |ex|
-    REDIS_THROTTLE_POOL.with { |namespaced| namespaced.redis.flushdb }
+    REDIS_THROTTLE_POOL.with { |client| client.flushdb }
     ex.run
-    REDIS_THROTTLE_POOL.with { |namespaced| namespaced.redis.flushdb }
+    REDIS_THROTTLE_POOL.with { |client| client.flushdb }
   end
 
   describe '#perform' do

spec/rails_helper.rb

@@ -110,7 +110,7 @@ class Analytics
     Telephony::Test::Message.clear_messages
     Telephony::Test::Call.clear_calls
     PushNotification::LocalEventQueue.clear!
-    REDIS_THROTTLE_POOL.with { |namespaced| namespaced.redis.flushdb }
+    REDIS_THROTTLE_POOL.with { |client| client.flushdb }
   end
 
   config.before(:each) do

spec/services/redis_rate_limiter_spec.rb

@@ -4,9 +4,9 @@
   let(:now) { Time.zone.now }
 
   around do |ex|
-    REDIS_THROTTLE_POOL.with { |namespaced| namespaced.redis.flushdb }
+    REDIS_THROTTLE_POOL.with { |client| client.flushdb }
     ex.run
-    REDIS_THROTTLE_POOL.with { |namespaced| namespaced.redis.flushdb }
+    REDIS_THROTTLE_POOL.with { |client| client.flushdb }
   end
 
   let(:key) { 'some-unique-identifier' }