From aac3d71578b246a86a6c3d7956e23815eda9f42e Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Thu, 4 Apr 2024 09:22:56 -0700 Subject: [PATCH] Fix upstream changes --- test/fixtures/results/public/lambda-poller.json | 5 +++-- .../fixtures/results/quickstart/nist_config_rules.json | 10 ++++++---- test/integration/test_good_templates.py | 5 +++-- .../resources/lmbd/test_deprecated_runtime_end.py | 2 +- .../resources/lmbd/test_deprecated_runtime_eol.py | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/test/fixtures/results/public/lambda-poller.json b/test/fixtures/results/public/lambda-poller.json index 865f71bf48..9204be4b21 100644 --- a/test/fixtures/results/public/lambda-poller.json +++ b/test/fixtures/results/public/lambda-poller.json @@ -1,7 +1,7 @@ [ { "Filename": "test/fixtures/templates/public/lambda-poller.yaml", - "Id": "a5319ec2-3a5c-7f99-2864-8a011aecb344", + "Id": "e650af14-6edf-0a02-3b15-9e2c6f1b295e", "Level": "Error", "Location": { "End": { @@ -19,7 +19,8 @@ "LineNumber": 151 } }, - "Message": "Deprecated runtime (nodejs6.10) specified. Updating disabled since 2019-08-12. Please consider updating to nodejs20.x", + "Message": "Deprecated runtime 'nodejs6.10' specified. Updating disabled since '2019-08-12'. Please consider updating to 'nodejs20.x'", + "ParentId": null, "Rule": { "Description": "Check if an EOL Lambda Runtime is specified and give an error if used. ", "Id": "E2531", diff --git a/test/fixtures/results/quickstart/nist_config_rules.json b/test/fixtures/results/quickstart/nist_config_rules.json index 70dc83d6d6..12de266af1 100644 --- a/test/fixtures/results/quickstart/nist_config_rules.json +++ b/test/fixtures/results/quickstart/nist_config_rules.json @@ -58,7 +58,7 @@ }, { "Filename": "test/fixtures/templates/quickstart/nist_config_rules.yaml", - "Id": "36464f54-47b7-171f-73b9-20c2ddfd7289", + "Id": "1a829157-de4c-691e-ae90-a9341fcbee5c", "Level": "Error", "Location": { "End": { @@ -76,7 +76,8 @@ "LineNumber": 94 } }, - "Message": "Deprecated runtime (nodejs) specified. Updating disabled since 2016-10-31. Please consider updating to nodejs20.x", + "Message": "Deprecated runtime 'nodejs' specified. Updating disabled since '2016-10-31'. Please consider updating to 'nodejs20.x'", + "ParentId": null, "Rule": { "Description": "Check if an EOL Lambda Runtime is specified and give an error if used. ", "Id": "E2531", @@ -143,7 +144,7 @@ }, { "Filename": "test/fixtures/templates/quickstart/nist_config_rules.yaml", - "Id": "8f48c077-bdaf-de3a-4da6-8c995b3e11d0", + "Id": "d871548a-4348-70d8-a964-7093851dd666", "Level": "Error", "Location": { "End": { @@ -161,7 +162,8 @@ "LineNumber": 159 } }, - "Message": "Deprecated runtime (nodejs) specified. Updating disabled since 2016-10-31. Please consider updating to nodejs20.x", + "Message": "Deprecated runtime 'nodejs' specified. Updating disabled since '2016-10-31'. Please consider updating to 'nodejs20.x'", + "ParentId": null, "Rule": { "Description": "Check if an EOL Lambda Runtime is specified and give an error if used. ", "Id": "E2531", diff --git a/test/integration/test_good_templates.py b/test/integration/test_good_templates.py index fea7f1235e..22ea529824 100644 --- a/test/integration/test_good_templates.py +++ b/test/integration/test_good_templates.py @@ -204,14 +204,15 @@ class TestQuickStartTemplates(BaseCliTestCase): "Filename": ( "test/fixtures/templates/good/transform_serverless_globals.yaml" ), - "Id": "bbc3467b-5b8b-1300-e638-dc3e4a1741cb", + "Id": "fc9f2534-f4f8-092b-52d6-dafd2d429b67", "Level": "Error", "Location": { "End": {"ColumnNumber": 13, "LineNumber": 10}, "Path": ["Resources", "myFunction", "Properties", "Runtime"], "Start": {"ColumnNumber": 3, "LineNumber": 10}, }, - "Message": "Deprecated runtime (nodejs6.10) specified. Updating disabled since 2019-08-12. Please consider updating to nodejs20.x", + "Message": "Deprecated runtime 'nodejs6.10' specified. Updating disabled since '2019-08-12'. Please consider updating to 'nodejs20.x'", + "ParentId": None, "Rule": { "Description": ( "Check if an EOL Lambda Runtime is specified and give an" diff --git a/test/unit/rules/resources/lmbd/test_deprecated_runtime_end.py b/test/unit/rules/resources/lmbd/test_deprecated_runtime_end.py index dc00aff45a..62f6d5d090 100644 --- a/test/unit/rules/resources/lmbd/test_deprecated_runtime_end.py +++ b/test/unit/rules/resources/lmbd/test_deprecated_runtime_end.py @@ -41,7 +41,7 @@ def validator(): ( "Deprecated runtime 'nodejs4.3' specified. " "Updating disabled since '2019-04-30'. " - "Please consider updating to 'nodejs16.x'" + "Please consider updating to 'nodejs20.x'" ), rule=DeprecatedRuntimeEnd(), ) diff --git a/test/unit/rules/resources/lmbd/test_deprecated_runtime_eol.py b/test/unit/rules/resources/lmbd/test_deprecated_runtime_eol.py index 8353558764..ff744933fa 100644 --- a/test/unit/rules/resources/lmbd/test_deprecated_runtime_eol.py +++ b/test/unit/rules/resources/lmbd/test_deprecated_runtime_eol.py @@ -46,7 +46,7 @@ def validator(): "EOL runtime 'nodejs6.10' specified. " "Runtime is EOL since '2019-04-30' and " "updating will be disabled at '2019-08-12'. " - "Please consider updating to 'nodejs16.x'" + "Please consider updating to 'nodejs20.x'" ), rule=DeprecatedRuntimeEol(), )