From f188bf5b5e386e74dac20e2cae1b2b182fc0656c Mon Sep 17 00:00:00 2001
From: Callahan Kovacs <callahan.kovacs@canonical.com>
Date: Thu, 3 Oct 2024 08:51:30 -0500
Subject: [PATCH] fix(snapcraft_legacy): get assertions for aliased snaps

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
---
 .../internal/build_providers/_snap.py         |  6 +--
 snapcraft_legacy/internal/repo/snaps.py       |  8 +++-
 tests/legacy/unit/repo/test_snaps.py          | 42 +++++++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/snapcraft_legacy/internal/build_providers/_snap.py b/snapcraft_legacy/internal/build_providers/_snap.py
index 5294320826..dab87aece9 100644
--- a/snapcraft_legacy/internal/build_providers/_snap.py
+++ b/snapcraft_legacy/internal/build_providers/_snap.py
@@ -169,11 +169,7 @@ def _set_data(self) -> None:
 
             if not snap_revision.startswith("x") and snap_channel:
                 switch_cmd = [
-                    "snap",
-                    "switch",
-                    self.snap_instance_name,
-                    "--channel",
-                    snap_channel,
+                    "snap", "switch", self.snap_name, "--channel", snap_channel
                 ]
 
             if snap_revision.startswith("x"):
diff --git a/snapcraft_legacy/internal/repo/snaps.py b/snapcraft_legacy/internal/repo/snaps.py
index 75e286c5fc..0a779b0550 100644
--- a/snapcraft_legacy/internal/repo/snaps.py
+++ b/snapcraft_legacy/internal/repo/snaps.py
@@ -179,7 +179,13 @@ def local_download(self, *, snap_path: str, assertion_path: str) -> None:
         # We write an empty assertions file for dangerous installs to
         # have a consistent interface.
         if self.has_assertions():
-            assertions.append(["snap-declaration", "snap-name={}".format(self.name)])
+            assertions.append(
+                [
+                    "snap-declaration",
+                    # use the snap name without any alias
+                    f"snap-name={self.name.partition('_')[0]}"
+                ]
+            )
             assertions.append(
                 [
                     "snap-revision",
diff --git a/tests/legacy/unit/repo/test_snaps.py b/tests/legacy/unit/repo/test_snaps.py
index bf7f8ffcb6..13d813dbc3 100644
--- a/tests/legacy/unit/repo/test_snaps.py
+++ b/tests/legacy/unit/repo/test_snaps.py
@@ -348,6 +348,48 @@ def test_download_from_host(self):
             ]
         )
 
+    def test_download_from_host_alias(self):
+        """Download an aliased snap from the host."""
+        fake_get_assertion = fixtures.MockPatch(
+            "snapcraft_legacy.internal.repo.snaps.get_assertion",
+            return_value=b"foo-assert",
+        )
+        self.useFixture(fake_get_assertion)
+
+        self.fake_snapd.snaps_result = [
+            {
+                "id": "fake-snap-id",
+                "name": "fake-snap_alias",
+                "channel": "stable",
+                "revision": "10",
+            }
+        ]
+
+        snap_pkg = snaps.SnapPackage("fake-snap_alias/strict/stable")
+        snap_pkg.local_download(
+            snap_path="fake-snap.snap", assertion_path="fake-snap.assert"
+        )
+
+        self.assertThat("fake-snap.snap", FileExists())
+        self.assertThat(
+            "fake-snap.assert", FileContains("foo-assert\nfoo-assert\nfoo-assert\n")
+        )
+        fake_get_assertion.mock.assert_has_calls(
+            [
+                mock.call(
+                    [
+                        "account-key",
+                        "public-key-sha3-384=BWDEoaqyr25nF5SNCvEv2v7QnM9QsfCc0PBMYD_i2NGSQ32EF2d4D0hqUel3m8ul",
+                    ]
+                ),
+                # uses the non-aliased name
+                mock.call(["snap-declaration", "snap-name=fake-snap"]),
+                mock.call(
+                    ["snap-revision", "snap-revision=10", "snap-id=fake-snap-id"]
+                ),
+            ]
+        )
+
     def test_download_from_host_dangerous(self):
         fake_get_assertion = fixtures.MockPatch(
             "snapcraft_legacy.internal.repo.snaps.get_assertion",