Merge ~silverdrake11/landscape-charm:hold_landscape_server into landscape-charm:main

[Kevin Nasto]

Holding package landscape-server unless upgrade action

[Kevin Nasto (silverdrake11)]

Manual testing instructions:

Update bundle.yaml landscape-server with 'landscape_ppa: ppa:landscape/self-hosted-23.03'. Note it must be under "options:"!
make build

ssh landscape-server/0
sudo apt-add-repository ppa:landscape/self-hosted-beta
sudo apt upgrade
Go to /about page and notice landscape server does not upgrade

juju run landscape-server/0 pause
juju run landscape-server/0 upgrade (landscape-server will upgrade)
juju run landscape-server/0 resume
Go to /about page and notice landscape server does upgrade

f7c631c... by Kevin Nasto on 2024-02-07

Slight changes. Also upgraded apt library

[Kevin Nasto (silverdrake11)]

Note this also includes an upgrade to the apt library, which was done by fetch-lib. Do not review this code

[Mitch Burton (mitchburton)]

Looks good. I haven't done a manual test, but I don't doubt the results of yours. Approved.

review: Approve

diff --git a/lib/charms/operator_libs_linux/v0/apt.py b/lib/charms/operator_libs_linux/v0/apt.py
index c3a2329..1400df7 100644
--- a/lib/charms/operator_libs_linux/v0/apt.py
+++ b/lib/charms/operator_libs_linux/v0/apt.py
@@ -122,7 +122,7 @@ LIBAPI = 0
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 12
+LIBPATCH = 13
 
 
 VALID_SOURCE_TYPES = ("deb", "deb-src")
@@ -250,10 +250,10 @@ class DebianPackage:
         try:
             env = os.environ.copy()
             env["DEBIAN_FRONTEND"] = "noninteractive"
-            subprocess.run(_cmd, capture_output=True, check=True, env=env)
+            subprocess.run(_cmd, capture_output=True, check=True, text=True, env=env)
         except CalledProcessError as e:
             raise PackageError(
-                "Could not {} package(s) [{}]: {}".format(command, [*package_names], e.output)
+                "Could not {} package(s) [{}]: {}".format(command, [*package_names], e.stderr)
             ) from None
 
     def _add(self) -> None:
@@ -476,7 +476,7 @@ class DebianPackage:
             )
         except CalledProcessError as e:
             raise PackageError(
-                "Could not list packages in apt-cache: {}".format(e.output)
+                "Could not list packages in apt-cache: {}".format(e.stderr)
             ) from None
 
         pkg_groups = output.strip().split("\n\n")
diff --git a/src/charm.py b/src/charm.py
index 3ef8671..569201f 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -70,8 +70,9 @@ SCHEMA_SCRIPT = "/usr/bin/landscape-schema"
 BOOTSTRAP_ACCOUNT_SCRIPT = "/opt/canonical/landscape/bootstrap-account"
 HASH_ID_DATABASES = "/opt/canonical/landscape/hash-id-databases-ignore-maintenance"
 
+LANDSCAPE_SERVER = "landscape-server"
 LANDSCAPE_PACKAGES = (
-    "landscape-server",
+    LANDSCAPE_SERVER,
     "landscape-client",
     "landscape-common",
 )
@@ -287,8 +288,8 @@ class LandscapeServerCharm(CharmBase):
             # Add the Landscape Server PPA and install via apt.
             check_call(["add-apt-repository", "-y", landscape_ppa])
             # Explicitly ensure cache is up-to-date after adding the PPA.
-            apt.add_package(["landscape-server", "landscape-hashids"], update_cache=True)
-            check_call(["apt-mark", "hold", "landscape-hashids"])
+            apt.add_package([LANDSCAPE_SERVER, "landscape-hashids"], update_cache=True)
+            check_call(["apt-mark", "hold", "landscape-hashids", LANDSCAPE_SERVER])
         except (PackageNotFoundError, PackageError, CalledProcessError) as exc:
             logger.error("Failed to install packages")
             raise exc  # This will trigger juju's exponential retry
@@ -1039,10 +1040,14 @@ command[check_{service}]=/usr/local/lib/nagios/plugins/check_systemd.py {service
         for package in LANDSCAPE_PACKAGES:
             try:
                 event.log(f"Upgrading {package}...")
+                if package == LANDSCAPE_SERVER:
+                    check_call(["apt-mark", "unhold", LANDSCAPE_SERVER])
                 pkg = apt.DebianPackage.from_apt_cache(package)
                 pkg.ensure(state=apt.PackageState.Latest)
                 installed = apt.DebianPackage.from_installed_package(package)
                 event.log(f"Upgraded to {installed.version}...")
+                if package == LANDSCAPE_SERVER:
+                    check_call(["apt-mark", "hold", LANDSCAPE_SERVER])
             except PackageNotFoundError as e:
                 logger.error(
                     f"Could not upgrade package {package}. Reason: {e.message}"