From deae23d2bf8f41dbd624494613cab1df71a8c231 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Tue, 9 Feb 2021 09:28:14 -0300 Subject: [PATCH] fix(config): RailsSessionSecretToken is deprecated BREAKING CHANGE: Upgrade Arvados to a new version (2.1.2) so this formula focuses mostly on that version. --- arvados/files/default/config.tmpl.jinja | 1 - pillar.example | 7 +++---- test/integration/api/controls/config_spec.rb | 1 - test/salt/pillar/arvados.sls | 1 - test/salt/pillar/arvados_dev.sls | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arvados/files/default/config.tmpl.jinja b/arvados/files/default/config.tmpl.jinja index fc01a13..c52186e 100644 --- a/arvados/files/default/config.tmpl.jinja +++ b/arvados/files/default/config.tmpl.jinja @@ -22,7 +22,6 @@ Clusters: ForceLegacyAPI14: {{ arvados.cluster.force_legacy_api14 }} API: - RailsSessionSecretToken: {{ arvados.cluster.tokens.rails_secret | yaml_encode }} {%- if 'API' in arvados.cluster %} {{ arvados.cluster.API | default('') | yaml(False) | indent(6) }} {%- endif %} diff --git a/pillar.example b/pillar.example index dcf7b5e..4ff35cd 100644 --- a/pillar.example +++ b/pillar.example @@ -82,12 +82,11 @@ arvados: ### TOKENS tokens: - # SystemRootToken has to be alphanumeric, it does not accept underscores - # or special characters. See - # https://dev.arvados.org/issues/17150 + # Secrets and tokens have to be +32 alphanumeric, + # it does not accept underscores or special characters. + # See https://dev.arvados.org/issues/17150 system_root: changemesystemroottoken management: changememanagementtoken - rails_secret: changemerailssecrettoken anonymous_user: changemeanonymoususertoken ### KEYS diff --git a/test/integration/api/controls/config_spec.rb b/test/integration/api/controls/config_spec.rb index 4585b95..57fffc1 100644 --- a/test/integration/api/controls/config_spec.rb +++ b/test/integration/api/controls/config_spec.rb @@ -2,7 +2,6 @@ api_stanza = <<-API_STANZA API: - RailsSessionSecretToken: "changemerailssecrettoken" API_STANZA rails_stanza = <<-RAILS_STANZA diff --git a/test/salt/pillar/arvados.sls b/test/salt/pillar/arvados.sls index 9e1ccbc..73efb61 100644 --- a/test/salt/pillar/arvados.sls +++ b/test/salt/pillar/arvados.sls @@ -60,7 +60,6 @@ arvados: tokens: system_root: changemesystemroottoken management: changememanagementtoken - rails_secret: changemerailssecrettoken anonymous_user: changemeanonymoususertoken ### KEYS diff --git a/test/salt/pillar/arvados_dev.sls b/test/salt/pillar/arvados_dev.sls index 51d650e..e1c42cd 100644 --- a/test/salt/pillar/arvados_dev.sls +++ b/test/salt/pillar/arvados_dev.sls @@ -78,7 +78,6 @@ arvados: tokens: system_root: changemesystemroottoken management: changememanagementtoken - rails_secret: changemerailssecrettoken anonymous_user: changemeanonymoususertoken ### KEYS -- 2.30.2