charm-k8s-mattermost

Merge ~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost:ops-lib-pgsql into charm-k8s-mattermost:master

  1. Git
  2. lp:~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost
  3. ops-lib-pgsql
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 15ce6c4f0c487d1c04ae73a1f5647f8b701454b2
Merged at revision: 56ee71941b9eb6a3ea30b3dc6f9293ae88ff50c9
Proposed branch: ~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost:ops-lib-pgsql
Merge into: charm-k8s-mattermost:master
Diff against target: 71 lines (+6/-4)
4 files modified
dev/null (+0/-1)
requirements.txt (+1/-0)
src/charm.py (+4/-2)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Mattermost Charmers Pending
Review via email: mp+391507@code.launchpad.net

Commit message

Switch to using ops-lib-pgsql rather than submodules for PostgreSQL relation

Description of the change

Switch to using ops-lib-pgsql rather than submodules for PostgreSQL relation

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Stuart Bishop (stub) wrote :

This all looks correct.

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 56ee71941b9eb6a3ea30b3dc6f9293ae88ff50c9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitmodules b/.gitmodules
2deleted file mode 100644
3index 5b9992b..0000000
4--- a/.gitmodules
5+++ /dev/null
6@@ -1,3 +0,0 @@
7-[submodule "mod/interface-pgsql"]
8- path = mod/interface-pgsql
9- url = lp:~stub/interface-pgsql/+git/operator
10diff --git a/lib/interface/pgsql b/lib/interface/pgsql
11deleted file mode 120000
12index fac7ffe..0000000
13--- a/lib/interface/pgsql
14+++ /dev/null
15@@ -1 +0,0 @@
16-../../mod/interface-pgsql/pgsql
17\ No newline at end of file
18diff --git a/mod/interface-pgsql b/mod/interface-pgsql
19deleted file mode 160000
20index 6f38023..0000000
21--- a/mod/interface-pgsql
22+++ /dev/null
23@@ -1 +0,0 @@
24-Subproject commit 6f38023049b15d5dcbe595880cfe3fdf51def83f
25diff --git a/requirements.txt b/requirements.txt
26index 2d81d3b..fd6adcd 100644
27--- a/requirements.txt
28+++ b/requirements.txt
29@@ -1 +1,2 @@
30 ops
31+ops-lib-pgsql
32diff --git a/src/charm.py b/src/charm.py
33index 34f8922..2dc7a30 100755
34--- a/src/charm.py
35+++ b/src/charm.py
36@@ -9,6 +9,7 @@ from ipaddress import ip_network
37 from urllib.parse import urlparse
38 from zlib import crc32
39
40+import ops.lib
41 from ops.charm import (
42 CharmBase,
43 CharmEvents,
44@@ -26,12 +27,13 @@ from ops.model import (
45 WaitingStatus,
46 )
47
48-from interface import pgsql
49-
50 from utils import extend_list_merging_dicts_matched_by_key
51
52 import logging
53
54+
55+pgsql = ops.lib.use("pgsql", 1, "postgresql-charmers@lists.launchpad.net")
56+
57 logger = logging.getLogger()
58
59
60diff --git a/tox.ini b/tox.ini
61index 48bf1ab..066c5a8 100644
62--- a/tox.ini
63+++ b/tox.ini
64@@ -24,7 +24,7 @@ passenv =
65 JUJU_REPOSITORY
66 PATH
67 commands =
68- pytest -v --ignore mod --ignore {toxinidir}/tests/unit {posargs}
69+ pytest -v --ignore {toxinidir}/tests/unit {posargs}
70 deps = -r{toxinidir}/tests/functional/requirements.txt
71 -r{toxinidir}/requirements.txt
72

Subscribers

People subscribed via source and target branches