fix(cfn-lang-ext): derive PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES from canonical dicts (#9005)

Replace the literal PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES dict with
a derivation from RESOURCES_WITH_LOCAL_PATHS and RESOURCES_WITH_IMAGE_COMPONENT
in samcli.lib.utils.resources, establishing a single source of truth.

This fixes issue #9005 where eight resource types were missing from the
language-extensions packaging path:
- AWS::Serverless::Application
- AWS::CloudFormation::StackSet
- AWS::ElasticBeanstalk::ApplicationVersion
- AWS::AppSync::GraphQLSchema
- AWS::AppSync::Resolver
- AWS::AppSync::FunctionConfiguration
- AWS::CloudFormation::ModuleVersion
- AWS::CloudFormation::ResourceVersion

The derivation also adds AWS::Glue::Job with dotted-path property
Command.ScriptLocation, and adds Code.ImageUri to AWS::Lambda::Function.

All 14 new tests pass, confirming the derived dict includes the expected
entries and excludes design exclusions (ECR::Repository, ServerlessRepo::Application).
Cross-task integration anchors for Glue::Job dotted-path handling now pass.

Author: bnusunny

samcli/lib/cfn_language_extensions/models.py

@@ -135,22 +135,34 @@ class TemplateProcessingContext:
 
 
 # Packageable resource types and their artifact properties that can be dynamic in Fn::ForEach blocks.
-# These properties reference local files/directories that SAM CLI needs to package.
-# Dynamic values (using loop variables) are supported via Mappings transformation.
-PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES: Dict[str, List[str]] = {
-    "AWS::Serverless::Function": ["CodeUri", "ImageUri"],
-    "AWS::Lambda::Function": ["Code"],
-    "AWS::Serverless::LayerVersion": ["ContentUri"],
-    "AWS::Lambda::LayerVersion": ["Content"],
-    "AWS::Serverless::Api": ["DefinitionUri"],
-    "AWS::Serverless::HttpApi": ["DefinitionUri"],
-    "AWS::Serverless::StateMachine": ["DefinitionUri"],
-    "AWS::Serverless::GraphQLApi": ["SchemaUri", "CodeUri"],
-    "AWS::ApiGateway::RestApi": ["BodyS3Location"],
-    "AWS::ApiGatewayV2::Api": ["BodyS3Location"],
-    "AWS::StepFunctions::StateMachine": ["DefinitionS3Location"],
-    "AWS::CloudFormation::Stack": ["TemplateURL"],
-}
+# Derived from samcli.lib.utils.resources to keep one source of truth: any resource type
+# whose property the artifact exporter packages MUST be merged back into the original
+# (Fn::ForEach-preserving) template. See issue #9005 for the symptom of drift.
+#
+# Property names follow jmespath syntax (e.g., "Command.ScriptLocation" for nested keys),
+# matching the canonical dicts. Consumers must use jmespath-aware get/set when copying.
+def _build_packageable_resource_artifact_properties() -> Dict[str, List[str]]:
+    from samcli.lib.utils.resources import (
+        AWS_ECR_REPOSITORY,
+        RESOURCES_WITH_IMAGE_COMPONENT,
+        RESOURCES_WITH_LOCAL_PATHS,
+    )
+
+    result: Dict[str, List[str]] = {}
+    for resource_type, props in RESOURCES_WITH_LOCAL_PATHS.items():
+        result[resource_type] = list(props)
+    for resource_type, props in RESOURCES_WITH_IMAGE_COMPONENT.items():
+        # ECR::Repository.RepositoryName is not a packaged-artifact path.
+        if resource_type == AWS_ECR_REPOSITORY:
+            continue
+        result.setdefault(resource_type, [])
+        for prop in props:
+            if prop not in result[resource_type]:
+                result[resource_type].append(prop)
+    return result
+
+
+PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES: Dict[str, List[str]] = _build_packageable_resource_artifact_properties()
 
 
 @dataclass(frozen=True)

tests/unit/lib/cfn_language_extensions/test_models.py

@@ -283,3 +283,86 @@ def test_template_processing_context_exported(self):
 
         context = TemplateProcessingContext(fragment={})
         assert context.fragment == {}
+
+
+class TestPackageableResourceArtifactProperties:
+    """Lock in the derived contents of PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES so future drift fails loudly."""
+
+    def test_includes_existing_serverless_function(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert "CodeUri" in PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::Serverless::Function"]
+        assert "ImageUri" in PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::Serverless::Function"]
+
+    def test_includes_existing_lambda_function_dotted_image(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        props = PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::Lambda::Function"]
+        assert "Code" in props
+        assert "Code.ImageUri" in props
+
+    def test_includes_serverless_application(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::Serverless::Application"] == ["Location"]
+
+    def test_includes_cloudformation_stackset(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::CloudFormation::StackSet"] == ["TemplateURL"]
+
+    def test_includes_elasticbeanstalk_application_version(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::ElasticBeanstalk::ApplicationVersion"] == [
+            "SourceBundle"
+        ]
+
+    def test_includes_appsync_graphql_schema(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::AppSync::GraphQLSchema"] == ["DefinitionS3Location"]
+
+    def test_includes_appsync_resolver_three_props(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        props = PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::AppSync::Resolver"]
+        assert sorted(props) == sorted(
+            ["RequestMappingTemplateS3Location", "ResponseMappingTemplateS3Location", "CodeS3Location"]
+        )
+
+    def test_includes_appsync_function_configuration_three_props(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        props = PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::AppSync::FunctionConfiguration"]
+        assert sorted(props) == sorted(
+            ["RequestMappingTemplateS3Location", "ResponseMappingTemplateS3Location", "CodeS3Location"]
+        )
+
+    def test_includes_glue_job_dotted_path(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::Glue::Job"] == ["Command.ScriptLocation"]
+
+    def test_includes_cloudformation_module_version(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::CloudFormation::ModuleVersion"] == ["ModulePackage"]
+
+    def test_includes_cloudformation_resource_version(self):
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES["AWS::CloudFormation::ResourceVersion"] == [
+            "SchemaHandlerPackage"
+        ]
+
+    def test_excludes_ecr_repository_repositoryname(self):
+        """RepositoryName is a name, not a packaged-artifact URI. Excluded by design."""
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert "AWS::ECR::Repository" not in PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+
+    def test_excludes_serverlessrepo_application_metadata(self):
+        """ServerlessRepo::Application uses METADATA_WITH_LOCAL_PATHS, not resource props."""
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        assert "AWS::ServerlessRepo::Application" not in PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+
+    def test_dict_is_in_sync_with_canonical_lists(self):
+        """If RESOURCES_WITH_LOCAL_PATHS gains a new entry, this dict must too."""
+        from samcli.lib.cfn_language_extensions.models import PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES
+        from samcli.lib.utils.resources import RESOURCES_WITH_LOCAL_PATHS
+
+        for resource_type, props in RESOURCES_WITH_LOCAL_PATHS.items():
+            assert resource_type in PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES, (
+                f"{resource_type} from RESOURCES_WITH_LOCAL_PATHS must be in derived dict"
+            )
+            for prop in props:
+                assert prop in PACKAGEABLE_RESOURCE_ARTIFACT_PROPERTIES[resource_type]