Test configure_apiserver while addressing issue with authorization_modes #25
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
addyess
commented
Jun 28, 2024
| @@ -135,7 +135,7 @@ def configure_apiserver( | |||
| "Authorization mode includes 'Webhook' but no webhook config file is present." | |||
| "'Webhook' must be removed from authorization mode." | |||
| ) | |||
| authorization_modes = authorization_modes.remove("Webhook") | |||
There was a problem hiding this comment.
This is the original thrust of the bug. Python's list.remove returns None. causing the following stack track:
File "/var/lib/juju/agents/unit-kubernetes-control-plane-0/charm/./src/charm.py", line 541, in reconcile
self.configure_apiserver()
File "/var/lib/juju/agents/unit-kubernetes-control-plane-0/charm/./src/charm.py", line 141, in configure_apiserver
kubernetes_snaps.configure_apiserver(
File "/var/lib/juju/agents/unit-kubernetes-control-plane-0/charm/venv/charms/kubernetes_snaps.py", line 145, in configure_apiserver
api_opts["authorization-mode"] = ",".join(authorization_modes)
TypeError: can only join an iterable
addyess
commented
Jun 28, 2024
Comment on lines
-166
to
173
| audit_root = "/root/cdk/audit" | ||
| audit_log_path = audit_root + "/audit.log" | ||
| audit_policy_path = audit_root + "/audit-policy.yaml" | ||
| audit_webhook_conf_path = audit_root + "/audit-webhook-config.yaml" | ||
| os.makedirs(audit_root, exist_ok=True) | ||
| audit_root = Path("/root/cdk/audit") | ||
| audit_log_path = audit_root / "audit.log" | ||
| audit_policy_path = audit_root / "audit-policy.yaml" | ||
| audit_webhook_conf_path = audit_root / "audit-webhook-config.yaml" | ||
| audit_root.mkdir(exist_ok=True) | ||
|
|
||
| api_opts["audit-log-path"] = audit_log_path | ||
| api_opts["audit-log-path"] = str(audit_log_path) | ||
| api_opts["audit-log-maxage"] = "30" |
There was a problem hiding this comment.
These make the method more testable
addyess
commented
Jun 28, 2024
Comment on lines
-178
to
188
| with open(audit_policy_path, "w") as f: | ||
| with audit_policy_path.open("w") as f: | ||
| f.write(audit_policy) | ||
| api_opts["audit-policy-file"] = audit_policy_path | ||
| api_opts["audit-policy-file"] = str(audit_policy_path) | ||
| else: | ||
| remove_if_exists(audit_policy_path) | ||
|
|
||
| if audit_webhook_conf: | ||
| with open(audit_webhook_conf_path, "w") as f: | ||
| with audit_webhook_conf_path.open("w") as f: | ||
| f.write(audit_webhook_conf) | ||
| api_opts["audit-webhook-config-file"] = audit_webhook_conf_path | ||
| api_opts["audit-webhook-config-file"] = str(audit_webhook_conf_path) | ||
| else: |
There was a problem hiding this comment.
again -- more test-ability -- only need to mock out Path
eaudetcobello
approved these changes
Jun 28, 2024
|
|
||
| @mock.patch("charms.kubernetes_snaps.configure_kubernetes_service") | ||
| @mock.patch("charms.kubernetes_snaps.Path") | ||
| def test_configure_apiserver(mock_path, configure_kubernetes_service, external_cloud): |
addyess
added a commit
that referenced
this pull request
Jun 28, 2024
addyess
added a commit
that referenced
this pull request
Jun 28, 2024
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.
Overview
Addresses LP#2071488 by not assigning the output of
list.removeback to the list. python'slist.remove()always returns NoneDetails