chore: merge branch 'origin/main' into release-merge/4.2.3

.github/workflows/tests.yaml

@@ -60,10 +60,6 @@ jobs:
             3.10
             3.12
           cache: 'pip'
-      - name: Setup LXD
-        uses: canonical/setup-lxd@v0.1.1
-        with:
-          channel: latest/stable
       - name: Configure environment
         run: |
           echo "::group::apt-get"
@@ -111,10 +107,12 @@ jobs:
           cache: 'pip'
       - name: Setup LXD
         uses: canonical/setup-lxd@v0.1.1
-        with:
-          channel: latest/stable
       - name: Configure environment
         run: |
+          echo "::group::Begin snap install"
+          echo "Installing snaps in the background while running apt and pip..."
+          sudo snap install --no-wait --channel=beta fetch-service
+          echo "::endgroup::"
           echo "::group::apt-get"
           sudo apt update
           sudo apt-get install -y libapt-pkg-dev
@@ -123,6 +121,9 @@ jobs:
           python -m pip install tox
           echo "::endgroup::"
           mkdir -p results
+          echo "::group::Wait for snap to complete"
+          snap watch --last=install
+          echo "::endgroup::"
       - name: Setup Tox environments
         run: tox run -e integration-${{ matrix.python }} --notest
       - name: Integration tests

craft_application/application.py

@@ -156,6 +156,9 @@ def __init__(
         else:
             self._work_dir = pathlib.Path.cwd()
 
+        # Whether the command execution should use the fetch-service
+        self._use_fetch_service = False
+
     @property
     def app_config(self) -> dict[str, Any]:
         """Get the configuration passed to dispatcher.load_command().
@@ -368,8 +371,14 @@ def run_managed(self, platform: str | None, build_for: str | None) -> None:
             instance_path = pathlib.PosixPath("/root/project")
 
             with self.services.provider.instance(
-                build_info, work_dir=self._work_dir
+                build_info,
+                work_dir=self._work_dir,
+                clean_existing=self._use_fetch_service,
             ) as instance:
+                if self._use_fetch_service:
+                    session_env = self.services.fetch.create_session(instance)
+                    env.update(session_env)
+
                 cmd = [self.app.name, *sys.argv[1:]]
                 craft_cli.emit.debug(
                     f"Executing {cmd} in instance location {instance_path} with {extra_args}."
@@ -387,6 +396,12 @@ def run_managed(self, platform: str | None, build_for: str | None) -> None:
                     raise craft_providers.ProviderError(
                         f"Failed to execute {self.app.name} in instance."
                     ) from exc
+                finally:
+                    if self._use_fetch_service:
+                        self.services.fetch.teardown_session()
+
+        if self._use_fetch_service:
+            self.services.fetch.shutdown(force=True)
 
     def configure(self, global_args: dict[str, Any]) -> None:
         """Configure the application using any global arguments."""
@@ -482,12 +497,14 @@ def _pre_run(self, dispatcher: craft_cli.Dispatcher) -> None:
         At the time this is run, the command is loaded in the dispatcher, but
         the project has not yet been loaded.
         """
+        args = dispatcher.parsed_args()
+
         # Some commands might have a project_dir parameter. Those commands and
         # only those commands should get a project directory, but only when
         # not managed.
         if self.is_managed():
             self.project_dir = pathlib.Path("/root/project")
-        elif project_dir := getattr(dispatcher.parsed_args(), "project_dir", None):
+        elif project_dir := getattr(args, "project_dir", None):
             self.project_dir = pathlib.Path(project_dir).expanduser().resolve()
             if self.project_dir.exists() and not self.project_dir.is_dir():
                 raise errors.ProjectFileMissingError(
@@ -496,6 +513,8 @@ def _pre_run(self, dispatcher: craft_cli.Dispatcher) -> None:
                     resolution="Ensure the path entered is correct.",
                 )
 
+        self._use_fetch_service = getattr(args, "use_fetch_service", False)
+
     def get_arg_or_config(
         self, parsed_args: argparse.Namespace, item: str
     ) -> Any:  # noqa: ANN401

craft_application/commands/lifecycle.py

@@ -355,6 +355,12 @@ def _fill_parser(self, parser: argparse.ArgumentParser) -> None:
             help="Output directory for created packages.",
         )
 
+        parser.add_argument(
+            "--use-fetch-service",
+            action="store_true",
+            help="Use the Fetch Service to inspect downloaded assets.",
+        )
+
     @override
     def _run(
         self,

craft_application/errors.py

@@ -242,3 +242,7 @@ def __init__(  # (too many arguments)
             reportable=reportable,
             retcode=retcode,
         )
+
+
+class FetchServiceError(CraftError):
+    """Errors related to the fetch-service."""