modulorails 1.5.2.pre.1 → 1.6.0

data/lib/generators/modulorails/gitlabci/gitlabci_generator.rb

@@ -4,13 +4,18 @@ require 'modulorails/generators/base'
 
 class Modulorails::GitlabciGenerator < Modulorails::Generators::Base
 
-  VERSION = 1
+  VERSION = 2
 
   desc 'This generator creates a template for a .gitlab-ci.yml file at root'
 
   protected
 
   def create_config
+    Modulorails.deprecator.warn(<<~MESSAGE)
+      Modulorails::GitlabciGenerator is deprecated and will be removed in version 2.0.
+      Use Moduloproject 3.0 (available later) to initialize new projects with GitLab CI configuration.
+    MESSAGE
+
     remove_old_keepfile('.modulorails-gitlab-ci')
     remove_old_keepfile('.modulorails-gitlabci')
 
@@ -24,6 +29,7 @@ class Modulorails::GitlabciGenerator < Modulorails::Generators::Base
 
     # Update the gitlab-ci template
     template '.gitlab-ci.yml'
+    template 'bin/test.sh', 'bin/test'
     template 'config/deploy/production.yaml' if @production_url.present?
     template 'config/deploy/staging.yaml' if @staging_url.present?
     template 'config/deploy/review.yaml' if @review_base_url.present?

data/lib/generators/modulorails/gitlabci/templates/.gitlab-ci.yml.tt

@@ -7,16 +7,6 @@ include:
 
 variables:
   IMAGE_NAME: <%= @image_name %>
-  <%- if @adapter =~ /mysql/ -%>
-  MYSQL_DATABASE: <%= @image_name %>_test
-  MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
-  <%= @environment_name %>_DATABASE_HOST: mysql
-  <%- else -%>
-  POSTGRES_DB: <%= @image_name %>_test
-  POSTGRES_USER: postgres
-  POSTGRES_PASSWORD: postgres
-  <%= @environment_name %>_DATABASE_HOST: postgres
-  <%- end -%>
 
 stages:
   - test
@@ -25,6 +15,8 @@ stages:
 
 build_integration_image:
   extends: .build_integration_image
+  variables:
+    DOCKERFILE: .devcontainer/Dockerfile
 
 test:
   extends: .test
@@ -37,13 +29,23 @@ test:
     - redis:7-alpine
   variables:
     RAILS_ENV: test
+    <%- if @adapter =~ /mysql/ -%>
+    MYSQL_DATABASE: <%= @image_name %>-test
+    MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
+    DATABASE_TEST_URL: 'mysql2://root@mysql/<%= @image_name %>-test'
+    <%- else -%>
+    POSTGRES_DB: <%= @image_name %>-test
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+    DATABASE_TEST_URL: 'postgresql://postgres:postgres@postgres/<%= @image_name %>-test'
+    <%- end -%>
   script:
-    - bundle exec rake db:create
-    - bundle exec rake db:migrate:reset
-    - bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml
+    - bin/test
 
 docker_build:
   extends: .docker_buildx_push
+  variables:
+    DOCKERFILE: Dockerfile
   only:
     - merge_requests
     - staging

data/lib/generators/modulorails/gitlabci/templates/bin/test.sh.tt

@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+export RAILS_ENV=test
+
+if ! grep -q rspec Gemfile
+then
+  echo 'Install RSpec and add some tests:'
+  echo '  bundle add rspec-rails rspec_junit_formatter'
+  echo '  bundle exec rails generate rspec:install'
+  exit 0
+end
+
+if [ -z "$1" ]
+then
+  bundle exec rake db:drop db:create db:schema:load db:migrate
+  <%- case @js_engine -%>
+  <%- when :webpacker -%>
+  bundle exec yarn install
+  bundle exec rails webpacker:compile
+  <%- when :bun -%>
+  bun install
+  bun run build
+  bun run build:css
+  <%- end -%>
+fi
+
+if [ -z "$CI" ]
+then
+  # For dev environment, we use the options specified in `.rspec` file
+  bundle exec rspec --profile "$@"
+elif grep -q rspec_junit_formatter Gemfile
+then
+  bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml --profile "$@"
+else
+  bundle exec rspec --format progress --profile "$@"
+fi

data/lib/generators/modulorails/gitlabci/templates/config/deploy/production.yaml.tt

@@ -18,9 +18,9 @@ ingress:
 resources:
   requests:
     cpu: 100m
-    memory: 512Mi
+    memory: 1024Mi
   limits:
-    memory: 512Mi
+    memory: 1024Mi
 
 autoscaling:
   enabled: true
@@ -47,10 +47,10 @@ sidekiq:
 #  resources:
 #    requests:
 #      cpu: 100m
-#      memory: 512Mi
+#      memory: 1024Mi
 #    limits:
 #      cpu: 100m
-#      memory: 512Mi
+#      memory: 1024Mi
 #  autoscaling:
 #    enabled: true
 #    minReplicas: 1

data/lib/generators/modulorails/gitlabci/templates/config/deploy/review.yaml.tt

@@ -18,9 +18,9 @@ ingress:
 resources:
   requests:
     cpu: 100m
-    memory: 512Mi
+    memory: 1024Mi
   limits:
-    memory: 512Mi
+    memory: 1024Mi
 
 autoscaling:
   enabled: true
@@ -46,10 +46,10 @@ sidekiq:
 #  resources:
 #    requests:
 #      cpu: 100m
-#      memory: 512Mi
+#      memory: 1024Mi
 #    limits:
 #      cpu: 100m
-#      memory: 512Mi
+#      memory: 1024Mi
 #  autoscaling:
 #    enabled: true
 #    minReplicas: 1

data/lib/generators/modulorails/gitlabci/templates/config/deploy/staging.yaml.tt

@@ -18,14 +18,14 @@ ingress:
 resources:
   requests:
     cpu: 100m
-    memory: 512Mi
+    memory: 1024Mi
   limits:
-    memory: 512Mi
+    memory: 1024Mi
 
 autoscaling:
   enabled: true
   minReplicas: 1
-  maxReplicas: 10
+  maxReplicas: 2
   targetCPUUtilizationPercentage: 80
 
 database:
@@ -42,16 +42,16 @@ redis:
   enabled: true
 
 sidekiq:
-  enabled: true
+  enabled: false
 #  resources:
 #    requests:
 #      cpu: 100m
-#      memory: 512Mi
+#      memory: 1024Mi
 #    limits:
 #      cpu: 100m
-#      memory: 512Mi
+#      memory: 1024Mi
 #  autoscaling:
 #    enabled: true
 #    minReplicas: 1
-#    maxReplicas: 10
+#    maxReplicas: 2
 #    targetCPUUtilizationPercentage: 80

data/lib/generators/modulorails/moduloproject/moduloproject_generator.rb

@@ -4,16 +4,21 @@ require 'rails/generators'
 
 class Modulorails::ModuloprojectGenerator < Modulorails::Generators::Base
 
-  VERSION = 1
+  VERSION = 2
 
   desc 'This generator creates templates for Moduloproject'
 
   def create_config
+    Modulorails.deprecator.warn(<<~MESSAGE)
+      Modulorails::ModuloprojectGenerator is deprecated and will be removed in version 2.0.
+      This generator will be moved to Moduloproject 3.0 (available later).
+    MESSAGE
+
     remove_old_keepfile(".modulorails-#{generator_name}")
-    template 'config/environments/production.rb'
+    template 'config/environments/production.rb', force: true
     copy_file('config/environments/production.rb', 'config/environments/staging.rb')
     update_application_rb
-    create_file('config/locales/fr.yml', "--\nfr: {}\n")
+    create_file('config/locales/fr.yml', "fr: {}\n")
   rescue StandardError => e
     warn("[Modulorails] Error: cannot generate Moduloproject configuration: #{e.message}")
   end

data/lib/generators/modulorails/moduloproject/templates/config/environments/production.rb.tt

@@ -6,55 +6,25 @@ Rails.application.configure do
   # Code is not reloaded between requests.
   config.enable_reloading = false
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
+  # Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
   config.eager_load = true
 
-  # Custom directories with classes and modules you want to be autoloadable.
-  # config.eager_load_paths += %W[
-  #  #{config.root}/lib/constraints
-  # ]
-
-  # Full error reports are disabled and caching is turned on.
+  # Full error reports are disabled.
   config.consider_all_requests_local = false
-  config.action_controller.perform_caching = true
-
-  # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
-  # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
-  # config.require_master_key = true
-
-  # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
+  # Turn on fragment caching in view templates.
+  config.action_controller.perform_caching = true
 
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  # Cache assets for far-future expiry since they are all digest stamped.
+  config.public_file_server.headers = { "cache-control" => "public, max-age=#{1.year.to_i}" }
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
 
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
-  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
-
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
-  # Mount Action Cable outside main process or domain.
-  # config.action_cable.mount_path = nil
-  # host = URI(ENV.fetch('URL', 'http://localhost:3000/')).host
-  # config.action_cable.url = "wss://#{host}/cable"
-  # config.action_cable.disable_request_forgery_protection = true
-  # config.action_cable.allowed_request_origins = [
-  #  %r{(https|wss)://host}
-  # ]
-
   # Assume all access to the app is happening through a SSL-terminating reverse proxy.
-  # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
   config.assume_ssl = true
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
@@ -63,27 +33,26 @@ Rails.application.configure do
   # Skip http-to-https redirect for the default health check endpoint.
   # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
 
-  # Log to STDOUT by default
+  # Log to STDOUT with the current request id as a default log tag.
+  config.log_tags = [ :request_id ]
   config.logger = ActiveSupport::Logger.new(STDOUT)
                                        .tap { |logger| logger.formatter = ::Logger::Formatter.new }
                                        .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
 
-  # Prepend all log lines with the following tags.
-  config.log_tags = [:request_id]
-
-  # Info include generic and useful information about system operation, but avoids logging too much
-  # information to avoid inadvertent exposure of personally identifiable information (PII). If you
-  # want to log everything, set the level to "debug".
+  # Change to "debug" to log everything (including potentially personally-identifiable information!)
   config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
 
-  # Use a different cache store in production.
+  # Prevent health checks from clogging up the logs.
+  config.silence_healthcheck_path = "/up"
+
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false
+
+  # Use Redis as a cache store
   config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'], expires_in: 6.hours }
 
-  # Use a real queuing backend for Active Job (and separate queues per environment).
+  # Replace the default in-process and non-durable queuing backend for Active Job.
   # config.active_job.queue_adapter = :sidekiq
-  # config.active_job.queue_name_prefix = "<%= Modulorails.data.rails_name.underscore %>_production"
-
-  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -93,17 +62,18 @@ Rails.application.configure do
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Don't log any deprecations.
-  config.active_support.report_deprecations = false
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
+  # Only use :id for inspections in production.
+  config.active_record.attributes_for_inspect = [ :id ]
+
   # Enable DNS rebinding protection and other `Host` header attacks.
   # config.hosts = [
   #   "example.com",     # Allow requests from example.com
   #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
   # ]
+  #
   # Skip DNS rebinding protection for the default health check endpoint.
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
 end

data/lib/generators/modulorails/rubocop/templates/rubocop.yml.tt

@@ -10,7 +10,8 @@
 # See https://docs.rubocop.org/rubocop/configuration
 
 # Enabling Rails-specific cops.
-require: rubocop-rails
+plugins:
+  - rubocop-rails
 
 inherit_mode:
   merge:
@@ -102,6 +103,7 @@ Metrics/CyclomaticComplexity:
 # Commonly used screens these days easily fit more than 80 characters.
 Layout/LineLength:
   Max: 120
+  AllowedPatterns: ['\A\s*#']
 
 # Too short methods lead to extraction of single-use methods, which can make
 # the code easier to read (by naming things), but can also clutter the class
@@ -235,6 +237,10 @@ Metrics/BlockLength:
   Exclude:
     - 'app/admin/**/*'
     - 'lib/tasks/**/*'
+  # Allow big blocks for Concerns
+  AllowedMethods:
+    - class_methods
+    - included
 
 # Checks if empty lines around the bodies of classes match the configuration.
 Layout/EmptyLinesAroundClassBody:

data/lib/generators/modulorails/self_update/self_update_generator.rb

@@ -12,6 +12,10 @@ class Modulorails::SelfUpdateGenerator < Rails::Generators::Base
   LATEST_VERSION_URL = 'https://rubygems.org/api/v1/versions/modulorails.json'
 
   def create_config_file
+    Modulorails.deprecator.warn(<<~MESSAGE)
+      Modulorails::SelfUpdateGenerator is deprecated and will be removed in version 2.0.
+    MESSAGE
+
     # Get the last published version
     versions = HTTParty.get(LATEST_VERSION_URL).parsed_response
     last_published_version = versions&.reject { |version| Gem::Version.new(version['number']).prerelease? }&.first

data/lib/generators/modulorails/sidekiq/sidekiq_generator.rb

@@ -8,12 +8,15 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
 
   desc 'This generator adds Sidekiq to the project'
 
+  def deprecation_warning
+    Modulorails.deprecator.warn(<<~MESSAGE)
+      Modulorails::SidekiqGenerator is deprecated and will be removed in version 2.0.
+      Use Moduloproject 3.0 (available later) to initialize new projects with Sidekiq configuration.
+    MESSAGE
+  end
+
   def add_to_docker_compose
-    if Rails.root.join('compose.yml').exist?
-      add_to_docker_compose_yml_file(Rails.root.join('compose.yml'))
-    elsif Rails.root.join('docker-compose.yml').exist?
-      add_to_docker_compose_yml_file(Rails.root.join('docker-compose.yml'))
-    end
+    add_to_docker_compose_yml_file(Rails.root.join('.devcontainer/compose.yml'))
   end
 
   def add_to_deploy_files
@@ -26,12 +29,15 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
     gemfile_path = Rails.root.join('Gemfile')
 
     # Add gem redis unless already present
-    append_to_file(gemfile_path, "gem 'redis'\n") unless File.read(gemfile_path).match?(/^\s*gem ['"]redis['"]/)
+    append_to_file(gemfile_path, "\ngem 'redis'\n") unless File.read(gemfile_path).match?(/^\s*gem ['"]redis['"]/)
 
     # Add gem sidekiq unless already present
-    return if File.read(gemfile_path).match?(/^\s*gem ['"]sidekiq['"]/)
+    append_to_file(gemfile_path, "\ngem 'sidekiq'\n") unless File.read(gemfile_path).match?(/^\s*gem ['"]sidekiq['"]/)
+
+    # Add gem sidekiq-datadog-error-tracking unless already present
+    return if File.read(gemfile_path).match?(/^\s*gem ['"]sidekiq-datadog-error-tracking['"]/)
 
-    append_to_file(gemfile_path, "gem 'sidekiq'\n")
+    append_to_file(gemfile_path, "\ngem 'sidekiq-datadog-error-tracking'\n")
   end
 
   def add_to_config
@@ -46,20 +52,19 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
 
   def add_routes
     routes_path = Rails.root.join('config/routes.rb')
-
     return if File.read(routes_path).match?(%r{require ['"]sidekiq/web["']})
 
-    inject_into_file routes_path, after: "Rails.application.routes.draw do\n" do
-      <<-RUBY
-  require 'sidekiq/web'
-  mount Sidekiq::Web => '/sidekiq'
-
-      RUBY
+    authentication_type = Modulorails.data.authentication_type
+    if respond_to?("add_#{authentication_type}_authenticated_route")
+      send("add_#{authentication_type}_authenticated_route", routes_path)
+    else
+      add_unauthenticated_route(routes_path)
     end
   end
 
   def add_health_check
     file_path = Rails.root.join('config/initializers/health_check.rb')
+    return unless File.exist?(file_path)
 
     return if File.read(file_path).match?(/add_custom_check\s*\(?\s*['"]sidekiq-queues['"]\s*\)?/)
 
@@ -73,10 +78,10 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
     # No queues, means no jobs, ok!
     next '' if queues.empty?
 
-    enqueued_jobs_count = queues.each.map { |queue| queue.count }.sum
+    global_latency = queues.each.map { |queue| queue.latency }.sum
 
-    # Less than 200 enqueued jobs, ok!
-    enqueued_jobs_count < 200 ? '' : "\#{enqueued_jobs_count} are currently enqueued."
+    # Global latency is less than 5 minutes, ok!
+    global_latency < 5.minutes ? '' : "Global latency (\#{global_latency}) is too high."
   end
 
   # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
@@ -90,9 +95,9 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
     end
   end
 
-  def add_entrypoint
-    template 'entrypoints/sidekiq-entrypoint.sh', 'bin/sidekiq-entrypoint'
-    chmod 'bin/sidekiq-entrypoint', 0o755
+  def remove_entrypoint
+    remove_file 'entrypoints/sidekiq-entrypoint.sh'
+    remove_file 'bin/sidekiq-entrypoint'
   end
 
   private
@@ -100,31 +105,43 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
   def add_to_docker_compose_yml_file(file_path)
     @image_name ||= Modulorails.data.name.parameterize
 
-    # Create docker-compose.yml unless present
-    invoke(Modulorails::DockerGenerator, []) unless File.exist?(file_path)
+    unless File.exist?(file_path)
+      puts("Compose file not found at #{file_path}. Ignoring.")
+      return
+    end
 
-    return if File.read(file_path).match?(/^ {2}sidekiq:$/)
+    # Update existing Sidekiq service
+    if File.read(file_path).match?(/^ {2}sidekiq:$/)
+      pattern = /^(\s*)entrypoint:(\s*).\/(bin\/sidekiq-entrypoint|entrypoints\/sidekiq-entrypoint\.sh)/
+      gsub_file file_path, pattern, '\1command:\2./bin/bundle exec sidekiq'
+      return
+    end
 
+    add_sidekiq_service(file_path)
+  end
+
+  def add_sidekiq_service(file_path)
     insert_into_file file_path, after: /^services:/ do
+      # Using `<<-` Heredoc syntax to preserve YAML indentation
       <<-YAML
 
   sidekiq:
     image: modulotechgroup/#{@image_name}:dev
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
     depends_on:
       - database
       - redis
     volumes:
-      - .:/app
+      - ..:/rails
     environment:
       RAILS_ENV: development
       URL: http://app:3000
-      #{@image_name.upcase}_DATABASE_HOST: database
-      #{@image_name.upcase}_DATABASE_NAME: #{@image_name}
-      REDIS_URL: redis://redis:6379/1
-    entrypoint: ./bin/sidekiq-entrypoint
+    env_file:
+      - path: .env
+        required: false
+    command: ./bin/bundle exec sidekiq
     stdin_open: true
     tty: true
       YAML
@@ -146,8 +163,9 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
   end
 
   def add_to_deploy_file(file_path)
-    # Do nothing if file does not exists or Sidekiq is already enabled
-    return if !File.exist?(file_path) || File.read(file_path).match?(/^ {2}sidekiq:$/)
+    # Do nothing if file does not exist or Sidekiq is already enabled
+    return unless File.exist?(file_path)
+    return if File.read(file_path).match?(/^sidekiq:\n {2}enabled: true$/m)
 
     # Add sidekiq to deploy file
     insert_into_file file_path do
@@ -158,17 +176,56 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
           resources:
             requests:
               cpu: 100m
-              memory: 512Mi
+              memory: 1024Mi
             limits:
-              cpu: 100m
-              memory: 512Mi
+              memory: 1024Mi
           autoscaling:
             enabled: true
-            minReplicas: 1
-            maxReplicas: 10
+            minReplicas: #{file_path.to_s.match?('production.y') ? 2 : 1}
+            maxReplicas: #{file_path.to_s.match?('production.y') ? 10 : 2}
             targetCPUUtilizationPercentage: 80
+          command: ["./bin/bundle", "exec", "sidekiq"]
       YAML
     end
   end
 
+  RAILS_AUTHENTICATION_TEMPLATE = <<~RUBY.freeze
+    require 'sidekiq/web'
+    constraints lambda { |request| Session.find_by(id: request.cookie_jar.signed[:session_id])&.user&.role == 'admin' } do
+      mount Sidekiq::Web => '/admin/sidekiq'
+    end
+
+
+  RUBY
+
+  def add_devise_authenticated_route(routes_path)
+    template = <<~RUBY
+      require 'sidekiq/web'
+      authenticate :user, lambda { |u| u.respond_to?('role') && u.role == 'admin' } do
+        mount Sidekiq::Web => '/admin/sidekiq'
+      end
+
+    RUBY
+    puts("Injecting #{template} into #{routes_path}: update the authentication block.")
+    inject_into_file routes_path, template, after: "Rails.application.routes.draw do\n"
+  end
+
+  def add_rails_authenticated_route(routes_path)
+    template = RAILS_AUTHENTICATION_TEMPLATE
+    puts("Injecting #{template} into #{routes_path}: update the authentication block.")
+    inject_into_file routes_path, template, after: "Rails.application.routes.draw do\n"
+  end
+
+  def add_unauthenticated_route(routes_path)
+    template = <<~RUBY
+      require 'sidekiq/web'
+      mount Sidekiq::Web => '/admin/sidekiq'
+
+    RUBY
+    puts("Injecting #{template} into #{routes_path}: you should add authentication to the route.")
+    puts("If you do not have authentication, execute `rails generate authentication` and replace \
+          the route by #{RAILS_AUTHENTICATION_TEMPLATE}.")
+    inject_into_file routes_path, template, after: "Rails.application.routes.draw do\n"
+  end
+
 end

data/lib/generators/modulorails/sidekiq/templates/config/initializers/sidekiq.rb.tt

@@ -1,9 +1,9 @@
-redis_url = Rails.application.config_for('cable')['url']
-
 Sidekiq.configure_server do |config|
-  config.redis = { url: redis_url }
+  config.redis = { url: REDIS_URL }
+  config.logger.formatter = Sidekiq::Logger::Formatters::Datadog.new
+  config.error_handlers << Sidekiq::Datadog::Error::Tracking
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = { url: redis_url }
+  config.redis = { url: REDIS_URL }
 end

data/lib/modulorails/configuration.rb

@@ -16,14 +16,8 @@ module Modulorails
     #   config.project_manager 'pm@modulotech.fr'
     #   config.endpoint "intranet's endpoint"
     #   config.api_key "intranet's api key"
-    #   config.production_url "production.app.com"
-    #   config.staging_url "staging.app.com"
-    #   config.review_base_url "review.app.com"
     # end
-    %i[
-      name main_developer project_manager endpoint api_key no_auto_update production_url staging_url
-      review_base_url
-    ].each do |field|
+    %i[name main_developer project_manager endpoint api_key].each do |field|
       define_method(field) do |value=nil|
         # No value means we want to get the field
         return send("_#{field}") unless value
@@ -33,6 +27,22 @@ module Modulorails
       end
     end
 
+    # Deprecated configuration options - will be removed in 2.0
+    %i[no_auto_update production_url staging_url review_base_url].each do |field|
+      define_method(field) do |value=nil|
+        # No value means we want to get the field
+        return send("_#{field}") unless value
+
+        # Warn only when setting the value (i.e., in the initializer)
+        Modulorails.deprecator.warn(
+          "Modulorails configuration `#{field}` is deprecated and will be removed in version 2.0."
+        )
+
+        # Else we want to set the field
+        send("_#{field}=", value)
+      end
+    end
+
   end
 
 end