DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix (Sentry): prefer Rails secrets over ENV variables

Browse source
This commit is contained in:
François Vantomme 2021-05-12 15:00:13 +02:00 committed by Fabrice Gangler
parent 2a0a65a90f
commit bc6d5aca0e
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -244,7 +244,7 @@ class ApplicationController < ActionController::Base
sentry = Rails.application.secrets.sentry sentry = Rails.application.secrets.sentry
{ {
key: sentry[:client_key], key: sentry[:js_client_key],
enabled: sentry[:enabled], enabled: sentry[:enabled],
environment: sentry[:environment], environment: sentry[:environment],
browser: { modern: BrowserSupport.supported?(browser) }, browser: { modern: BrowserSupport.supported?(browser) },

10
config/initializers/sentry.rb
View file

@ -1,10 +1,12 @@
Sentry.init do |config| Sentry.init do |config|
config.dsn = ENV['SENTRY_ENABLED'] == 'enabled' ? ENV['SENTRY_DSN_RAILS'] : nil secrets = Rails.application.secrets.sentry
config.dsn = secrets[:enabled] ? secrets[:rails_client_key] : nil
config.send_default_pii = false config.send_default_pii = false
config.environment = ENV.fetch('SENTRY_ENVIRONMENT', Rails.env) config.environment = secrets[:environment] || Rails.env
config.enabled_environments = ['production', ENV['SENTRY_ENVIRONMENT'].presence].compact config.enabled_environments = ['production', secrets[:environment].presence].compact
config.breadcrumbs_logger = [:active_support_logger] config.breadcrumbs_logger = [:active_support_logger]
config.traces_sample_rate = ENV['SENTRY_ENABLED'] == 'enabled' ? 0.001 : nil config.traces_sample_rate = secrets[:enabled] ? 0.001 : nil
config.excluded_exceptions += [ config.excluded_exceptions += [
# Ignore exceptions caught by ActiveJob.retry_on # Ignore exceptions caught by ActiveJob.retry_on
# https://github.com/getsentry/sentry-ruby/issues/1347 # https://github.com/getsentry/sentry-ruby/issues/1347

3
config/secrets.yml
View file

@ -50,7 +50,8 @@ defaults: &defaults
client_key: <%= ENV['MATOMO_ID'] %> client_key: <%= ENV['MATOMO_ID'] %>
sentry: sentry:
enabled: <%= ENV['SENTRY_ENABLED'] == 'enabled' %> enabled: <%= ENV['SENTRY_ENABLED'] == 'enabled' %>
client_key: <%= ENV['SENTRY_DSN_JS'] %> js_client_key: <%= ENV['SENTRY_DSN_JS'] %>
rails_client_key: <%= ENV['SENTRY_DSN_RAILS'] %>
environment: <%= ENV['SENTRY_CURRENT_ENV'] %> environment: <%= ENV['SENTRY_CURRENT_ENV'] %>
crisp: crisp:
enabled: <%= ENV['CRISP_ENABLED'] == 'enabled' %> enabled: <%= ENV['CRISP_ENABLED'] == 'enabled' %>