Merge ~jk0ne/charm-k8s-discourse/+git/charm-k8s-discourse:cmr-db-revision into charm-k8s-discourse:master

[Jay Kuri]

Adjust db related event handlers to more closely follow what works in the MatterMost charm

[🤖 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)]

Let's hold off on this until we've got a fix that's actually been tested to be working.

Also, I'm not clear how the new Dockerfile would be used. Ideally this would be something that we could set up a Launchpad OCI Recipe build for but I think this relies on having built the base image as "discourse:v2.5.2". Do we know how Launchpad would reference that? Or is there some way to restructure this so that we inherit the steps from image/Dockerfile when running docker build against this file?

review: Needs Fixing

[Tom Haddon (mthaddon)]

In terms of the image build, I think something like https://paste.ubuntu.com/p/J5j5Fct4DF/ should work. I'll test locally, and ask for your feedback later as well.

[Tom Haddon (mthaddon)]

Ok, see https://code.launchpad.net/~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse/+merge/393494

[Tom Haddon (mthaddon)]

Rejecting in favour of https://code.launchpad.net/~stub/charm-k8s-discourse/+git/charm-k8s-discourse/+merge/393492, which we've tested locally.

Unmerged commits

2e1c620... by Jay Kuri on 2020-11-06

Adjust db related event handlers to more closely follow what works in
the MatterMost charm

f6dc0ee... by Jay Kuri on 2020-11-05

Add markdown-saml subordinate image dockerfile

diff --git a/image/markdown-saml/Dockerfile b/image/markdown-saml/Dockerfile
 new file mode 100644
index 0000000..fe68a4b
--- /dev/null
+++ b/image/markdown-saml/Dockerfile
@@ -0,0 +1,21 @@
+FROM discourse:v2.5.2
+
+# CONTAINER_APP_ROOT is where files related to this application go. This
+# environment variable is available in the build scripts. This should usually be
+# a subdirectory of /srv.
+ENV CONTAINER_APP_ROOT=/srv/discourse
+
+# Application specific environment variables go here.
+ENV GEM_HOME ${CONTAINER_APP_ROOT}/.gem
+
+# We don't want packages prompting us during install.
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN cd ${CONTAINER_APP_ROOT}/app/plugins && git clone https://github.com/discourse/discourse-saml.git
+RUN cd ${CONTAINER_APP_ROOT}/app/plugins && git clone https://github.com/canonical-web-and-design/discourse-markdown-note.git
+RUN chown -R ${CONTAINER_APP_USERNAME}:${CONTAINER_APP_GROUP} ${CONTAINER_APP_ROOT}/app/plugins
+RUN cd ${CONTAINER_APP_ROOT}/app && su -s /bin/bash -c 'bin/bundle install' ${CONTAINER_APP_USERNAME} 
+
+RUN echo "saml_target_url = https://login.ubuntu.com/+saml" >> /srv/scripts/assets/discourse.conf.tmpl
+RUN echo "saml_cert_fingerprint = 32:15:20:9F:A4:3C:8E:3E:8E:47:72:62:9A:86:8D:0E:E6:CF:45:D5" >> /srv/scripts/assets/discourse.conf.tmpl
+RUN echo "saml_full_screen_login = true" >> /srv/scripts/assets/discourse.conf.tmpl
diff --git a/src/charm.py b/src/charm.py
index 5bb75ad..55b4cc9 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -3,9 +3,9 @@
 # See LICENSE file for licensing details.
 
 import ops.lib
-from ops.charm import CharmBase
+from ops.charm import CharmBase, CharmEvents
 from ops.main import main
-from ops.framework import StoredState
+from ops.framework import StoredState, EventBase, EventSource
 
 from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus
 
@@ -144,8 +144,19 @@ def check_for_missing_config_fields(config):
     return sorted(missing_fields)
 
 
+class DiscourseDBMasterAvailableEvent(EventBase):
+    pass
+
+
+class DiscourseCharmEvents(CharmEvents):
+    """Custom charm events."""
+
+    db_master_available = EventSource(DiscourseDBMasterAvailableEvent)
+
+
 class DiscourseCharm(CharmBase):
     stored = StoredState()
+    on = DiscourseCharmEvents()
 
     def __init__(self, *args):
         """Initialization.
@@ -164,6 +175,7 @@ class DiscourseCharm(CharmBase):
         self.db = pgsql.PostgreSQLClient(self, 'db')
         self.framework.observe(self.db.on.database_relation_joined, self.on_database_relation_joined)
         self.framework.observe(self.db.on.master_changed, self.on_database_changed)
+        self.framework.observe(self.on.db_master_available, self.configure_pod)
 
     def check_config_is_valid(self, config):
         """Check that the provided config is valid.
@@ -252,7 +264,7 @@ class DiscourseCharm(CharmBase):
         self.stored.db_password = event.master.password
         self.stored.db_host = event.master.host
 
-        self.configure_pod()
+        self.on.db_master_available.emit()
 
 
 if __name__ == '__main__':  # pragma: no cover