1
diff --git a/src/templates/ldap.toml.j2 b/src/templates/ldap.toml.j2
2
index bbf0d27..a47819d 100644
3
--- a/src/templates/ldap.toml.j2
4
+++ b/src/templates/ldap.toml.j2
5
@@ -1,6 +1,6 @@
6
1
[[servers]]
1
[[servers]]
7
2
host = "{{ host }}"
2
host = "{{ host }}"
9
3
port = {{ port }} 
3
port = {{ port }}
10
4
bind_dn = "{{ config.ldap_user }}"
4
bind_dn = "{{ config.ldap_user }}"
11
5
bind_password = "{{ config.ldap_password }}"
5
bind_password = "{{ config.ldap_password }}"
12
6
{% if ssl or config.ldap_server_ca -%}
6
{% if ssl or config.ldap_server_ca -%}
13
@@ -20,8 +20,10 @@ search_filter = "(cn=%s)"
14
20
{% for key, value in ldap_options.items() -%}
20
{% for key, value in ldap_options.items() -%}
15
21
{% if key == 'group_search_base_dns' -%}
21
{% if key == 'group_search_base_dns' -%}
16
22
group_search_base_dns = ["{{ value }}"]
22
group_search_base_dns = ["{{ value }}"]
18
23
{% else -%}
23
{% elif value is string -%}
19
24
{{ key }} = "{{ value }}"
24
{{ key }} = "{{ value }}"
20
25
{% else -%}
21
26
{{ key }} = {{ value }}
22
25
{% endif -%}
27
{% endif -%}
23
26
{% endfor -%}
28
{% endfor -%}
24
27
{% endif -%}
29
{% endif -%}
25
diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
26
index 69746e3..fb3286e 100644
27
--- a/src/tests/functional/tests/test_grafana.py
28
+++ b/src/tests/functional/tests/test_grafana.py
29
@@ -304,7 +304,7 @@ class CharmOperationTest(BaseGrafanaTest):
30
304
304
31
305
        def chk(dashes):
305
        def chk(dashes):
32
306
            marker_dashes = [d for d in dashes if "FunctionalTestMarker" in d["title"]]
306
            marker_dashes = [d for d in dashes if "FunctionalTestMarker" in d["title"]]
34
307
            return len(dashes) >= 1 and len(marker_dashes) == 1
307
            return len(dashes) >= 1 and len(marker_dashes) >= 1
35
308
308
36
309
        dashes = self.get_and_check_dashboards(chk)
309
        dashes = self.get_and_check_dashboards(chk)
37
310
        self.assertTrue(chk(dashes))
310
        self.assertTrue(chk(dashes))
38
diff --git a/src/tests/unit/test_grafana.py b/src/tests/unit/test_grafana.py
39
index f15c9e9..e8da3f7 100644
40
--- a/src/tests/unit/test_grafana.py
41
+++ b/src/tests/unit/test_grafana.py
42
@@ -171,12 +171,12 @@ class GrafanaTestCase(unittest.TestCase):
43
171
            {"dashboard": {"title": "[juju-foo-app] test-title"}, "folderId": 0},
171
            {"dashboard": {"title": "[juju-foo-app] test-title"}, "folderId": 0},
44
172
        )
172
        )
45
173
173
52
174
    @mock.patch("charmhelpers.core.hookenv.charm_dir", auto_spec=True)
174
    @mock.patch("charmhelpers.core.hookenv.charm_dir", autospec=True)
53
175
    @mock.patch("reactive.grafana.templating.render", auto_spec=True)
175
    @mock.patch("reactive.grafana.templating.render", autospec=True)
54
176
    @mock.patch("reactive.grafana.hookenv.config", auto_spec=True)
176
    @mock.patch("reactive.grafana.hookenv.config", autospec=True)
55
177
    @mock.patch("reactive.grafana.hookenv.unit_public_ip", auto_spec=True)
177
    @mock.patch("reactive.grafana.hookenv.unit_public_ip", autospec=True)
56
178
    @mock.patch("reactive.grafana.hookenv.unit_private_ip", auto_spec=True)
178
    @mock.patch("reactive.grafana.hookenv.unit_private_ip", autospec=True)
57
179
    @mock.patch("subprocess.check_call", auto_spec=True)
179
    @mock.patch("subprocess.check_call", autospec=True)
58
180
    def test_request_certificate(
180
    def test_request_certificate(
59
181
        self,
181
        self,
60
182
        mock_check_call,
182
        mock_check_call,
61
@@ -217,12 +217,12 @@ class GrafanaTestCase(unittest.TestCase):
62
217
217
63
218
    @mock.patch("os.makedirs")
218
    @mock.patch("os.makedirs")
64
219
    @mock.patch("subprocess.check_call")
219
    @mock.patch("subprocess.check_call")
71
220
    @mock.patch.object(grafana_reactive.templating, "render", auto_spec=True)
220
    @mock.patch.object(grafana_reactive.templating, "render", autospec=True)
72
221
    @mock.patch.object(grafana_reactive, "check_ports", auto_spec=True)
221
    @mock.patch.object(grafana_reactive, "check_ports", autospec=True)
73
222
    @mock.patch.object(grafana_reactive, "render", auto_spec=True)
222
    @mock.patch.object(grafana_reactive, "render", autospec=True)
74
223
    @mock.patch.object(grafana_reactive, "get_install_source", auto_spec=True)
223
    @mock.patch.object(grafana_reactive, "get_install_source", autospec=True)
75
224
    @mock.patch.object(grafana, "config", auto_spec=True)
224
    @mock.patch.object(grafana, "config", autospec=True)
76
225
    @mock.patch("reactive.grafana.hookenv.config", auto_spec=True)
225
    @mock.patch("reactive.grafana.hookenv.config", autospec=True)
77
226
    def test_setting_ssl_via_juju_config(
226
    def test_setting_ssl_via_juju_config(
78
227
        self,
227
        self,
79
228
        mock_config,
228
        mock_config,
80
@@ -325,9 +325,9 @@ class GrafanaTestCase(unittest.TestCase):
81
325
    @mock.patch("sqlite3.connect")
325
    @mock.patch("sqlite3.connect")
82
326
    @mock.patch("os.chmod")
326
    @mock.patch("os.chmod")
83
327
    @mock.patch("charmhelpers.core.host.chownr")
327
    @mock.patch("charmhelpers.core.host.chownr")
85
328
    @mock.patch.object(grafana_reactive, "data_path", auto_spec=True)
328
    @mock.patch.object(grafana_reactive, "data_path", autospec=True)
86
329
    @mock.patch("charmhelpers.core.host.owner")
329
    @mock.patch("charmhelpers.core.host.owner")
88
330
    @mock.patch.object(grafana_reactive, "get_install_source", auto_spec=True)
330
    @mock.patch.object(grafana_reactive, "get_install_source", autospec=True)
89
331
    def test_db_connection_snap(
331
    def test_db_connection_snap(
90
332
        self,
332
        self,
91
333
        mock_install_source,
333
        mock_install_source,
92
@@ -350,9 +350,9 @@ class GrafanaTestCase(unittest.TestCase):
93
350
    @mock.patch("sqlite3.connect")
350
    @mock.patch("sqlite3.connect")
94
351
    @mock.patch("os.chmod")
351
    @mock.patch("os.chmod")
95
352
    @mock.patch("charmhelpers.core.host.chownr")
352
    @mock.patch("charmhelpers.core.host.chownr")
97
353
    @mock.patch.object(grafana_reactive, "data_path", auto_spec=True)
353
    @mock.patch.object(grafana_reactive, "data_path", autospec=True)
98
354
    @mock.patch("charmhelpers.core.host.owner")
354
    @mock.patch("charmhelpers.core.host.owner")
100
355
    @mock.patch.object(grafana_reactive, "get_install_source", auto_spec=True)
355
    @mock.patch.object(grafana_reactive, "get_install_source", autospec=True)
101
356
    def test_db_connection_apt(
356
    def test_db_connection_apt(
102
357
        self,
357
        self,
103
358
        mock_install_source,
358
        mock_install_source,
104
diff --git a/src/tests/unit/test_templates.py b/src/tests/unit/test_templates.py
105
359
new file mode 100644
359
new file mode 100644
106
index 0000000..e66f763
107
--- /dev/null
108
+++ b/src/tests/unit/test_templates.py
109
@@ -0,0 +1,47 @@
110
1
"""Unit tests module."""
111
2
112
3
import unittest
113
4
114
5
from charms.layer.grafana import LDAP_TOML_TMPL
115
6
116
7
import jinja2
117
8
118
9
119
10
class GrafanaTestCaseTemplates(unittest.TestCase):
120
11
    """Unit tests class for Grafana."""
121
12
122
13
    def test_template_ldap_tom_j2(self):
123
14
        """Test ldap.tom.j2 template."""
124
15
        settings = {
125
16
            "host": "ldap.server.example",
126
17
            "port": 389,
127
18
            "ldap_options": {
128
19
                "start_tls": False,
129
20
                "string_value1": "This is a string",
130
21
                "string_value2": "string_value2_value",
131
22
            },
132
23
            "config": {
133
24
                "ldap_user": "bind_dn_value",
134
25
                "ldap_password": "bind_passw0rd",
135
26
            },
136
27
        }
137
28
        expected = """\
138
29
[[servers]]
139
30
host = "ldap.server.example"
140
31
port = 389
141
32
bind_dn = "bind_dn_value"
142
33
bind_password = "bind_passw0rd"
143
34
use_ssl = false
144
35
search_base_dns = [""]
145
36
146
37
search_filter = "(cn=%s)"
147
38
start_tls = False
148
39
string_value1 = "This is a string"
149
40
string_value2 = "string_value2_value"
150
41
"""
151
42
        # Note(aluria): charmhelpers.contrib.templating.render fails when running
152
43
        # unit tests in py3.10
153
44
        template_env = jinja2.Environment(loader=jinja2.FileSystemLoader("templates"))
154
45
        template = template_env.get_template(LDAP_TOML_TMPL)
155
46
        content = template.render(settings)
156
47
        self.assertEqual(expected, content)
Reviewer	Review Type	Date Requested	Status
Peter Sabaini (community)		2022-05-25	Approve on 2022-06-01
🤖 prod-jenkaas-bootstack	continuous-integration		Needs Fixing on 2022-05-30
BootStack Reviewers		2022-05-25	Pending
Review via email: mp+423367@code.launchpad.net