Skip to content

Only store the sentry tokens in the credentials

Vincent Sellier requested to merge generated-differential-D4563-source into generated-differential-D4563-target

Needed for vagrant environments, sentry dsn needs to be an url to allow the services to start

Test Plan

(I don't know why there are some undef on the original values)

diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -69,5 +69,5 @@
         private_api_password: deposit_basic_auth_swhworker_password
       client_config:
      -  sentry_dsn: ''
      +  sentry_dsn: https://swh::deploy::webapp::sentry_token@sentry.softwareheritage.org/13
       keycloak:
         server_url: https://auth.softwareheritage.org/auth/
*******************************************
  File[/etc/systemd/system/gunicorn-swh-deposit.service] =>
   parameters =>
     content =>
      @@ -16,5 +16,5 @@
       Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/deposit/server.yml
       Environment=DJANGO_SETTINGS_MODULE=swh.deposit.settings.production
      -Environment=SWH_SENTRY_DSN=undef
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::deposit::sentry_token@sentry.softwareheritage.org/12
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.deposit
*******************************************
  File[/etc/systemd/system/gunicorn-swh-storage.service] =>
   parameters =>
     content =>
      @@ -16,5 +16,5 @@
       Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/storage/storage.yml
       Environment=SWH_LOG_TARGET=journal
      -Environment=SWH_SENTRY_DSN=undef
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::storage::sentry_token@sentry.softwareheritage.org/3
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.storage
*******************************************
  File[/etc/systemd/system/gunicorn-swh-webapp.service] =>
   parameters =>
     content =>
      @@ -15,5 +15,5 @@
       WorkingDirectory=/run/gunicorn/swh-webapp
       Environment=DJANGO_SETTINGS_MODULE=swh.web.settings.production
      -Environment=SWH_SENTRY_DSN=undef
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::webapp::sentry_token@sentry.softwareheritage.org/13
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.web
*******************************************
  Gunicorn::Instance[swh-deposit] =>
   parameters =>
     environment =>
       SWH_SENTRY_DSN =>
        + https://swh::deploy::deposit::sentry_token@sentry.softwareheritage.org/12
*******************************************
  Gunicorn::Instance[swh-storage] =>
   parameters =>
     environment =>
       SWH_SENTRY_DSN =>
        + https://swh::deploy::storage::sentry_token@sentry.softwareheritage.org/3
*******************************************
  Gunicorn::Instance[swh-webapp] =>
   parameters =>
     environment =>
       SWH_SENTRY_DSN =>
        + https://swh::deploy::webapp::sentry_token@sentry.softwareheritage.org/13
*******************************************
  Systemd::Unit_file[gunicorn-swh-deposit.service] =>
   parameters =>
     content =>
      @@ -16,5 +16,5 @@
       Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/deposit/server.yml
       Environment=DJANGO_SETTINGS_MODULE=swh.deposit.settings.production
      -Environment=SWH_SENTRY_DSN=undef
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::deposit::sentry_token@sentry.softwareheritage.org/12
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.deposit
*******************************************
  Systemd::Unit_file[gunicorn-swh-storage.service] =>
   parameters =>
     content =>
      @@ -16,5 +16,5 @@
       Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/storage/storage.yml
       Environment=SWH_LOG_TARGET=journal
      -Environment=SWH_SENTRY_DSN=undef
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::storage::sentry_token@sentry.softwareheritage.org/3
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.storage
*******************************************
  Systemd::Unit_file[gunicorn-swh-webapp.service] =>
   parameters =>
     content =>
      @@ -15,5 +15,5 @@
       WorkingDirectory=/run/gunicorn/swh-webapp
       Environment=DJANGO_SETTINGS_MODULE=swh.web.settings.production
      -Environment=SWH_SENTRY_DSN=undef
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::webapp::sentry_token@sentry.softwareheritage.org/13
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.web
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org
diff origin/production/worker01.softwareheritage.org current/worker01.softwareheritage.org
*******************************************
  File[/etc/systemd/system/swh-worker@checker_deposit.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::deposit::sentry_token@sentry.softwareheritage.org/12
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.deposit
*******************************************
  File[/etc/systemd/system/swh-worker@lister.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=warning
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::lister::sentry_token@sentry.softwareheritage.org/6
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.lister
*******************************************
  File[/etc/systemd/system/swh-worker@loader_archive.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_cran.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_debian.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_deposit.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_git.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=100
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_git::sentry_token@sentry.softwareheritage.org/8
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.git
*******************************************
  File[/etc/systemd/system/swh-worker@loader_mercurial.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_mercurial::sentry_token@sentry.softwareheritage.org/10
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.mercurial
*******************************************
  File[/etc/systemd/system/swh-worker@loader_nixguix.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_npm.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_pypi.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  File[/etc/systemd/system/swh-worker@loader_svn.service.d/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_svn::sentry_token@sentry.softwareheritage.org/14
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.svn
*******************************************
  Systemd::Dropin_file[swh-worker@checker_deposit/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::deposit::sentry_token@sentry.softwareheritage.org/12
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.deposit
*******************************************
  Systemd::Dropin_file[swh-worker@lister/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=warning
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::lister::sentry_token@sentry.softwareheritage.org/6
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.lister
*******************************************
  Systemd::Dropin_file[swh-worker@loader_archive/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_cran/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_debian/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_deposit/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_git/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=100
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_git::sentry_token@sentry.softwareheritage.org/8
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.git
*******************************************
  Systemd::Dropin_file[swh-worker@loader_mercurial/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_mercurial::sentry_token@sentry.softwareheritage.org/10
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.mercurial
*******************************************
  Systemd::Dropin_file[swh-worker@loader_nixguix/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_npm/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_pypi/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_core::sentry_token@sentry.softwareheritage.org/9
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.core
*******************************************
  Systemd::Dropin_file[swh-worker@loader_svn/parameters.conf] =>
   parameters =>
     content =>
      @@ -6,4 +6,5 @@
       Environment=MAX_TASKS_PER_CHILD=5
       Environment=LOGLEVEL=info
      +Environment=SWH_SENTRY_DSN=https://swh::deploy::loader_svn::sentry_token@sentry.softwareheritage.org/14
       Environment=SWH_SENTRY_ENVIRONMENT=production
       Environment=SWH_MAIN_PACKAGE=swh.loader.svn
*******************************************
*** End octocatalog-diff on worker01.softwareheritage.org

Migrated from D4563 (view on Phabricator)

Merge request reports