[MISC] Fix secret keys #212
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dragomirp
commented
Feb 7, 2024
Comment on lines
+75
to
+77
| self._translate_field_to_secret_key(AUTH_FILE_DATABAG_KEY), | ||
| self._translate_field_to_secret_key(CFG_FILE_DATABAG_KEY), | ||
| self._translate_field_to_secret_key(MONITORING_PASSWORD_KEY), |
There was a problem hiding this comment.
Needed the transformed peer data keys to properly register as secrets.
There was a problem hiding this comment.
Yes, but not just here...
get/set_secret() functions need to have it translated too, when passing the secret key to the lib.
dragomirp
commented
Feb 7, 2024
| ) | ||
| assert secret_uri is not None | ||
| assert password is None | ||
| assert auth_file is None |
There was a problem hiding this comment.
Hopefully avoid the same footgun in the future.
dragomirp
commented
Feb 7, 2024
| @@ -209,7 +209,6 @@ def _on_changed(self, event: HookEvent): | |||
| event.defer() | |||
| return | |||
|
|
|||
| self.update_cfg(cfg) | |||
There was a problem hiding this comment.
Caused update secrets restart loop.
dragomirp
commented
Feb 7, 2024
Comment on lines
-273
to
-282
| tls_enabled = all(self.tls.get_tls_files()) | ||
| if self.model.relations.get("certificates", []) and not tls_enabled: | ||
| logger.debug( | ||
| "pgbouncer_pebble_ready: Deferring as certificates files are not yet populated for existing certificates relation" | ||
| ) | ||
| self.unit.status = WaitingStatus("Waiting for certificates") | ||
| event.defer() | ||
| return | ||
| # in case of pod restart | ||
| elif tls_enabled: |
There was a problem hiding this comment.
TLS test fails when deferring.
dragomirp
commented
Feb 7, 2024
Comment on lines
-133
to
-153
| @patch("charm.PostgreSQLTLS.get_tls_files") | ||
| @patch("ops.model.Container.make_dir") | ||
| def test_on_pgbouncer_pebble_ready_defer_tls(self, _mkdir, get_tls_files): | ||
| get_tls_files.return_value = (None, None, None) | ||
|
|
||
| self.harness.add_relation(BACKEND_RELATION_NAME, "postgres") | ||
| self.harness.add_relation("certificates", "tls_op") | ||
| self.harness.set_leader(True) | ||
| # emit on start to ensure config file render | ||
| self.charm.on.start.emit() | ||
| initial_plan = self.harness.get_container_pebble_plan(PGB) | ||
| self.assertEqual(initial_plan.to_yaml(), "{}\n") | ||
|
|
||
| container = self.harness.model.unit.get_container(PGB) | ||
| self.charm.on.pgbouncer_pebble_ready.emit(container) | ||
|
|
||
| assert not len(self.harness.model.unit.get_container(PGB).get_services()) | ||
| get_tls_files.assert_called_once_with() | ||
| self.assertIsInstance(self.harness.model.unit.status, WaitingStatus) | ||
| self.assertEqual(self.harness.model.unit.status.message, "Waiting for certificates") | ||
|
|
There was a problem hiding this comment.
No longer deferring in on_pebble_ready
juditnovak
requested changes
Feb 7, 2024
Comment on lines
+75
to
+77
| self._translate_field_to_secret_key(AUTH_FILE_DATABAG_KEY), | ||
| self._translate_field_to_secret_key(CFG_FILE_DATABAG_KEY), | ||
| self._translate_field_to_secret_key(MONITORING_PASSWORD_KEY), |
There was a problem hiding this comment.
Yes, but not just here...
get/set_secret() functions need to have it translated too, when passing the secret key to the lib.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Peer secrets were set as peer data.