Merge ~xavpaice/charm-grafana:lp1964725 into charm-grafana:master

[Xav Paice]

Render ldap config owned by daemon user

    When installed as a snap, the LDAP config needs to be owned by root as
    the grafana user does not exist.

    Fixes-bug: LP: #1964725

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

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:15844f081323305b1a05695fd4b17359f6933007
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/81/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/650/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1118/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/81//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:503730298dc947bf296c766c8c1ab40d3d552a41
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/82/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/652/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1120/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/82//rebuild

review: Approve (continuous-integration)

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

Change successfully merged at revision 692d0fc7c732c211d40d2f705664dae93a5f5db2

diff --git a/src/lib/charms/layer/grafana.py b/src/lib/charms/layer/grafana.py
index 9c0fb16..9b452cc 100644
--- a/src/lib/charms/layer/grafana.py
+++ b/src/lib/charms/layer/grafana.py
@@ -419,6 +419,24 @@ def render_ldap_ca(ldap_server_ca, ldap_ca_path):
     )
 
 
+def get_grafana_user(config):
+    """Return the name of the user and group for the Grafana daemon.
+
+    Since the config value install_method uses apt for any value not "snap", we
+    do the same here.
+    Returns: dict, user and group account names.
+
+    """
+    daemon_account = {
+        "snap": {"user": "root", "group": "root"},
+        "apt": {"user": "grafana", "group": "grafana"},
+    }
+    if config["install_method"] == "snap":
+        return daemon_account["snap"]
+    else:
+        return daemon_account["apt"]
+
+
 def render_ldap_config(config, ldap_toml_path, ldap_ca_path=None):
     """Validate and render the ldap config file."""
     clear_flag("ldap.config.incomplete")
@@ -440,12 +458,13 @@ def render_ldap_config(config, ldap_toml_path, ldap_ca_path=None):
     if ldap_ca_path:
         render_ldap_ca(config["ldap_server_ca"], ldap_ca_path)
         settings["ldap_ca_path"] = ldap_ca_path
+    user_info = get_grafana_user(config)
     render(
         source=LDAP_TOML_TMPL,
         target=ldap_toml_path,
         context=settings,
-        owner="grafana",
-        group="grafana",
+        owner=user_info["user"],
+        group=user_info["group"],
         perms=0o600,
     )
     status_set("active", "Completed configuring LDAP authentication")
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 3410cad..11d5fe9 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -5,6 +5,7 @@ configure:
       - tests.setup.set_certificate
 
 gate_bundles:
+  - model_snap_install: focal-snap-tls
   - model_apt_install: focal-tls
   - model_apt_install: bionic-tls
   - self_signed_cert: focal-self-signed-cert
@@ -13,7 +14,6 @@ smoke_bundles:
 dev_bundles:
   - self_signed_cert: focal-snap-self-signed-cert
   - model_snap_install: bionic-snap-tls
-  - model_snap_install: focal-snap-tls
   - model_snap_install: bionic-snap
   - model_apt_install: bionic
   - model_snap_install: bionic-snap