Use REDIS_SYSTEM_URL instead of REDIS_HOST and REDIS_PORT

.gitignore

@@ -53,5 +53,5 @@ yarn-debug.log*
 /app/assets/builds/*
 !/app/assets/builds/.keep
 
-# Ignore OSX system files
+.env
 .DS_Store

Capfile

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'capistrano/setup'
+
+require 'capistrano/deploy'
+
+require 'capistrano/scm/git'
+install_plugin Capistrano::SCM::Git
+
+require 'capistrano/rbenv'
+
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+
+require 'capistrano/puma'
+require 'capistrano/puma/workers'
+
+install_plugin Capistrano::Puma
+install_plugin Capistrano::Puma::Systemd
+
+require 'capistrano-resque'
+require 'whenever/capistrano'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 7.0.8'
-gem 'dotenv', '~> 3.1', '>= 3.1.2'
 
 gem 'base64', '~> 0.2.0'
 
@@ -153,7 +154,6 @@ gem 'react-rails', '~> 3.0.0'
 # See https://github.com/shakacode/shakapacker#upgrading
 gem 'shakapacker', '~> 6.5.4'
 gem 'cssbundling-rails', '~> 1.2' # Management of css (Less) files conversion
-
 # Temporarily locking the 'mail' version until the next version of Rails is released
 # https://github.com/rails/rails/pull/46650
 gem 'mail', '~> 2.7.1'
@@ -162,6 +162,12 @@ gem 'bootsnap', require: false
 
 gem 'rails_semantic_logger', '~> 4.14'
 
+gem 'dotenv', '~> 3.1'
+gem 'whenever', '~> 1.0', require: false
+
+# web server
+gem 'puma', '~> 5.6'
+
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
 # and rake tasks are available in development mode:
@@ -176,6 +182,13 @@ group :development do
   # gem 'web-console'
   # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
   # gem "rack-mini-profiler"
+
+  # Deployment
+  gem 'capistrano-resque', '~> 0.2.3', require: false
+  gem 'capistrano',        '~> 3.19',  require: false
+  gem 'capistrano-rails',  '~> 1.6',   require: false
+  gem 'capistrano-rbenv',  '~> 2.2',   require: false
+  gem 'capistrano3-puma',  '~> 5.2',   require: false
 end
 
 group :development, :test do
@@ -192,7 +205,6 @@ group :development, :test do
   # For improved console readability:
   # https://github.com/amazing-print/amazing_print
   gem 'amazing_print', '~> 1.4'
-  gem 'puma', '~> 5.6'
   gem 'debug'
 end
 

Gemfile.lock

@@ -172,6 +172,8 @@ GEM
     after_commit_action (1.1.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
+    airbrussh (1.5.2)
+      sshkit (>= 1.6.1, != 1.7.0)
     amazing_print (1.5.0)
     american_date (1.1.1)
     ast (2.4.2)
@@ -180,12 +182,12 @@ GEM
       activerecord (>= 5.2, < 7.1)
       activesupport (>= 5.2, < 7.1)
       request_store (~> 1.0)
-    aws-eventstream (1.2.0)
+    aws-eventstream (1.3.0)
     aws-partitions (1.810.0)
-    aws-sdk-core (3.181.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-sdk-core (3.201.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
@@ -194,7 +196,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axe-core-api (4.7.0)
       dumb_delegator
@@ -221,6 +223,27 @@ GEM
       msgpack (~> 1.2)
     builder (3.2.4)
     byebug (11.1.3)
+    capistrano (3.19.1)
+      airbrussh (>= 1.0.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (>= 1.9.0)
+    capistrano-bundler (2.1.0)
+      capistrano (~> 3.1)
+    capistrano-rails (1.6.3)
+      capistrano (~> 3.1)
+      capistrano-bundler (>= 1.1, < 3)
+    capistrano-rbenv (2.2.0)
+      capistrano (~> 3.1)
+      sshkit (~> 1.3)
+    capistrano-resque (0.2.3)
+      capistrano
+      resque
+      resque-scheduler
+    capistrano3-puma (5.2.0)
+      capistrano (~> 3.7)
+      capistrano-bundler
+      puma (>= 4.0, < 6.0)
     capybara (3.39.2)
       addressable
       matrix
@@ -233,6 +256,7 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
+    chronic (0.10.2)
     chunky_png (1.4.0)
     cld3 (3.6.0)
     climate_control (0.2.0)
@@ -505,8 +529,13 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.4.0.1)
       net-protocol
+    net-ssh (7.2.3)
     newrelic_rpm (9.10.2)
     nio4r (2.7.1)
     nokogiri (1.16.6)
@@ -783,6 +812,11 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    sshkit (1.23.0)
+      base64
+      net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
+      net-ssh (>= 2.8.0)
     sys-uname (1.2.3)
       ffi (~> 1.1)
     temple (0.10.2)
@@ -837,6 +871,8 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    whenever (1.0.0)
+      chronic (>= 0.6.3)
     will_paginate (3.3.1)
     will_paginate-bootstrap (1.0.2)
       will_paginate (>= 3.0.3)
@@ -866,6 +902,11 @@ DEPENDENCIES
   base64 (~> 0.2.0)
   bigdecimal (~> 3.1, >= 3.1.8)
   bootsnap
+  capistrano (~> 3.19)
+  capistrano-rails (~> 1.6)
+  capistrano-rbenv (~> 2.2)
+  capistrano-resque (~> 0.2.3)
+  capistrano3-puma (~> 5.2)
   capybara (~> 3.26)
   capybara-screenshot
   cld3 (~> 3.6.0)
@@ -882,7 +923,7 @@ DEPENDENCIES
   debug
   dogapi (~> 1.45)
   dogstatsd-ruby (~> 3.2.0)
-  dotenv (~> 3.1, >= 3.1.2)
+  dotenv (~> 3.1)
   elasticsearch!
   elasticsearch-xpack (~> 7.4.0)
   email_spec (~> 2.2)
@@ -976,6 +1017,7 @@ DEPENDENCIES
   virtus (~> 1.0.5)
   webdrivers (~> 5.0)
   webmock (~> 3.8)
+  whenever (~> 1.0)
   will_paginate (~> 3.3.0)
   will_paginate-bootstrap (~> 1.0.1)
 

app/models/click.rb

@@ -34,11 +34,16 @@ def initialize(params)
   end
 
   def log
-    Rails.logger.info("[Click] #{click_hash.to_json}")
+    clicks_logger.info("[Click] #{click_hash.to_json}")
+    Rails.logger.info('[Click]', search_data: click_hash)
   end
 
   private
 
+  def clicks_logger
+    @@logger ||= Logger.new('log/clicks.log')
+  end
+
   # prevent validation from choking on "invalid byte sequence in UTF-8"
   def validate_url_encoding
     return unless url

app/models/rtu_dashboard.rb

@@ -29,7 +29,7 @@ def top_urls
   end
 
   def trending_urls
-    redis = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
+    redis = Redis.new(url: ENV.fetch('REDIS_SYSTEM_URL'))
     trending_urls_key = ['TrendingUrls', @site.name].join(':')
     redis.smembers(trending_urls_key)
   end

app/models/search_impression.rb

@@ -16,7 +16,8 @@ def self.log(search, vertical, params, request)
                                modules: search.modules.join('|'),
                                params: clean_params(params))
 
-    Rails.logger.info("[Search Impression] #{hash.to_json}")
+    impression_logger.info("[Search Impression] #{hash.to_json}")
+    Rails.logger.info('[Search Impression]', search_data: hash)
   end
 
   def self.clean_params(params)
@@ -37,4 +38,8 @@ def self.get_url_from_request(request)
   def self.flatten_diagnostics_hash(diagnostics_hash)
     diagnostics_hash.keys.sort.map { |k| diagnostics_hash[k].merge(module: k) }
   end
+
+  def self.impression_logger
+    @@logger ||= Logger.new('log/impressions.log')
+  end
 end

app/models/trending_url.rb

@@ -6,7 +6,7 @@ class TrendingUrl
   attr_accessor :affiliate, :url
 
   cattr_reader :redis
-  @@redis = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
+  @@redis = Redis.new(url: ENV.fetch('REDIS_SYSTEM_URL'))
 
   def self.all
     sorted_trending_affiliate_keys = @@redis.keys("TrendingUrls:*").sort

appspec.yml

@@ -0,0 +1,15 @@
+
+version: 0.0
+os: linux
+# files:
+#   - source: /
+#     destination: /home/search/cicd_temp 
+
+hooks:
+
+  BeforeInstall:
+    - location: cicd-scripts/fetch_env_vars.sh
+      timeout: 300
+      runas: search
+
+

buildspec_searchgov.yml

@@ -0,0 +1,48 @@
+
+version: 0.2
+env:
+  parameter-store:
+    # env_used_in_app: "env_in_param_store"
+    APP_SERVER_ADDRESSES: "DEPLOY_SEARCHGOV_SERVER_ADDRESS"
+    RESQUE_SERVER_ADDRESSES: "DEPLOY_RESQUE_SERVER_ADDRESSES"
+    DEPLOYMENT_PATH: "DEPLOY_SEARCHGOV_DEPLOYMENT_PATH"
+    SERVER_DEPLOYMENT_USER: "DEPLOY_SERVER_DEPLOYMENT_USER"
+    RESQUE_WORKERS_COUNT: "DEPLOY_RESQUE_WORKERS_COUNT"
+    # SSH_KEY_PATH: "DEPLOY_SSH_KEY_PATH" - defined below
+
+    # shared deployment variables with subsequent stages - might not to export as this is the final stage
+exported-variables:
+    - APP_SERVER_ADDRESSES
+    - RESQUE_SERVER_ADDRESSES
+    - DEPLOYMENT_PATH
+    - SERVER_DEPLOYMENT_USER
+    - SSH_KEY_PATH
+
+phases:
+  install:
+    runtime-versions:
+      python: 3.x
+    commands:
+      - export PATH="$HOME/.rbenv/bin:$PATH"
+      - eval "$(rbenv init -)"
+
+
+  pre_build:
+    commands:
+      - aws secretsmanager get-secret-value --secret-id $SEARCH_SECRETSMANAGER_KEY_SECRET_NAME --region $SEARCH_AWS_REGION --query 'SecretString' --output text > $SEARCH_ENV_EC2_KEY
+  build:
+    commands:
+      - CURRENT_LOCATION=$(pwd)  # would look something like this - /codebuild/output/src559980389/src - a temp dir created by codebuild
+      - SSH_KEY_PATH="${CURRENT_LOCATION}/${SEARCH_ENV_EC2_KEY}"
+      - echo $SSH_KEY_PATH
+      - echo "deploying searchgov app with capistrano"
+      - bundle install
+      - cap $SEARCH_ENV puma:config puma:systemd:config puma:systemd:enable
+      - cap $SEARCH_ENV deploy
+      - cap $SEARCH_ENV --tasks
+      - cap $SEARCH_ENV resque:start
+      - cap $SEARCH_ENV puma:restart
+
+artifacts:
+  files:
+    - '**/*'