Skip to content

fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Hardikrepo wants to merge 1 commit into from
+112 −18
Closed

fix: resolve issues #3911 and #3939 #3948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions samtranslator/plugins/globals/globals.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
Object holding the global properties of given type. It also contains methods to perform a merge between
Global & resource-level properties. Here are the different cases during the merge and how we handle them:

**List Override Properties**
Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
architecture). For these, a resource-level list replaces the global list entirely rather than being
concatenated with it.

**Primitive Type (String, Integer, Boolean etc)**
If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

"""

# List properties where the resource-level value replaces the global value instead of being concatenated.
_list_override_properties: frozenset[str] = frozenset({"Architectures"})

def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

for key in local_dict:
if key in global_dict:
# Both local & global contains the same key. Let's do a merge.
global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
if key in self._list_override_properties:
# Resource-level value wins outright; do not concatenate.
global_dict[key] = local_dict[key]
else:
# Both local & global contains the same key. Let's do a merge.
global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

else:
# Key is not in globals, just in local. Copy it over
Expand Down
33 changes: 17 additions & 16 deletions samtranslator/translator/verify_logical_id.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
# type_after_transform: type_before_transform
"AWS::Lambda::Function": "AWS::Serverless::Function",
"AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
"AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
"AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
"AWS::Lambda::Function": ["AWS::Serverless::Function"],
"AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
"AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
"AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
"AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
"AWS::S3::Bucket": "AWS::S3::Bucket",
"AWS::SNS::Topic": "AWS::SNS::Topic",
"AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
"AWS::CloudFormation::Stack": "AWS::Serverless::Application",
"AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
"AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
"AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
"AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
"AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
"AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
"AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
"AWS::S3::Bucket": ["AWS::S3::Bucket"],
"AWS::SNS::Topic": ["AWS::SNS::Topic"],
"AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
"AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
"AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
"AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
"AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
"AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
"AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
"AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
"AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down
13 changes: 13 additions & 0 deletions tests/plugins/globals/test_globals.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

# Architectures must override, not concatenate — Lambda only supports one architecture value.
architectures_in_local_must_override_global = {
"global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
"local": {"Architectures": ["arm64"]},
"expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
}

architectures_only_in_global_must_be_inherited = {
"global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
"local": {"Runtime": "python3.14"},
"expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
}


class TestGlobalPropertiesMerge(TestCase):
# Get all attributes of the test case object which is not a built-in method like __str__
Expand Down
68 changes: 68 additions & 0 deletions tests/translator/test_verify_logical_id.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
r = MagicMock()
r.logical_id = logical_id
r.resource_type = resource_type
return r


class TestDoNotVerifyDict(TestCase):
def test_all_values_are_lists(self):
for key, value in do_not_verify.items():
self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

def test_no_substring_bypass(self):
# A crafted type that is a substring of a real allowed type must NOT match.
# Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
resource = _make_resource("MyFunc", "AWS::Lambda::Function")
existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

result = verify_unique_logical_id(resource, existing)
self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

def test_no_superstring_bypass(self):
# A type that contains an allowed type as a substring must NOT match.
resource = _make_resource("MyFunc", "AWS::Lambda::Function")
existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

result = verify_unique_logical_id(resource, existing)
self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
def test_new_logical_id_is_unique(self):
resource = _make_resource("NewFunc", "AWS::Lambda::Function")
existing = {}
self.assertTrue(verify_unique_logical_id(resource, existing))

def test_none_logical_id_is_unique(self):
resource = _make_resource(None, "AWS::Lambda::Function")
self.assertTrue(verify_unique_logical_id(resource, {}))

def test_allowed_transform_returns_true(self):
resource = _make_resource("MyFunc", "AWS::Lambda::Function")
existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
self.assertTrue(verify_unique_logical_id(resource, existing))

def test_allowed_transform_multi_value_returns_true(self):
resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
self.assertTrue(verify_unique_logical_id(resource, existing))

existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
self.assertTrue(verify_unique_logical_id(resource, existing2))

def test_disallowed_type_collision_returns_false(self):
resource = _make_resource("MyBucket", "AWS::Lambda::Function")
existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
self.assertFalse(verify_unique_logical_id(resource, existing))

def test_unknown_resource_type_returns_false(self):
resource = _make_resource("SomeId", "AWS::Custom::Unknown")
existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
self.assertFalse(verify_unique_logical_id(resource, existing))
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: resolve issues #3911 and #3939 by Hardikrepo · Pull Request #3948 · aws/serverless-application-model · GitHub
Skip to content
fix: resolve issues #3911 and #3939#3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Hardikrepo
wants to merge
1
commit into

from


+112

−18

 Closed


fix: resolve issues #3911 and #3939
#3948
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 14 additions & 2 deletions
samtranslator/plugins/globals/globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -321,6 +321,11 @@ class GlobalProperties:
 Object holding the global properties of given type. It also contains methods to perform a merge between
 Global & resource-level properties. Here are the different cases during the merge and how we handle them:

 **List Override Properties**
 Some list properties only accept a single value (e.g. Architectures — Lambda supports exactly one
 architecture). For these, a resource-level list replaces the global list entirely rather than being
 concatenated with it.

 **Primitive Type (String, Integer, Boolean etc)**
 If either global & local are of primitive types, then we the value at local will overwrite global.

Expand DownExpand Up@@ -436,6 +441,9 @@ class GlobalProperties:

 """

 # List properties where the resource-level value replaces the global value instead of being concatenated.
 _list_override_properties: frozenset[str] = frozenset({"Architectures"})

 def __init__(self, global_properties) -> None: # type: ignore[no-untyped-def]
 self.global_properties = global_properties

Expand DownExpand Up@@ -500,8 +508,12 @@ def _merge_dict(self, global_dict, local_dict): # type: ignore[no-untyped-def]

 for key in local_dict:
 if key in global_dict:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]
 if key in self._list_override_properties:
 # Resource-level value wins outright; do not concatenate.
 global_dict[key] = local_dict[key]
 else:
 # Both local & global contains the same key. Let's do a merge.
 global_dict[key] = self._do_merge(global_dict[key], local_dict[key]) # type: ignore[no-untyped-call]

 else:
 # Key is not in globals, just in local. Copy it over
Expand Down

33 changes: 17 additions & 16 deletions
samtranslator/translator/verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,24 +2,25 @@

from samtranslator.model import Resource

do_not_verify = {
# Values are always lists so that `in` performs exact element matching, not substring matching.
do_not_verify: dict[str, list[str]] = {
 # type_after_transform: type_before_transform
 "AWS::Lambda::Function": "AWS::Serverless::Function",
 "AWS::Lambda::LayerVersion": "AWS::Serverless::LayerVersion",
 "AWS::Lambda::CapacityProvider": "AWS::Serverless::CapacityProvider",
 "AWS::ApiGateway::RestApi": "AWS::Serverless::Api",
 "AWS::Lambda::Function": ["AWS::Serverless::Function"],
 "AWS::Lambda::LayerVersion": ["AWS::Serverless::LayerVersion"],
 "AWS::Lambda::CapacityProvider": ["AWS::Serverless::CapacityProvider"],
 "AWS::ApiGateway::RestApi": ["AWS::Serverless::Api"],
 "AWS::ApiGatewayV2::Api": ["AWS::Serverless::HttpApi", "AWS::Serverless::WebSocketApi"],
 "AWS::S3::Bucket": "AWS::S3::Bucket",
 "AWS::SNS::Topic": "AWS::SNS::Topic",
 "AWS::DynamoDB::Table": "AWS::Serverless::SimpleTable",
 "AWS::CloudFormation::Stack": "AWS::Serverless::Application",
 "AWS::Cognito::UserPool": "AWS::Cognito::UserPool",
 "AWS::ApiGateway::DomainName": "AWS::ApiGateway::DomainName",
 "AWS::ApiGateway::BasePathMapping": "AWS::ApiGateway::BasePathMapping",
 "AWS::ApiGateway::DomainNameV2": "AWS::ApiGateway::DomainNameV2",
 "AWS::ApiGateway::BasePathMappingV2": "AWS::ApiGateway::BasePathMappingV2",
 "AWS::StepFunctions::StateMachine": "AWS::Serverless::StateMachine",
 "AWS::AppSync::GraphQLApi": "AWS::Serverless::GraphQLApi",
 "AWS::S3::Bucket": ["AWS::S3::Bucket"],
 "AWS::SNS::Topic": ["AWS::SNS::Topic"],
 "AWS::DynamoDB::Table": ["AWS::Serverless::SimpleTable"],
 "AWS::CloudFormation::Stack": ["AWS::Serverless::Application"],
 "AWS::Cognito::UserPool": ["AWS::Cognito::UserPool"],
 "AWS::ApiGateway::DomainName": ["AWS::ApiGateway::DomainName"],
 "AWS::ApiGateway::BasePathMapping": ["AWS::ApiGateway::BasePathMapping"],
 "AWS::ApiGateway::DomainNameV2": ["AWS::ApiGateway::DomainNameV2"],
 "AWS::ApiGateway::BasePathMappingV2": ["AWS::ApiGateway::BasePathMappingV2"],
 "AWS::StepFunctions::StateMachine": ["AWS::Serverless::StateMachine"],
 "AWS::AppSync::GraphQLApi": ["AWS::Serverless::GraphQLApi"],
}


Expand Down

13 changes: 13 additions & 0 deletions
tests/plugins/globals/test_globals.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,19 @@ class GlobalPropertiesTestCases:

 mixed_type_inputs_must_be_handled = {"global": {"a": "b"}, "local": [1, 2, 3], "expected_output": [1, 2, 3]}

 # Architectures must override, not concatenate — Lambda only supports one architecture value.
 architectures_in_local_must_override_global = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Architectures": ["arm64"]},
 "expected_output": {"Architectures": ["arm64"], "Runtime": "python3.12"},
 }

 architectures_only_in_global_must_be_inherited = {
 "global": {"Architectures": ["x86_64"], "Runtime": "python3.12"},
 "local": {"Runtime": "python3.14"},
 "expected_output": {"Architectures": ["x86_64"], "Runtime": "python3.14"},
 }


class TestGlobalPropertiesMerge(TestCase):
 # Get all attributes of the test case object which is not a built-in method like __str__
Expand Down

68 changes: 68 additions & 0 deletions
tests/translator/test_verify_logical_id.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
from unittest import TestCase
from unittest.mock import MagicMock

from samtranslator.translator.verify_logical_id import do_not_verify, verify_unique_logical_id


def _make_resource(logical_id, resource_type):
 r = MagicMock()
 r.logical_id = logical_id
 r.resource_type = resource_type
 return r


class TestDoNotVerifyDict(TestCase):
 def test_all_values_are_lists(self):
 for key, value in do_not_verify.items():
 self.assertIsInstance(value, list, f"do_not_verify['{key}'] must be a list, got {type(value)}")

 def test_no_substring_bypass(self):
 # A crafted type that is a substring of a real allowed type must NOT match.
 # Before the fix, "AWS::Serverless::Fun" in "AWS::Serverless::Function" was True.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Fun"}} # substring, not exact

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Substring of an allowed type must not bypass the uniqueness check")

 def test_no_superstring_bypass(self):
 # A type that contains an allowed type as a substring must NOT match.
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::FunctionExtra"}}

 result = verify_unique_logical_id(resource, existing)
 self.assertFalse(result, "Superstring of an allowed type must not bypass the uniqueness check")


class TestVerifyUniqueLogicalId(TestCase):
 def test_new_logical_id_is_unique(self):
 resource = _make_resource("NewFunc", "AWS::Lambda::Function")
 existing = {}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_none_logical_id_is_unique(self):
 resource = _make_resource(None, "AWS::Lambda::Function")
 self.assertTrue(verify_unique_logical_id(resource, {}))

 def test_allowed_transform_returns_true(self):
 resource = _make_resource("MyFunc", "AWS::Lambda::Function")
 existing = {"MyFunc": {"Type": "AWS::Serverless::Function"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 def test_allowed_transform_multi_value_returns_true(self):
 resource = _make_resource("MyApi", "AWS::ApiGatewayV2::Api")
 existing = {"MyApi": {"Type": "AWS::Serverless::HttpApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing))

 existing2 = {"MyApi": {"Type": "AWS::Serverless::WebSocketApi"}}
 self.assertTrue(verify_unique_logical_id(resource, existing2))

 def test_disallowed_type_collision_returns_false(self):
 resource = _make_resource("MyBucket", "AWS::Lambda::Function")
 existing = {"MyBucket": {"Type": "AWS::S3::Bucket"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))

 def test_unknown_resource_type_returns_false(self):
 resource = _make_resource("SomeId", "AWS::Custom::Unknown")
 existing = {"SomeId": {"Type": "AWS::Custom::Something"}}
 self.assertFalse(verify_unique_logical_id(resource, existing))