fix(config): RailsSessionSecretToken is deprecated

BREAKING CHANGE: Upgrade Arvados to a new version (2.1.2) so this
        formula focuses mostly on that version.

diff --git a/arvados/files/default/config.tmpl.jinja b/arvados/files/default/config.tmpl.jinja
index fc01a13b7eaeedffd92872ce53cb05cdc005553d..c52186ee567bd8d4104ae2c352d99b1351426579 100644 (file)
--- 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 dcf7b5efb5e987b163dedf5fdc969a1e35505730..4ff35cdb15cb4d3137e8a511a835ce3cd66a9fe5 100644 (file)
--- 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 4585b95b8c829144f8ac1a1cfb117ff5503434b6..57fffc1284d65e3af8100ef9ce27982dcc4851bf 100644 (file)
--- 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 9e1ccbc0b220b7a9bcc890f27821509b092ace91..73efb61efa8255ff15b12c05c5d963d80feb5f02 100644 (file)
--- 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 51d650e027c8045e7494f31259577be98f335b4c..e1c42cd868e571263c77b4fc087f2e1f81942968 100644 (file)
--- 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