wasm-cli 1.6.1__tar.gz → 1.6.2__tar.gz

{wasm_cli-1.6.1/src/wasm_cli.egg-info → wasm_cli-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.6.1
+Version: 1.6.2
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wasm-cli"
-version = "1.6.1"
+version = "1.6.2"
 description = "Web App System Management - Deploy and manage web applications on Linux servers"
 readme = "README.md"
 license = { text = "WASM-NCSAL" }

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="1.6.1",
+    version="1.6.2",
     description="Web App System Management - Deploy and manage web applications on Linux servers",
     author="Yago López Prado",
     author_email="yago.lopez.adeje@gmail.com",

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/src/wasm/__init__.py

@@ -15,7 +15,7 @@ from importlib.metadata import version as _installed_version
 #: as an OBS build directory. The single source of truth is the ``version``
 #: field of pyproject.toml; ``scripts/release.py`` keeps this literal and the
 #: distribution packaging files in step with it.
-_FALLBACK_VERSION = "1.6.1"
+_FALLBACK_VERSION = "1.6.2"
 
 try:
     __version__ = _installed_version("wasm-cli")

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/src/wasm/cli/commands/webapp.py

@@ -833,15 +833,10 @@ def _update_monorepo(
     deployer.domain = domain
     deployer.package_manager = "pnpm"
 
-    logger.step(4, total_steps, "Installing dependencies")
-    deployer._install_dependencies()
-
-    logger.step(5, total_steps, "Running database migrations")
-    deployer._run_prisma_migrations()
-
-    logger.step(6, total_steps, "Building applications")
-    deployer._set_permissions()
-    deployer._build_all()
+    # The deployer's own update, not a copy of its steps: the copy handed the
+    # tree over before building and left every build output owned by root.
+    step = iter(range(4, total_steps + 1))
+    deployer.update(on_step=lambda message: logger.step(next(step), total_steps, message))
 
     logger.step(7, total_steps, "Restarting applications")
     service_manager = ServiceManager(verbose=logger.verbose)

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/src/wasm/deployers/base.py

@@ -1348,6 +1348,12 @@ class BaseDeployer(AppDeployer):
             report("Building")
             self.build()
 
+            # The pull, the install and the build all ran as root, and the
+            # service writes into what they produced: Next.js creates
+            # .next/cache/images on the first optimised image, and uploads land
+            # in directories a pull may have just added.
+            self._set_permissions()
+
             start_command = self.get_start_command()
             result = UpdateResult(
                 package_manager=self.package_manager,

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/src/wasm/deployers/helpers/permissions.py

@@ -56,15 +56,25 @@ def hand_over_tree(
         ["chown", "-R", f"{user}:{group}", str(app_path)],
         timeout=_PERMISSIONS_TIMEOUT,
     )
+    # Not fatal: the build is good, and an app that never writes runs fine. One
+    # that does fails with EACCES in its own log, far from here, so this is the
+    # only place the operator can be told the cause.
     if not result.success:
-        logger.debug(f"chown failed: {result.stderr}")
+        logger.warning(
+            f"Could not hand {app_path} over to {user}:{group}; the service may fail "
+            f"with EACCES: {result.stderr.strip()}"
+        )
 
     # Directories need the execute bit and the built assets must stay readable
     # by the web server, whatever umask the fetch and the build left behind.
-    runner.run(
+    result = runner.run(
         ["chmod", "-R", "u+rwX,g+rX,o+rX", str(app_path)],
         timeout=_PERMISSIONS_TIMEOUT,
     )
+    if not result.success:
+        logger.warning(
+            f"Could not make {app_path} readable by the web server: {result.stderr.strip()}"
+        )
 
     # That -R also put o+r on the .env files, which hold the secrets this
     # deployment was given. The chown above has just made the service account

{wasm_cli-1.6.1 → wasm_cli-1.6.2}/src/wasm/deployers/monorepo.py

@@ -416,9 +416,6 @@ class MonorepoDeployer(AppDeployer):
             self.logger.step(5, total_steps, "Installing dependencies", Icons.PACKAGE)
             self._install_dependencies()
 
-            # Set permissions for service user
-            self._set_permissions()
-
             # Step 6: Prisma migrations
             self.logger.step(6, total_steps, "Running database migrations", Icons.DATABASE)
             self._run_prisma_migrations()
@@ -427,6 +424,10 @@ class MonorepoDeployer(AppDeployer):
             self.logger.step(7, total_steps, "Building applications", Icons.BUILD)
             self._build_all()
 
+            # Only now: the build runs as root too, and handing over before it
+            # left every workspace's build output unwritable by its service.
+            self._set_permissions()
+
             # Step 8: Create sites (without SSL initially)
             self.logger.step(8, total_steps, "Creating site configurations", Icons.GLOBE)
             self._create_sites(with_ssl=False)
@@ -534,8 +535,8 @@ class MonorepoDeployer(AppDeployer):
         prisma_updated = self._run_prisma_migrations()
 
         report("Building applications")
-        self._set_permissions()
         self._build_all()
+        self._set_permissions()
 
         return UpdateResult(
             package_manager=self.package_manager,

{wasm_cli-1.6.1 → wasm_cli-1.6.2/src/wasm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.6.1
+Version: 1.6.2
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>