Merge lp:~silverdrake11/landscape-charm/update_ppa into lp:~mitchburton/landscape-charm/op-framework

[Kevin Nasto]

Updated ppa to point to stable

[lp:~silverdrake11/landscape-charm/update_ppa]

435. By Kevin Nasto on 2023-02-28

Added bootstrap account back in since it was missing, added landscape-hashids package

436. By Kevin Nasto on 2023-02-28

Added hashids to upgrade constant

[Mitch Burton (mitchburton)]

+1 LGTM. Tested with juju deployment locally.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2023-02-16 23:44:57 +0000
+++ config.yaml	2023-02-28 23:34:07 +0000
@@ -4,7 +4,7 @@
 options:
   landscape_ppa:
     type: string
-    default: "ppa:landscape/self-hosted-beta"
+    default: "ppa:landscape/self-hosted-23.03"
     description: The PPA from which Landscape Server will be installed.
   worker_counts:
     type: int

=== modified file 'src/charm.py'
--- src/charm.py	2023-02-16 23:44:57 +0000
+++ src/charm.py	2023-02-28 23:34:07 +0000
@@ -55,6 +55,7 @@
     "landscape-server",
     "landscape-client",
     "landscape-common",
+    "landscape-hashids"
 )
 
 DEFAULT_SERVICES = (
@@ -188,6 +189,8 @@
                 "package-upload": {"root-url": root_url},
             })
 
+        self._bootstrap_account()
+
         config_host = self.model.config.get("db_host")
         config_password = self.model.config.get("db_password")
         config_port = self.model.config.get("db_port")
@@ -221,11 +224,11 @@
         landscape_ppa = self.model.config["landscape_ppa"]
 
         try:
-            # Add the Landscape Server beta PPA and install via apt.
+            # Add the Landscape Server PPA and install via apt.
             check_call(["add-apt-repository", "-y", landscape_ppa])
-            apt.add_package("landscape-server")
+            apt.add_package(["landscape-server", "landscape-hashids"])
         except PackageNotFoundError:
-            logger.error("landscape-server package not found in package cache "
+            logger.error("Landscape package not found in package cache "
                          "or on system")
             self.unit.status = BlockedStatus("Failed to install packages")
             return

=== modified file 'src/settings_files.py'
--- src/settings_files.py	2023-02-03 20:24:46 +0000
+++ src/settings_files.py	2023-02-28 23:34:07 +0000
@@ -146,4 +146,4 @@
     if user:
         to_update["schema"]["store_user"] = user
     if to_update:
-        update_service_conf(to_update)
\ No newline at end of file
+        update_service_conf(to_update)

=== modified file 'tests/test_charm.py'
--- tests/test_charm.py	2023-02-16 23:44:57 +0000
+++ tests/test_charm.py	2023-02-28 23:34:07 +0000
@@ -73,7 +73,8 @@
 
         mocks["check_call"].assert_called_once_with(
             ["add-apt-repository", "-y", ppa])
-        mocks["apt"].add_package.assert_called_once_with("landscape-server")
+        mocks["apt"].add_package.assert_called_once_with(["landscape-server", 
+            "landscape-hashids"])
         status = harness.charm.unit.status
         self.assertIsInstance(status, WaitingStatus)
         self.assertEqual(status.message,