Elastic Beanstalk Changes (#30)

Author: AndiLavera

.ebextensions/gem_install_bundler.config

@@ -0,0 +1,17 @@
+files:
+  # Runs before `./10_bundle_install.sh`:
+  "/opt/elasticbeanstalk/hooks/appdeploy/pre/09_gem_install_bundler.sh" :
+    mode: "000775"
+    owner: root
+    group: users
+    content: |
+      #!/usr/bin/env bash
+
+      EB_APP_STAGING_DIR=$(/opt/elasticbeanstalk/bin/get-config container -k app_staging_dir)
+      EB_SCRIPT_DIR=$(/opt/elasticbeanstalk/bin/get-config container -k script_dir)
+      # Source the application's Ruby
+      . $EB_SCRIPT_DIR/use-app-ruby.sh
+
+      cd $EB_APP_STAGING_DIR
+      echo "Installing compatible bundler"
+      gem install bundler -v 2.0.2

.gitignore

@@ -24,4 +24,8 @@
 .byebug_history
 
 # Ignore master key for decrypting credentials and more.
-/config/master.key
+/config/master.key
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml

Gemfile

@@ -25,7 +25,7 @@ gem 'sidekiq'
 # gem 'image_processing', '~> 1.2'
 
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.4.2', require: false
+gem 'bootsnap', '>= 1.5.0', require: false
 
 # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
 # gem 'rack-cors'

Gemfile.lock

@@ -207,7 +207,7 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
-  bootsnap (>= 1.4.2)
+  bootsnap (>= 1.5.0)
   byebug
   jbuilder (~> 2.7)
   jwt

app/lib/exceptions/jwt_expired_token.rb app/lib/JWT/expired_web_token.rbapp/lib/exceptions/jwt_expired_token.rb renamed to app/lib/JWT/expired_web_token.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './exceptions/jwt_expired_token'
+require_relative './JWT/expired_web_token'
 
 class JsonWebToken
   SECRET_KEY = Rails.application.secrets.secret_key_base.to_s

app/lib/json_web_token.rb

@@ -11,7 +11,7 @@ class EnvironmentVariable < ApplicationRecord
   delegate :encrypt_and_sign, :decrypt_and_verify, to: :encryptor
 
   KEY = ActiveSupport::KeyGenerator.new(
-    Rails.application.secrets.secret_key_base
+    ENV.fetch('SECRET_KEY_BASE') || Rails.application.secrets.secret_key_base
   ).generate_key(
     ENV.fetch('ENCRYPTION_KEY_SALT'),
     ActiveSupport::MessageEncryptor.key_len

app/models/environment_variable.rb

@@ -83,7 +83,11 @@ test:
 #     url: <%= ENV['DATABASE_URL'] %>
 #
 production:
-  <<: *default
-  database: bridgeapi_rb_production
-  username: bridgeapi_rb
-  password: <%= ENV['BRIDGEAPI_RB_DATABASE_PASSWORD'] %>
+  adapter: postgresql
+  encoding: unicode
+  database: <%= ENV['RDS_DATABASE'] %>
+  username: <%= ENV['RDS_USERNAME'] %>
+  password: <%= ENV['RDS_PASSWORD'] %>
+  host: <%= ENV['RDS_HOST'] %>
+  port: 5432
+  pool: 5