remove chisel part from Rockcraft's snap

docs/how-to/code/create-slice/task.yaml

@@ -24,7 +24,7 @@ execute: |
 
   cp openssl.yaml "${local_release}/slices"
 
-  snap install chisel --channel=latest/candidate
+  snap install chisel
 
   chisel cut --release "${local_release}" --root "${local_root}" openssl_bins
 

docs/how-to/code/install-slice/rockcraft.yaml

@@ -14,5 +14,8 @@ parts:
         plugin: nil
         source: chisel-releases/
         source-type: local
-        override-build:
+        build-snaps: 
+            - "chisel/latest/stable"
+        override-build: |
+            craftctl default
             chisel cut --release ./ --root ${CRAFT_PART_INSTALL} openssl_bins

docs/how-to/code/install-slice/task.yaml

@@ -19,7 +19,7 @@ execute: |
   git clone -b ubuntu-22.04 https://github.com/canonical/chisel-releases/
   # [docs:clone-chisel-releases-end]
 
-  sudo snap install chisel --channel=latest/candidate
+  sudo snap install chisel
 
   # [docs:slice-exists]
   chisel find --release=./chisel-releases/ openssl_bins

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "craft-application>=4.0.0",
     "craft-archives>=2.0.0",
     "craft-cli",
-    "craft-parts>=2.1.2,!=2.1.3",
+    "craft-parts>=2.1.3",
     "craft-platforms~=0.3",
     "craft-providers>=2.0.4",
     "overrides",

requirements-dev.txt

@@ -74,7 +74,7 @@ craft-cli==2.10.1
     #   rockcraft (pyproject.toml)
 craft-grammar==2.0.1
     # via craft-application
-craft-parts==2.1.2
+craft-parts==2.1.3
     # via
     #   craft-application
     #   rockcraft (pyproject.toml)

requirements-doc.txt

@@ -62,7 +62,7 @@ craft-cli==2.10.1
     #   rockcraft (pyproject.toml)
 craft-grammar==2.0.1
     # via craft-application
-craft-parts==2.1.2
+craft-parts==2.1.3
     # via
     #   craft-application
     #   rockcraft (pyproject.toml)

requirements.txt

@@ -30,7 +30,7 @@ craft-cli==2.10.1
     #   rockcraft (pyproject.toml)
 craft-grammar==2.0.1
     # via craft-application
-craft-parts==2.1.2
+craft-parts==2.1.3
     # via
     #   craft-application
     #   rockcraft (pyproject.toml)

rockcraft/extensions/_utils.py

@@ -54,7 +54,7 @@ def _apply_extension(
     extension: Extension,
 ) -> None:
     # Apply the root components of the extension (if any)
-    root_extension = extension.get_root_snippet()
+    root_extension = extension.get_root_snippet_extended()
     for property_name, property_value in root_extension.items():
         yaml_data[property_name] = _apply_extension_property(
             yaml_data.get(property_name), property_value

rockcraft/extensions/extension.py

@@ -70,6 +70,42 @@ def get_part_snippet(self) -> dict[str, Any]:
     def get_parts_snippet(self) -> dict[str, Any]:
         """Return the parts to add to parts."""
 
+    @final
+    def is_chisel_installed(self) -> bool:
+        """Determine whether chisel is installed in any part."""
+        has_chisel = False
+        parts = self.get_root_snippet().get("parts", {})
+
+        for data in parts.values():
+            if any(
+                s
+                for s in data.get("build-snaps", [])
+                if s == "chisel" or s.startswith("chisel/")
+            ):
+                has_chisel = True
+                break
+
+        if not has_chisel:
+            return False
+        return True
+
+    @final
+    def get_root_snippet_extended(self) -> dict[str, Any]:
+        """Inject chisel as build-snap if needed."""
+        root_snippet = self.get_root_snippet()
+        if not self.is_chisel_installed():
+            for part, data in root_snippet.get("parts", {}).items():
+                if any("_" in p for p in data.get("stage-packages", [])):
+                    if root_snippet["parts"][part].get("build-snaps"):
+                        root_snippet["parts"][part]["build-snaps"].append(
+                            "chisel/latest/stable"
+                        )
+                    else:
+                        root_snippet["parts"][part]["build-snaps"] = [
+                            "chisel/latest/stable"
+                        ]
+        return root_snippet
+
     @final
     def validate(self, extension_name: str) -> None:
         """Validate that the extension can be used with the current project.

snap/snapcraft.yaml

@@ -160,12 +160,3 @@ parts:
         - libbtrfs-dev
         - libdevmapper-dev
         - pkg-config
-
-  chisel:
-    plugin: nil
-    stage-snaps:
-      - chisel/latest/candidate
-    organize: 
-      bin/chisel: libexec/rockcraft/chisel
-    stage:
-      - libexec/rockcraft/chisel

tests/unit/extensions/test_fastapi.py

@@ -67,6 +67,7 @@ def test_fastapi_extension_default(tmp_path, fastapi_input_yaml, packages):
             "fastapi-framework/runtime": {
                 "plugin": "nil",
                 "stage-packages": ["ca-certificates_data"],
+                "build-snaps": ["chisel/latest/stable"],
             },
         },
         "services": {
@@ -219,11 +220,13 @@ def test_fastapi_extension_bare(tmp_path):
         "source": ".",
         "python-packages": ["uvicorn"],
         "python-requirements": ["requirements.txt"],
+        "build-snaps": ["chisel/latest/stable"],
     }
     assert applied["parts"]["fastapi-framework/runtime"] == {
         "plugin": "nil",
         "override-build": "mkdir -m 777 ${CRAFT_PART_INSTALL}/tmp",
         "stage-packages": ["bash_bins", "coreutils_bins", "ca-certificates_data"],
+        "build-snaps": ["chisel/latest/stable"],
     }
 
 

tests/unit/extensions/test_go.py

@@ -62,6 +62,7 @@ def test_go_extension_default(tmp_path, go_input_yaml):
                 "stage-packages": [
                     "ca-certificates_data",
                 ],
+                "build-snaps": ["chisel/latest/stable"],
             },
         },
         "services": {

tests/unit/extensions/test_gunicorn.py

@@ -93,6 +93,7 @@ def test_flask_extension_default(tmp_path, flask_input_yaml, packages):
             "flask-framework/runtime": {
                 "plugin": "nil",
                 "stage-packages": ["ca-certificates_data"],
+                "build-snaps": ["chisel/latest/stable"],
             },
             "flask-framework/statsd-exporter": {
                 "build-snaps": ["go"],
@@ -297,6 +298,7 @@ def test_flask_extension_bare(tmp_path):
         "plugin": "nil",
         "override-build": "mkdir -m 777 ${CRAFT_PART_INSTALL}/tmp",
         "stage-packages": ["bash_bins", "coreutils_bins", "ca-certificates_data"],
+        "build-snaps": ["chisel/latest/stable"],
     }
     assert applied["parts"]["flask-framework/dependencies"] == {
         "plugin": "python",
@@ -305,6 +307,7 @@ def test_flask_extension_bare(tmp_path):
         "source": ".",
         "stage-packages": ["python3.10-venv_ensurepip"],
         "build-environment": [{"PARTS_PYTHON_INTERPRETER": "python3.10"}],
+        "build-snaps": ["chisel/latest/stable"],
     }
 
 
@@ -485,6 +488,7 @@ def test_django_extension_default(tmp_path, django_input_yaml):
             "django-framework/runtime": {
                 "plugin": "nil",
                 "stage-packages": ["ca-certificates_data"],
+                "build-snaps": ["chisel/latest/stable"],
             },
             "django-framework/statsd-exporter": {
                 "build-snaps": ["go"],