Merge ~freyes/charm-grafana:minor-changes into charm-grafana:master

[Felipe Reyes]

This MP addresses feedback left in https://code.launchpad.net/~freyes/charm-grafana/+git/charm-grafana/+merge/407900 .

This MP addresses feedback left in https://code.launchpad.net/~freyes/charm-grafana/+git/charm-grafana/+merge/407900 .

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

Change has no commit message, setting status to needs review.

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

Change successfully merged at revision c9476829275128dbd65832dbddd0452269b3482f

diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
index a9468c1..0addf37 100644
--- a/src/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -501,7 +501,7 @@ def setup_grafana():
 
     _maybe_install_ca_certificates_hook()
 
-    # write the certificates given via juju config
+    # Write the certificates provided via juju config
     if config_defined_ssl_cert() and config_defined_ssl_key():
         os.makedirs(CERT_DIR[config["install_method"]], exist_ok=True)
         with open(CERT_PATH[config["install_method"]], "wb") as f:
@@ -981,9 +981,7 @@ def generate_prometheus_dashboards(gf_adminpasswd, ds):
         )
         return
     else:
-        hookenv.status_set(
-            "active", "Ready"
-        )
+        hookenv.status_set("active", "Ready")
 
     current_dashboards = get_current_dashboards(config["port"], gf_adminpasswd)
     dash_to_uid = {
@@ -1385,21 +1383,19 @@ def tls_certificate_changed():
 
 
 def _ensure_certs_permissions():
+    inst_method = hookenv.config("install_method")
     # The certificates when written by the tls-client layer are set with the
     # permissions 0o770 and this section will be effectively a NOOP, but when
     # they are written by the charm because the operator used the "juju
     # config" configuration options this will set the permissions according to
     # the expectatives of the code.
-    os.chmod(CERT_PATH[hookenv.config("install_method")], stat.S_IRWXU | stat.S_IRWXG)
-    os.chmod(
-        CERT_KEY_PATH[hookenv.config("install_method")], stat.S_IRWXU | stat.S_IRWXG
-    )
+    os.chmod(CERT_PATH[inst_method], stat.S_IRWXU | stat.S_IRWXG)
+    os.chmod(CERT_KEY_PATH[inst_method], stat.S_IRWXU | stat.S_IRWXG)
 
-    # The certificates written are owned by root and 0o770 permissions which
+    # The certificates written are owned by root with 0o770 permissions which
     # prevents the grafana-server process to read them when using the Debian
     # package, so the parent directory needs to allow the access for the
     # 'grafana' group.
-    inst_method = hookenv.config("install_method")
     if inst_method == "apt":
         uid = pwd.getpwnam("root").pw_uid
         gid = grp.getgrnam("grafana").gr_gid