Merge ~mitchburton/landscape-charm:main into landscape-charm:main

[Mitch Burton]

update operator-libs-linux lib to latest; fix test

This change should alleviate "random" hanging apt-get processes. See https://github.com/canonical/operator-libs-linux/pull/114 for full explanation of the change.

To test:

charmcraft pack
juju deploy ./landscape-server_ubuntu-22.04-amd64-arm64_ubuntu-20.04-amd64-arm64.charm

installation time varies, so just be patient and everything should install just fine.

Also fixes a test broken by the last change.

[Mitch Burton (mitchburton)]

Doing this downstream to get it done ahead of this PR merging upstream: https://github.com/canonical/operator-libs-linux/pull/114

Disregard above: it's been merged upstream. This MR has been changed to pull the latest lib version.

[Spencer Runde (spencerrunde)]

LGTM - install went as expected.

review: Approve

[Spencer Runde (spencerrunde)]

Updated version that pulls in upstream looks good

review: Approve

diff --git a/lib/charms/operator_libs_linux/v0/apt.py b/lib/charms/operator_libs_linux/v0/apt.py
index 7afb183..c3a2329 100644
--- a/lib/charms/operator_libs_linux/v0/apt.py
+++ b/lib/charms/operator_libs_linux/v0/apt.py
@@ -108,7 +108,7 @@ import re
 import subprocess
 from collections.abc import Mapping
 from enum import Enum
-from subprocess import PIPE, CalledProcessError, check_call, check_output
+from subprocess import PIPE, CalledProcessError, check_output
 from typing import Iterable, List, Optional, Tuple, Union
 from urllib.parse import urlparse
 
@@ -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 = 11
+LIBPATCH = 12
 
 
 VALID_SOURCE_TYPES = ("deb", "deb-src")
@@ -250,7 +250,7 @@ class DebianPackage:
         try:
             env = os.environ.copy()
             env["DEBIAN_FRONTEND"] = "noninteractive"
-            check_call(_cmd, env=env, stderr=PIPE, stdout=PIPE)
+            subprocess.run(_cmd, capture_output=True, check=True, env=env)
         except CalledProcessError as e:
             raise PackageError(
                 "Could not {} package(s) [{}]: {}".format(command, [*package_names], e.output)
@@ -748,7 +748,7 @@ def add_package(
 
     packages = {"success": [], "retry": [], "failed": []}
 
-    package_names = [package_names] if type(package_names) is str else package_names
+    package_names = [package_names] if isinstance(package_names, str) else package_names
     if not package_names:
         raise TypeError("Expected at least one package name to add, received zero!")
 
@@ -818,7 +818,7 @@ def remove_package(
     """
     packages = []
 
-    package_names = [package_names] if type(package_names) is str else package_names
+    package_names = [package_names] if isinstance(package_names, str) else package_names
     if not package_names:
         raise TypeError("Expected at least one package name to add, received zero!")
 
@@ -837,7 +837,7 @@ def remove_package(
 
 def update() -> None:
     """Update the apt cache via `apt-get update`."""
-    check_call(["apt-get", "update"], stderr=PIPE, stdout=PIPE)
+    subprocess.run(["apt-get", "update"], capture_output=True, check=True)
 
 
 def import_key(key: str) -> str:
diff --git a/lib/charms/operator_libs_linux/v0/passwd.py b/lib/charms/operator_libs_linux/v0/passwd.py
index b692e70..ed5a058 100644
--- a/lib/charms/operator_libs_linux/v0/passwd.py
+++ b/lib/charms/operator_libs_linux/v0/passwd.py
@@ -45,7 +45,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 = 3
+LIBPATCH = 4
 
 
 def user_exists(user: Union[str, int]) -> Optional[pwd.struct_passwd]:
@@ -99,6 +99,7 @@ def add_user(
     secondary_groups: List[str] = None,
     uid: int = None,
     home_dir: str = None,
+    create_home: bool = True,
 ) -> str:
     """Add a user to the system.
 
@@ -113,6 +114,7 @@ def add_user(
         secondary_groups: Optional list of additional groups
         uid: UID for user being created
         home_dir: Home directory for user
+        create_home: Force home directory creation
 
     Returns:
         The password database entry struct, as returned by `pwd.getpwnam`
@@ -135,7 +137,9 @@ def add_user(
     if home_dir:
         cmd.extend(["--home", str(home_dir)])
     if password:
-        cmd.extend(["--password", password, "--create-home"])
+        cmd.extend(["--password", password])
+    if create_home:
+        cmd.append("--create-home")
     if system_user or password is None:
         cmd.append("--system")
 
diff --git a/tests/test_charm.py b/tests/test_charm.py
index d904212..785d011 100644
--- a/tests/test_charm.py
+++ b/tests/test_charm.py
@@ -75,8 +75,9 @@ class TestCharm(unittest.TestCase):
             ["add-apt-repository", "-y", ppa])
         mocks["check_call"].assert_any_call(
             ["apt-mark", "hold", "landscape-hashids"])
-        mocks["apt"].add_package.assert_called_once_with(["landscape-server", 
-            "landscape-hashids"])
+        mocks["apt"].add_package.assert_called_once_with(
+            ["landscape-server", "landscape-hashids"], update_cache=True,
+        )
         status = harness.charm.unit.status
         self.assertIsInstance(status, WaitingStatus)
         self.assertEqual(status.message,