[DPE-3451][DPE-3452] Expose pgbouncer #137
Conversation
dragomirp
force-pushed
the
dpe-3451-expose
branch
from
35df0b3 to
e03b938
Compare
There was a problem hiding this comment.
Copy of the data integrator with the expose flag requested.
| if tls: | ||
| sslmode = "require" | ||
| else: | ||
| sslmode = "disable" |
There was a problem hiding this comment.
This will work with TLS enabled as well.
| # TODO remove hotpatching when data-integrator implements its side of the replation | ||
| await ops_test.model.wait_for_idle(apps=[DATA_INTEGRATOR_APP_NAME]) | ||
| await _update_file( | ||
| ops_test, | ||
| "./lib/charms/data_platform_libs/v0/data_interfaces.py", | ||
| "lib/charms/data_platform_libs/v0/data_interfaces.py", | ||
| ) | ||
| await _update_file( | ||
| ops_test, | ||
| "./tests/integration/relations/pgbouncer_provider/data_integrator_charm.py", | ||
| "src/charm.py", | ||
| ) |
There was a problem hiding this comment.
Replace the data_interfaces and charm code on the data-integrator units, so that we can implement the interface in the mean time.
There was a problem hiding this comment.
Q: why did you go with "mission impossible"-style of live data-integrator charm patching instead of PR data-intgrator charms? :-)
dragomirp
changed the title
There was a problem hiding this comment.
Mostly methods required by the Postgresql TLS charm lib.
| key, ca, cert = self.tls.get_tls_files() | ||
| if key is not None: | ||
| self.render_file( | ||
| f"{PGB_CONF_DIR}/{self.app.name}/{TLS_KEY_FILE}", |
There was a problem hiding this comment.
We should use the app specific config dir, in case of multiple subordinates in the same principle.
| @pytest.mark.group(1) | ||
| async def test_relation_with_data_integrator(ops_test: OpsTest): | ||
| """Test that the charm can be related to the data integrator without extra user roles.""" | ||
| config = {"database-name": "test-database"} | ||
| await ops_test.model.deploy( | ||
| DATA_INTEGRATOR_APP_NAME, | ||
| channel="edge", | ||
| config=config, | ||
| ) | ||
| await ops_test.model.add_relation(f"{PGB}:database", DATA_INTEGRATOR_APP_NAME) | ||
| async with ops_test.fast_forward(): | ||
| await ops_test.model.wait_for_idle(status="active") |
There was a problem hiding this comment.
Moved to its own suite.
| # TODO remove hotpatching when data-integrator implements its side of the replation | ||
| await ops_test.model.wait_for_idle(apps=[DATA_INTEGRATOR_APP_NAME]) | ||
| await _update_file( | ||
| ops_test, | ||
| "./lib/charms/data_platform_libs/v0/data_interfaces.py", | ||
| "lib/charms/data_platform_libs/v0/data_interfaces.py", | ||
| ) | ||
| await _update_file( | ||
| ops_test, | ||
| "./tests/integration/relations/pgbouncer_provider/data_integrator_charm.py", | ||
| "src/charm.py", | ||
| ) |
There was a problem hiding this comment.
Q: why did you go with "mission impossible"-style of live data-integrator charm patching instead of PR data-intgrator charms? :-)
dragomirp
force-pushed
the
dpe-3451-expose
branch
from
3398218 to
19297a1
Compare
dragomirp
force-pushed
the
dpe-3451-expose
branch
from
196a805 to
a23bdad
Compare
dragomirp
force-pushed
the
dpe-3451-expose
branch
from
a23bdad to
e40574a
Compare
data-integratorfor integration tests