Skip to content

fix: secret-info-get cannot be provided with both an ID and a label #2170

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
tonyandrewmeyer merged 5 commits into from
Nov 16, 2025
Merged

fix: secret-info-get cannot be provided with both an ID and a label #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b28108
fix: don't pass id and secret in secret-info-get.
tonyandrewmeyer Nov 14, 2025
ce91f1e
Add test.
tonyandrewmeyer Nov 14, 2025
de7980e
The behaviour should be preserved in model, not hookcmds.
tonyandrewmeyer Nov 14, 2025
8764b53
Merge remote-tracking branch 'origin/main' into fix-secret-info-get-n…
tonyandrewmeyer Nov 16, 2025
bd8a520
Apply suggestions from review.
tonyandrewmeyer Nov 16, 2025
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
16 changes: 8 additions & 8 deletions ops/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3948,14 +3948,14 @@ def secret_get(
)

def secret_info_get(self, *, id: str | None = None, label: str | None = None) -> SecretInfo:
# The type: ignore here is because the type checker can't tell, even
# with local overloads, that either id or label must be provided.
with self._wrap_hookcmd('secret-info-get', id=id, label=label):
raw = hookcmds.secret_info_get( # type: ignore
id=id,
label=label,
)
assert isinstance(raw, hookcmds.SecretInfo)
if id is not None:
with self._wrap_hookcmd('secret-info-get', id=id):
raw = hookcmds.secret_info_get(id=id)
elif label is not None: # elif because Juju secret-info-get doesn't allow id and label
with self._wrap_hookcmd('secret-info-get', label=label):
raw = hookcmds.secret_info_get(label=label)
else:
raise TypeError('either `id` or `label` must be provided')
return SecretInfo(
raw.id,
label=raw.label,
Expand Down
8 changes: 1 addition & 7 deletions test/test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3919,13 +3919,7 @@ def test_get_info(self, model: ops.Model, fake_script: FakeScript):
assert fake_script.calls(clear=True) == [
['secret-info-get', '--format=json', f'secret://{model._backend.model_uuid}/x'],
['secret-info-get', '--format=json', '--label', 'y'],
[
'secret-info-get',
'--format=json',
f'secret://{model._backend.model_uuid}/x',
'--label',
'y',
],
['secret-info-get', '--format=json', f'secret://{model._backend.model_uuid}/x'],
]

def test_set_content(self, model: ops.Model, fake_script: FakeScript):
Expand Down