Revert "fix: Decouple samtranslator.models and samtranslator.intrinsics"

This reverts commit 53bfc7e.
aahung · Feb 28, 2023 · bee1e2b · bee1e2b
1 parent c3b38e2
commit bee1e2b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/samtranslator/model/__init__.py b/samtranslator/model/__init__.py
@@ -8,6 +8,7 @@
 from pydantic import BaseModel
 from pydantic.error_wrappers import ValidationError
 
+from samtranslator.intrinsics.resolver import IntrinsicsResolver
 from samtranslator.model.exceptions import (
     ExpectedType,
     InvalidResourceException,
@@ -543,6 +544,23 @@ def _check_tag(self, reserved_tag_name, tags):  # type: ignore[no-untyped-def]
                 "input.",
             )
 
+    def _resolve_string_parameter(
+        self,
+        intrinsics_resolver: IntrinsicsResolver,
+        parameter_value: Optional[Union[str, Dict[str, Any]]],
+        parameter_name: str,
+    ) -> Optional[Union[str, Dict[str, Any]]]:
+        if not parameter_value:
+            return parameter_value
+        value = intrinsics_resolver.resolve_parameter_refs(parameter_value)
+
+        if not isinstance(value, str) and not isinstance(value, dict):
+            raise InvalidResourceException(
+                self.logical_id,
+                "Could not resolve parameter for '{}' or parameter is not a String.".format(parameter_name),
+            )
+        return value
+
 
 class ResourceTypeResolver:
     """ResourceTypeResolver maps Resource Types to Resource classes, e.g. AWS::Serverless::Function to

diff --git a/samtranslator/model/sam_resources.py b/samtranslator/model/sam_resources.py
@@ -86,7 +86,6 @@
 from .packagetype import IMAGE, ZIP
 from .s3_utils.uri_parser import construct_image_code_object, construct_s3_location_object
 from .tags.resource_tagging import get_tag_list
-from ..internal.intrinsics import resolve_string_parameter_in_resource
 
 _CONDITION_CHAR_LIMIT = 255
 
@@ -1572,17 +1571,11 @@ def _construct_lambda_layer(self, intrinsics_resolver: IntrinsicsResolver) -> La
         :rtype: list
         """
         # Resolve intrinsics if applicable:
-        self.LayerName = resolve_string_parameter_in_resource(
-            self.logical_id, intrinsics_resolver, self.LayerName, "LayerName"
-        )
-        self.LicenseInfo = resolve_string_parameter_in_resource(
-            self.logical_id, intrinsics_resolver, self.LicenseInfo, "LicenseInfo"
-        )
-        self.Description = resolve_string_parameter_in_resource(
-            self.logical_id, intrinsics_resolver, self.Description, "Description"
-        )
-        self.RetentionPolicy = resolve_string_parameter_in_resource(
-            self.logical_id, intrinsics_resolver, self.RetentionPolicy, "RetentionPolicy"
+        self.LayerName = self._resolve_string_parameter(intrinsics_resolver, self.LayerName, "LayerName")
+        self.LicenseInfo = self._resolve_string_parameter(intrinsics_resolver, self.LicenseInfo, "LicenseInfo")
+        self.Description = self._resolve_string_parameter(intrinsics_resolver, self.Description, "Description")
+        self.RetentionPolicy = self._resolve_string_parameter(
+            intrinsics_resolver, self.RetentionPolicy, "RetentionPolicy"
         )
 
         # If nothing defined, this will be set to Retain