Merge ~gtrkiller/charm-k8s-mattermost:master into charm-k8s-mattermost:master

[Franco Luciano Forneron Buschiazzo]

rollback sslmode=disable

Even though MM docs suggest otherwise, by just using the --via option when relation postgresql to Mattermost solves the problem.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

Lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 1d05443a0341919b7db0894676a4fa4e69c0dbd8

diff --git a/src/charm.py b/src/charm.py
index 7265b84..1b68768 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -208,10 +208,7 @@ class MattermostK8sCharm(CharmBase):
         """Return an envConfig with some core configuration."""
         config = self.model.config
         # https://github.com/mattermost/mattermost-server/pull/14666
-        # On Mattermost 8.x we should sslmode=disable explicitly in the connection
-        # according to the docs:
-        # https://docs.mattermost.com/configure/database-configuration-settings.html#data-source
-        db_uri = self.state.db_uri.replace('postgresql://', 'postgres://') + '?sslmode=disable'
+        db_uri = self.state.db_uri.replace('postgresql://', 'postgres://')
         pod_config = {
             'MATTERMOST_HTTPD_LISTEN_PORT': CONTAINER_PORT,
             'MM_CONFIG': db_uri,
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index dbd9603..6a6888e 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -149,7 +149,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         self.harness.update_config(CONFIG_TEAM)
         expected = {
             'MATTERMOST_HTTPD_LISTEN_PORT': 8065,
-            'MM_CONFIG': 'postgres://10.0.1.101:5432/?sslmode=disable',
+            'MM_CONFIG': 'postgres://10.0.1.101:5432/',
             'MM_IMAGEPROXYSETTINGS_ENABLE': 'false',
             'MM_IMAGEPROXYSETTINGS_IMAGEPROXYTYPE': 'local',
             'MM_LOGSETTINGS_CONSOLELEVEL': 'INFO',
@@ -157,7 +157,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
             'MM_LOGSETTINGS_ENABLEFILE': 'false',
             'MM_SERVICESETTINGS_ENABLEGIFPICKER': 'true',
             'MM_SERVICESETTINGS_SITEURL': 'http://mattermost-k8s',
-            'MM_SQLSETTINGS_DATASOURCE': 'postgres://10.0.1.101:5432/?sslmode=disable',
+            'MM_SQLSETTINGS_DATASOURCE': 'postgres://10.0.1.101:5432/',
             'MM_TEAMSETTINGS_MAXCHANNELSPERTEAM': 20,
             'MM_TEAMSETTINGS_MAXUSERSPERTEAM': 30,
         }
@@ -245,7 +245,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         self.harness.update_config(CONFIG_GFYCAT_API_SNIPPET)
         expected = {
             'MATTERMOST_HTTPD_LISTEN_PORT': 8065,
-            'MM_CONFIG': 'postgres://10.0.1.101:5432/?sslmode=disable',
+            'MM_CONFIG': 'postgres://10.0.1.101:5432/',
             'MM_IMAGEPROXYSETTINGS_ENABLE': 'false',
             'MM_IMAGEPROXYSETTINGS_IMAGEPROXYTYPE': 'local',
             'MM_LOGSETTINGS_CONSOLELEVEL': 'INFO',
@@ -255,7 +255,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
             'MM_SERVICESETTINGS_GFYCATAPIKEY': EXAMPLE_CONFIG_GFYCAT_API_KEY,
             'MM_SERVICESETTINGS_GFYCATAPISECRET': EXAMPLE_CONFIG_GFYCAT_API_SECRET,
             'MM_SERVICESETTINGS_SITEURL': 'http://mattermost-k8s',
-            'MM_SQLSETTINGS_DATASOURCE': 'postgres://10.0.1.101:5432/?sslmode=disable',
+            'MM_SQLSETTINGS_DATASOURCE': 'postgres://10.0.1.101:5432/',
             'MM_TEAMSETTINGS_MAXCHANNELSPERTEAM': 3000,
             'MM_TEAMSETTINGS_MAXUSERSPERTEAM': 2000,
         }