From 62e52094da66c8db8ad44cf3869c5c90795f346e Mon Sep 17 00:00:00 2001
From: Santiago Rodriguez <santiago.rodriguez@cedarcode.com>
Date: Fri, 22 Mar 2024 13:07:15 -0300
Subject: [PATCH] build: use Rails credentials for storing secrets

---
 .env.example                               | 2 --
 .gitattributes                             | 1 +
 Gemfile                                    | 1 -
 Gemfile.lock                               | 5 -----
 app/views/application/_rollbar_js.html.erb | 2 +-
 config/credentials.yml.enc                 | 2 +-
 config/initializers/rollbar.rb             | 4 ++--
 7 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 .env.example
 create mode 100644 .gitattributes

diff --git a/.env.example b/.env.example
deleted file mode 100644
index 45209d9..0000000
--- a/.env.example
+++ /dev/null
@@ -1,2 +0,0 @@
-ROLLBAR_POST_SERVER_ITEM_ACCESS_TOKEN=
-ROLLBAR_POST_CLIENT_ITEM_ACCESS_TOKEN=
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8798420
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+config/credentials.yml.enc diff=rails_credentials
diff --git a/Gemfile b/Gemfile
index d0677a1..3f9bddc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,6 @@ end
 
 group :development, :test do
   gem 'byebug', '~> 11.0', platforms: [:mri, :mingw, :x64_mingw]
-  gem "dotenv-rails", '~> 2.7'
   gem 'rubocop', '~> 0.80.1', require: false
   gem 'rubocop-rails', '~> 2.5.0', require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 687a1a5..b2289ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,10 +97,6 @@ GEM
       openssl-signature_algorithm (~> 1.0)
     crass (1.0.6)
     date (3.3.4)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
-      railties (>= 3.2)
     erubi (1.12.0)
     ffi (1.16.3)
     globalid (1.2.1)
@@ -277,7 +273,6 @@ DEPENDENCIES
   bundler-audit (~> 0.9.1)
   byebug (~> 11.0)
   capybara (~> 3.26)
-  dotenv-rails (~> 2.7)
   importmap-rails (~> 1.2)
   listen (~> 3.8)
   minitest-stub_any_instance (~> 1.0)
diff --git a/app/views/application/_rollbar_js.html.erb b/app/views/application/_rollbar_js.html.erb
index fef7776..a5c8207 100644
--- a/app/views/application/_rollbar_js.html.erb
+++ b/app/views/application/_rollbar_js.html.erb
@@ -1,6 +1,6 @@
 <script>
 var _rollbarConfig = {
-  accessToken: "<%= ENV['ROLLBAR_POST_CLIENT_ITEM_ACCESS_TOKEN'] %>",
+  accessToken: "<%= Rails.application.credentials.rollbar_post_client_item_access_token %>",
   captureUncaught: true,
   captureUnhandledRejections: true,
   payload: {
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index c758bd8..c1a1aa5 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-kqrULqvSMTkOb3+WoLWQp+FDG8MpT34JbJ63Nxs/8WhtSyMq4qLa83ehibUuBEcEr26Qrus/RZMtEQVFtOZB4mUDSC0s0pddyYWPGo0Xjh0oapo5aRA1OTjjMtREkH99fZDUH4sYUClLwUkryTLlry2WdcGR61Q6aFuD36bOx3qgYjIwgOcGIJVlTdeCEbRvFX5yAW3dqrnPK8jBld2PxpEF1KGmQM8VcdN7Q45GpKdinfZ/lRLwlAMgRisUyORHSYSsegofBSlT6QFKqruPeBE8p/bTBtUXJeKvrSrtsnQxBOzOf4gphXUVDNTj+pS8l7AjOkNKI4dHKVvu8PbHVKngXwfDT8VE0av3EkpnQDhM4H4VnCFul1RfRUlRdb59EvBTnrMABt3rYYQfXRN2ITyLjTiCe/3M+CBB--XSY7HCWG2r8CNmvq--7jyZcRe1ipbUxzlR0pV5XQ==
\ No newline at end of file
+DFpjzqUQYr1EI503VX+ZgABwpJ4diOr0Ubzkd76GzH5e4SRl45xue2AY25ETpqv6hH+bIAlheggTwmDCM3qZy1793rOHjKuf5Lu1hNZIB7d24m+BSxoyoWFNurO2F2BTIDrWUZO8KN064w7GlMpMRECHSHvc8aJZyHR7JGIZ32o/Zf5KmFd9cRchWE9pejdjMJAUySYPJEsJe7knVl+x23eMTtWlg1B9HK0ZjPfCuWwZEtiQe04l5UM1tZzaIokC8IP5fwtHR4QgYRPrA8g244N/PETRuNOT1hAyVwqrvvaTWiyZdYY70Hh2uJ2E4Zn5SyuLs3vBkzOPNJUGCe29HMp5ule4O+jYieJvJ6i0o9L978pY1y4Fst+XSZ92k/3bKo3MF4778gf+AecgZbbXH/2LSco4TrLSF8qTfahW/wsJD449eYdvHVVPT3WxpdLgLPMmRNwG0F+nDN/RunQd+5102k5BO/VzaNnrR56ivpPgEAXlFd7eRUQow/kkiM0m97Tu0AaLeE6fHMQzDzfxBaRfjs2eQh/eB9SkLOEfTWAkl8P8NcIuQVh+cjnqcdqcmbdQErc+a5lhr2UZ1n4gS8PYkwq6CgMifslLGLPntm6ebx8PIvLQOaw226g=--V3U6uSlBXvLmxpwM--G4Vit/cYx2o1hIf2KPnlWg==
\ No newline at end of file
diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb
index d290c39..16c42c5 100644
--- a/config/initializers/rollbar.rb
+++ b/config/initializers/rollbar.rb
@@ -4,7 +4,7 @@
   # Without configuration, Rollbar is enabled in all environments.
   # To disable in specific environments, set config.enabled=false.
 
-  config.access_token = ENV['ROLLBAR_POST_SERVER_ITEM_ACCESS_TOKEN']
+  config.access_token = Rails.application.credentials.rollbar_post_server_item_access_token
 
   # Here we'll disable in 'test':
   if Rails.env.test? || Rails.env.development?
@@ -69,5 +69,5 @@
   # environment variable like this: `ROLLBAR_ENV=staging`. This is a recommended
   # setup for Heroku. See:
   # https://devcenter.heroku.com/articles/deploying-to-a-custom-rails-environment
-  config.environment = ENV['ROLLBAR_ENV'].presence || Rails.env
+  config.environment = Rails.application.credentials.rollbar_env.presence || Rails.env
 end