Merge pull request #28 from canonical/install-socat

Install socat on install hook

Author: lvoytek

src/charm.py

@@ -405,6 +405,12 @@ def _on_install(self, _: ops.InstallEvent) -> None:
             self.unit.status = ops.BlockedStatus("Failed to install sqlite3.")
             return
 
+        self.unit.status = ops.MaintenanceStatus("Installing socat.")
+
+        if not pkgs.socat_install():
+            self.unit.status = ops.BlockedStatus("Failed to install socat.")
+            return
+
         self.unit.status = ops.MaintenanceStatus("Setting up git-ubuntu user.")
         usr.setup_git_ubuntu_user(GIT_UBUNTU_SYSTEM_USER_USERNAME, GIT_UBUNTU_USER_HOME_DIR)
 

src/package_installation.py

@@ -48,6 +48,23 @@ def sqlite3_install() -> bool:
     return True
 
 
+def socat_install() -> bool:
+    """Install socat from apt.
+
+    Returns:
+        True if socat install succeeded, False otherwise.
+    """
+    try:
+        apt.update()
+        apt.add_package("socat")
+        logger.info("Installed socat package.")
+    except apt.PackageError as e:
+        logger.error("Failed to install socat from apt: %s", e)
+        return False
+
+    return True
+
+
 def git_ubuntu_snap_refresh(channel: str) -> bool:
     """Install or refresh the git-ubuntu snap with the given channel version.
 

tests/unit/test_charm.py

@@ -49,7 +49,7 @@ def test_install_success(
     assert out.unit_status == ActiveStatus("Install complete.")
 
     mock_apt_update.assert_called()
-    mock_add_package.assert_has_calls([call("git"), call("sqlite3")])
+    mock_add_package.assert_has_calls([call("git"), call("sqlite3"), call("socat")])
     mock_setup_git_ubuntu_user.assert_called_once_with("git-ubuntu", "/var/local/git-ubuntu")
     mock_setup_git_ubuntu_user_services_dir.assert_called_once_with(
         "git-ubuntu", "/var/local/git-ubuntu"