From 4239056b6ee00d0cbe078f9e167d05c81d2e13f4 Mon Sep 17 00:00:00 2001
From: Francois Campbell <francois.campbell@snowflake.com>
Date: Fri, 20 Sep 2024 11:31:52 -0400
Subject: [PATCH] Don't error on a PDFv2 with multiple entities if it's not
 required

---
 .../v2_conversions/v2_to_v1_decorator.py       | 12 ++++++------
 tests/nativeapp/test_v2_to_v1.py               | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/snowflake/cli/_plugins/nativeapp/v2_conversions/v2_to_v1_decorator.py b/src/snowflake/cli/_plugins/nativeapp/v2_conversions/v2_to_v1_decorator.py
index ef4ea739c..28600dcae 100644
--- a/src/snowflake/cli/_plugins/nativeapp/v2_conversions/v2_to_v1_decorator.py
+++ b/src/snowflake/cli/_plugins/nativeapp/v2_conversions/v2_to_v1_decorator.py
@@ -187,21 +187,21 @@ def find_entity(
 
     entity: Optional[T] = None
 
-    # Determine the package entity to convert, there must be one
     if entity_id:
-        # If the user specified a package entity ID (or we inferred one from the app entity), use that one directly
+        # If we're looking for a specific entity, use that one directly
         entity = entities.get(entity_id)
     elif len(entities) == 1:
-        # Otherwise, if there is only one package entity, fall back to that one
+        # Otherwise, if there is only one entity, fall back to that one
         entity = next(iter(entities.values()))
-    elif len(entities) > 1:
-        # If there are multiple package entities, the user must specify which one to use
+    elif len(entities) > 1 and required:
+        # If there are multiple entities and it's required,
+        # the user must specify which one to use
         raise ClickException(
             f"More than one {entity_type} entity exists in the project definition file, "
             f"specify {disambiguation_option} to choose which one to operate on."
         )
 
-    # If we don't have a package entity to convert, error out since it's not optional
+    # If we don't have a package entity to convert, error out if it's required
     if not entity and required:
         with_id = f'with ID "{entity_id}" ' if entity_id else ""
         raise ClickException(
diff --git a/tests/nativeapp/test_v2_to_v1.py b/tests/nativeapp/test_v2_to_v1.py
index 37849b983..86bae6073 100644
--- a/tests/nativeapp/test_v2_to_v1.py
+++ b/tests/nativeapp/test_v2_to_v1.py
@@ -201,6 +201,24 @@ def test_v2_to_v1_conversions(pdfv2_input, expected_pdfv1, expected_error):
             "More than one application entity exists in the project definition file, "
             "specify --app-entity-id to choose which one to operate on.",
         ],
+        [
+            {
+                "definition_version": "2",
+                "entities": {
+                    **package_v2("pkg1"),
+                    **app_v2("app1", "pkg1"),
+                    **app_v2("app2", "pkg1"),
+                },
+            },
+            "",
+            "",
+            False,
+            {
+                "definition_version": "1.1",
+                "native_app": native_app_v1("pkg1", "pkg1", ""),
+            },
+            None,
+        ],
         [
             {
                 "definition_version": "2",