api: fix unattended-upgrades for pkg not installed #2810
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
CalvoM
reviewed
Oct 25, 2023
| @@ -145,6 +155,21 @@ def status() -> UnattendedUpgradesStatusResult: | |||
|
|
|||
|
|
|||
| def _status(cfg: UAConfig) -> UnattendedUpgradesStatusResult: | |||
| if not apt.is_installed("unattended-upgrades"): | |||
| return UnattendedUpgradesStatusResult( | |||
There was a problem hiding this comment.
Not sure how viable it is or maybe it is the expected behaviour, will this have the return code != 0 after it is run on the cli?
There was a problem hiding this comment.
No, it won't @CalvoM and I guess we don't want it to return non-zero, because it is not an error per se
lucasmoura
force-pushed
the
fix-unattended-upgrades-endpoint
branch
from
76e05fc
to
76730ef
Compare
lucasmoura
force-pushed
the
fix-unattended-upgrades-endpoint
branch
from
76730ef
to
a10bffe
Compare
orndorffgrant
approved these changes
Oct 25, 2023
uaclient/messages/__init__.py
Outdated
Comment on lines
1853
to
1856
| UNATTENDED_UPGRADES_UNINSTALLED = NamedMessage( | ||
| "unattended-upgrades-uninstalled", | ||
| "unattended-upgrades packages is not installed", | ||
| ) |
There was a problem hiding this comment.
Sorry I missed this initially
Suggested change
| UNATTENDED_UPGRADES_UNINSTALLED = NamedMessage( | |
| "unattended-upgrades-uninstalled", | |
| "unattended-upgrades packages is not installed", | |
| ) | |
| UNATTENDED_UPGRADES_UNINSTALLED = NamedMessage( | |
| "unattended-upgrades-uninstalled", | |
| t.gettext("unattended-upgrades packages is not installed"), | |
| ) |
lucasmoura
force-pushed
the
fix-unattended-upgrades-endpoint
branch
2 times, most recently
from
7a15fda
to
3b51bf0
Compare
When unattended-upgrades is uninstalled in the machine, we display an error on the api endpoint that doesn't directly tell the user that the package is not installed. We are updating the logic to properly tell the user that the package is not installed. Fixes: #2807
lucasmoura
force-pushed
the
fix-unattended-upgrades-endpoint
branch
from
3b51bf0
to
2347f2f
Compare
renanrodrigo
approved these changes
Oct 27, 2023
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.
Why is this needed?
When unattended-upgrades is uninstalled in the machine, we display an error on the api endpoint that doesn't directly tell the user that the package is not installed. We are updating the logic to properly tell the user that the package is not installed.
Fixes: #2807
Test Steps
Run the modified integration test
Checklist
Does this PR require extra reviews?