fix(platform): vectorise platform architectures

Fixes #1874
canonical · Sep 5, 2024 · 3936d94 · 3936d94
1 parent a98a8b4
commit 3936d94
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 14 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ dynamic = ["version"]
 description = "The main tool to build, upload, and develop in general the Juju charms."
 readme = "README.md"
 dependencies = [
-    "craft-application~=4.1",
+    "craft-application~=4.1.2",
     "craft-cli>=2.3.0",
     "craft-grammar>=2.0.0",
     "craft-parts>=2.0.0",

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,7 +6,7 @@ certifi==2024.7.4
 cffi==1.17.0
 charset-normalizer==3.3.2
 coverage==7.6.1
-craft-application==4.1.0
+craft-application==4.1.2
 craft-archives==2.0.0
 craft-cli==2.6.0
 craft-grammar==2.0.0

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ boolean-py==4.0
 certifi==2024.7.4
 cffi==1.17.0
 charset-normalizer==3.3.2
-craft-application==4.1.0
+craft-application==4.1.2
 craft-archives==2.0.0
 craft-cli==2.6.0
 craft-grammar==2.0.0

diff --git a/tests/unit/models/test_project.py b/tests/unit/models/test_project.py
@@ -92,6 +92,23 @@
         channel: "22.04"
         architectures: [arm64]
 """
+MINIMAL_CHARMCRAFT_DICT = {
+    "type": "charm",
+    "bases": [
+        {
+            "build-on": [
+                {
+                    "name": "ubuntu",
+                    "channel": "22.04",
+                    "architectures": [util.get_host_architecture()],
+                },
+            ],
+            "run-on": [
+                {"name": "ubuntu", "channel": "22.04", "architectures": ["arm64"]},
+            ],
+        }
+    ],
+}
 SIMPLE_METADATA_YAML = "{name: charmy-mccharmface, summary: Charmy!, description: Very charming!}"
 SIMPLE_CHARMCRAFT_YAML = f"""\
 type: charm
@@ -108,12 +125,56 @@
         channel: "22.04"
         architectures: [arm64]
 """
+SIMPLE_CHARMCRAFT_DICT = MINIMAL_CHARMCRAFT_DICT | {
+    "name": "charmy-mccharmface",
+    "summary": "Charmy!",
+    "description": "Very charming!",
+}
 SIMPLE_CONFIG_YAML = "options: {admin: {default: root, description: Admin user, type: string}}"
 SIMPLE_CONFIG_DICT = {
     "options": {"admin": {"type": "string", "default": "root", "description": "Admin user"}}
 }
 SIMPLE_ACTIONS_YAML = "snooze: {description: Take a little nap.}"
 SIMPLE_ACTIONS_DICT = {"snooze": {"description": "Take a little nap."}}
+CHARMCRAFT_YAML_NON_VECTORISED_PLATFORMS = """\
+type: charm
+name: test-1874-regression
+summary: Regression test for #1874
+description: A charm for regression testing https://github.com/canonical/charmcraft/issues/1874
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - config.yaml
+      - copyright
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+base: ubuntu@24.04
+platforms:
+ amd64:
+   build-on: amd64
+   build-for: amd64
+ arm64:
+   build-on: arm64
+   build-for: arm64
+ ppc64el:
+   build-on: ppc64el
+   build-for: ppc64el
+ s390x:
+   build-on: s390x
+   build-for: s390x
+"""
 
 
 # region CharmPlatform tests
@@ -575,43 +636,44 @@ def test_unmarshal_invalid_type(type_):
         "metadata_yaml",
         "config_yaml",
         "actions_yaml",
-        "expected_diff",
+        "expected_dict",
     ),
     [
         (
             SIMPLE_CHARMCRAFT_YAML,
             None,
             None,
             None,
-            {"parts": BASIC_CHARM_PARTS},
+            SIMPLE_CHARMCRAFT_DICT | {"parts": BASIC_CHARM_PARTS},
         ),
         (
             MINIMAL_CHARMCRAFT_YAML,
             SIMPLE_METADATA_YAML,
             None,
             None,
-            {"parts": BASIC_CHARM_PARTS},
+            SIMPLE_CHARMCRAFT_DICT | {"parts": BASIC_CHARM_PARTS},
         ),
         (
             SIMPLE_CHARMCRAFT_YAML,
             None,
             SIMPLE_CONFIG_YAML,
             None,
-            {"config": SIMPLE_CONFIG_DICT, "parts": BASIC_CHARM_PARTS},
+            SIMPLE_CHARMCRAFT_DICT | {"config": SIMPLE_CONFIG_DICT, "parts": BASIC_CHARM_PARTS},
         ),
         (
             SIMPLE_CHARMCRAFT_YAML,
             None,
             None,
             SIMPLE_ACTIONS_YAML,
-            {"actions": SIMPLE_ACTIONS_DICT, "parts": BASIC_CHARM_PARTS},
+            SIMPLE_CHARMCRAFT_DICT | {"actions": SIMPLE_ACTIONS_DICT, "parts": BASIC_CHARM_PARTS},
         ),
         (
             MINIMAL_CHARMCRAFT_YAML,
             SIMPLE_METADATA_YAML,
             SIMPLE_CONFIG_YAML,
             SIMPLE_ACTIONS_YAML,
-            {
+            SIMPLE_CHARMCRAFT_DICT
+            | {
                 "actions": SIMPLE_ACTIONS_DICT,
                 "config": SIMPLE_CONFIG_DICT,
                 "parts": BASIC_CHARM_PARTS,
@@ -630,7 +692,8 @@ def test_unmarshal_invalid_type(type_):
             None,
             None,
             None,
-            {
+            SIMPLE_CHARMCRAFT_DICT
+            | {
                 "parts": {
                     "charm": {
                         "plugin": "charm",
@@ -647,6 +710,46 @@ def test_unmarshal_invalid_type(type_):
             },
             id="implicit-parts-plugins",
         ),
+        pytest.param(
+            CHARMCRAFT_YAML_NON_VECTORISED_PLATFORMS,
+            None,
+            None,
+            None,
+            {
+                "name": "test-1874-regression",
+                "summary": "Regression test for",
+                "description": "A charm for regression testing https://github.com/canonical/charmcraft/issues/1874",
+                "base": "ubuntu@24.04",
+                "platforms": {
+                    "amd64": {"build-on": ["amd64"], "build-for": ["amd64"]},
+                    "arm64": {"build-on": ["arm64"], "build-for": ["arm64"]},
+                    "ppc64el": {"build-on": ["ppc64el"], "build-for": ["ppc64el"]},
+                    "s390x": {"build-on": ["s390x"], "build-for": ["s390x"]},
+                },
+                "parts": {
+                    "charm": {
+                        "plugin": "dump",
+                        "source": ".",
+                        "prime": [
+                            "actions/*",
+                            "files/*",
+                            "hooks/*",
+                            "lib/*",
+                            "templates/*",
+                            "config.yaml",
+                            "copyright",
+                            "icon.svg",
+                            "LICENSE",
+                            "Makefile",
+                            "metadata.yaml",
+                            "README.md",
+                        ],
+                    }
+                },
+                "type": "charm",
+            },
+            id="1874-regression",
+        ),
     ],
 )
 def test_from_yaml_file_success(
@@ -656,11 +759,8 @@ def test_from_yaml_file_success(
     metadata_yaml: str | None,
     config_yaml: str | None,
     actions_yaml: str | None,
-    expected_diff: dict[str, Any],
+    expected_dict: dict[str, Any],
 ):
-    expected_dict = simple_charm.marshal().copy()
-    expected_dict.update(expected_diff)
-
     fs.create_file("/charmcraft.yaml", contents=charmcraft_yaml)
     if metadata_yaml:
         fs.create_file("/metadata.yaml", contents=metadata_yaml)