fix(database): don't enforce client encoding

diff --git a/arvados/files/default/config.tmpl.jinja b/arvados/files/default/config.tmpl.jinja
index c52186ee567bd8d4104ae2c352d99b1351426579..9c9db2fe4e6cb43d331b39b77037f1a1de5ee6ba 100644 (file)
--- a/arvados/files/default/config.tmpl.jinja
+++ b/arvados/files/default/config.tmpl.jinja
@@ -73,7 +73,6 @@ Clusters:
         host: {{ arvados.cluster.database.host }}
         password: {{ arvados.cluster.database.password | yaml_encode }}
         user: {{ arvados.cluster.database.user }}
         host: {{ arvados.cluster.database.host }}
         password: {{ arvados.cluster.database.password | yaml_encode }}
         user: {{ arvados.cluster.database.user }}

-        client_encoding: {{ arvados.cluster.database.client_encoding }}

         {%- if arvados.cluster.database.extra_conn_params is defined %}
         {{ arvados.cluster.database.extra_conn_params | yaml(False) | indent(8) }}
         {%- endif %}
         {%- if arvados.cluster.database.extra_conn_params is defined %}
         {{ arvados.cluster.database.extra_conn_params | yaml(False) | indent(8) }}
         {%- endif %}

diff --git a/pillar.example b/pillar.example
index 4ff35cdb15cb4d3137e8a511a835ce3cd66a9fe5..233b492cb0b52ee20d112d1ab184ef55913ab556 100644 (file)
--- a/pillar.example
+++ b/pillar.example
@@ -65,13 +65,12 @@ arvados:
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados

-      encoding: en_US.utf8
-      client_encoding: UTF8

       # You can pass extra database connections parameters here,
       # which will be rendered as yaml.
       # extra_conn_params:
       #  sslmode: prefer
       #  verify-ca: false
       # You can pass extra database connections parameters here,
       # which will be rendered as yaml.
       # extra_conn_params:
       #  sslmode: prefer
       #  verify-ca: false

+      #  client_encoding: UTF8

 
 
     tls:
 
 
     tls:

diff --git a/test/integration/api/controls/config_spec.rb b/test/integration/api/controls/config_spec.rb
index 57fffc1284d65e3af8100ef9ce27982dcc4851bf..0f64cb2db41911054254551a694875bea9d053e0 100644 (file)
--- a/test/integration/api/controls/config_spec.rb
+++ b/test/integration/api/controls/config_spec.rb
@@ -10,6 +10,20 @@ rails_stanza = <<-RAILS_STANZA
           http://api.internal:8004: {}
 RAILS_STANZA
 
           http://api.internal:8004: {}
 RAILS_STANZA
 

+database_stanza = <<-DATABASE_STANZA
+    ### DATABASE CONFIGURATION
+    PostgreSQL:
+      ConnectionPool: 32
+      Connection:
+        # All parameters here are passed to the PG client library in a connection string;
+        # see https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
+        dbname: arvados
+        host: 127.0.0.1
+        password: "changeme_arvados"
+        user: arvados
+        client_encoding: UTF8
+DATABASE_STANZA
+

 group = case os[:name]
         when 'centos'
           'nginx'
 group = case os[:name]
         when 'centos'
           'nginx'


@@ -32,5 +46,6 @@ control 'arvados configuration' do
     end
     its('content') { should include(api_stanza) }
     its('content') { should include(rails_stanza) }
     end
     its('content') { should include(api_stanza) }
     its('content') { should include(rails_stanza) }

+    its('content') { should include(database_stanza) }

   end
 end
   end
 end

diff --git a/test/salt/pillar/arvados.sls b/test/salt/pillar/arvados.sls
index 73efb61efa8255ff15b12c05c5d963d80feb5f02..a063823956a4c139978e7057b7aa451706e33c4f 100644 (file)
--- a/test/salt/pillar/arvados.sls
+++ b/test/salt/pillar/arvados.sls
@@ -39,14 +39,13 @@ arvados:
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados

-      encoding: en_US.utf8
-      client_encoding: UTF8
+      extra_conn_params:
+        client_encoding: UTF8

       # Centos7 does not enable SSL by default, so we disable
       # it here just for testing of the formula purposes only.
       # You should not do this in production, and should
       # configure Postgres certificates correctly
       {%- if grains.os_family in ('RedHat',) %}
       # Centos7 does not enable SSL by default, so we disable
       # it here just for testing of the formula purposes only.
       # You should not do this in production, and should
       # configure Postgres certificates correctly
       {%- if grains.os_family in ('RedHat',) %}

-      extra_conn_params:

         sslmode: disable
       {%- endif %}
 
         sslmode: disable
       {%- endif %}
 

diff --git a/test/salt/pillar/arvados_dev.sls b/test/salt/pillar/arvados_dev.sls
index e1c42cd868e571263c77b4fc087f2e1f81942968..35a5bffc154b169f586e67778007b38fbf03ffaa 100644 (file)
--- a/test/salt/pillar/arvados_dev.sls
+++ b/test/salt/pillar/arvados_dev.sls
@@ -65,8 +65,8 @@ arvados:
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados
       host: 127.0.0.1
       password: changeme_arvados
       user: arvados

-      encoding: en_US.utf8
-      client_encoding: UTF8
+      extra_conn_params:
+        client_encoding: UTF8

 
     tls:
       # certificate: ''
 
     tls:
       # certificate: ''