Skip to content
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

Jump to bottom

Update snap charm library #140

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Update snap charm library #140

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e43fd43
Update snap charm library
addyess Aug 9, 2024
533d0d1
Merge branch 'main' into akd/update-charm-libs
addyess Aug 13, 2024
f1ee753
Merge branch 'main' into akd/update-charm-libs
addyess Aug 30, 2024
39be058
Merge branch 'main' into akd/update-charm-libs
addyess Aug 30, 2024
5442726
Merge branch 'main' into akd/update-charm-libs
addyess Aug 30, 2024
8784941
Merge branch 'main' into akd/update-charm-libs
addyess Sep 20, 2024
cbb28fe
Merge branch 'main' into akd/update-charm-libs
addyess Sep 20, 2024
c3f9be2
Merge branch 'main' into akd/update-charm-libs
addyess Sep 26, 2024
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
14 changes: 10 additions & 4 deletions charms/worker/k8s/lib/charms/operator_libs_linux/v2/snap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 5
LIBPATCH = 7


# Regex to locate 7-bit C1 ANSI sequences
Expand Down Expand Up @@ -319,7 +319,10 @@ def get(self, key: Optional[str], *, typed: bool = False) -> Any:
Default is to return a string.
"""
if typed:
config = json.loads(self._snap("get", ["-d", key]))
args = ["-d"]
if key:
args.append(key)
config = json.loads(self._snap("get", args))
if key:
return config.get(key)
return config
Expand Down Expand Up @@ -584,13 +587,16 @@ def ensure(
"Installing snap %s, revision %s, tracking %s", self._name, revision, channel
)
self._install(channel, cohort, revision)
else:
logger.info("The snap installation completed successfully")
elif revision is None or revision != self._revision:
# The snap is installed, but we are changing it (e.g., switching channels).
logger.info(
"Refreshing snap %s, revision %s, tracking %s", self._name, revision, channel
)
self._refresh(channel=channel, cohort=cohort, revision=revision, devmode=devmode)
logger.info("The snap installation completed successfully")
logger.info("The snap refresh completed successfully")
else:
logger.info("Refresh of snap %s was unnecessary", self._name)

self._update_snap_apps()
self._state = state
Expand Down
Loading