Skip to content

fix: properly granting observability model access to Juju users #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hemanthnakkina merged 1 commit into from
Jun 5, 2026
Merged

fix: properly granting observability model access to Juju users #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sunbeam-python/sunbeam/features/observability/feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,16 +888,16 @@ def post_enable(
client = deployment.get_client()
jhelper = JujuHelper(deployment.juju_controller)

for node in client.cluster.list_nodes():
node_name = node["name"]
for user in client.cluster.list_juju_users():
user_name = user["username"]
try:
plan = [
JujuGrantModelAccessStep(jhelper, node_name, OBSERVABILITY_MODEL)
JujuGrantModelAccessStep(jhelper, user_name, OBSERVABILITY_MODEL)
Comment thread
himax16 marked this conversation as resolved.
]
run_plan(plan, console, show_hints)
except Exception as e:
LOG.warning(
"Failed to grant %s access to observability model: %s", node_name, e
"Failed to grant %s access to observability model: %s", user_name, e
)

def pre_disable(self, deployment: Deployment, show_hints: bool) -> None:
Expand Down
16 changes: 8 additions & 8 deletions sunbeam-python/tests/unit/sunbeam/features/test_observability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,10 +661,10 @@ def test_post_enable_grants_access_to_all_nodes(
self, deployment, update_config, run_plan_obs, juju_helper_obs
):
"""All nodes get JujuGrantModelAccessStep called via run_plan."""
deployment.get_client.return_value.cluster.list_nodes.return_value = [
{"name": "node-1"},
{"name": "node-2"},
{"name": "node-3"},
deployment.get_client.return_value.cluster.list_juju_users.return_value = [
{"username": "node-1", "token": "t"},
{"username": "node-2", "token": "t"},
{"username": "node-3", "token": "t"},
]
feature = observability_feature.EmbeddedObservabilityFeature()

Expand All @@ -683,10 +683,10 @@ def test_post_enable_handles_grant_failure_gracefully(
self, deployment, update_config, run_plan_obs, juju_helper_obs
):
"""If granting access fails for one node, others are still processed."""
deployment.get_client.return_value.cluster.list_nodes.return_value = [
{"name": "node-1"},
{"name": "node-2"},
{"name": "node-3"},
deployment.get_client.return_value.cluster.list_juju_users.return_value = [
{"username": "node-1", "token": "t"},
{"username": "node-2", "token": "t"},
{"username": "node-3", "token": "t"},
]
run_plan_obs.side_effect = [None, Exception("grant failed"), None]
feature = observability_feature.EmbeddedObservabilityFeature()
Expand Down
Loading