From e8b0555aafae84536e663c3299c4d8a3f67a75fc Mon Sep 17 00:00:00 2001 From: Chris Rehn <1280602+hoffa@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:35:31 -0800 Subject: [PATCH 1/3] chore: remove soft template validation --- samtranslator/parser/parser.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/samtranslator/parser/parser.py b/samtranslator/parser/parser.py index 9d5f75e2e..243cedefe 100644 --- a/samtranslator/parser/parser.py +++ b/samtranslator/parser/parser.py @@ -9,7 +9,6 @@ from samtranslator.plugins import LifeCycleEvents from samtranslator.plugins.sam_plugins import SamPlugins from samtranslator.public.sdk.template import SamTemplate -from samtranslator.validator.validator import SamTemplateValidator from samtranslator.validator.value_validator import sam_expect LOG = logging.getLogger(__name__) @@ -66,12 +65,3 @@ def _validate(self, sam_template, parameter_values): # type: ignore[no-untyped- raise ValueError("`parameter_values` argument is required") Parser.validate_datatypes(sam_template) # type: ignore[no-untyped-call] - - try: - validator = SamTemplateValidator() # type: ignore[no-untyped-call] - validation_errors = validator.validate(sam_template) # type: ignore[no-untyped-call] - if validation_errors: - LOG.warning("Template schema validation reported the following errors: %s", validation_errors) - except Exception as e: - # Catching any exception and not re-raising to make sure any validation process won't break transform - LOG.exception("Exception from SamTemplateValidator: %s", e) From 5e0e321fd67fe47dc72e6c5198f10a7ca7bc16ce Mon Sep 17 00:00:00 2001 From: Chris Rehn <1280602+hoffa@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:41:39 -0800 Subject: [PATCH 2/3] Fix test --- tests/parser/test_parser.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tests/parser/test_parser.py b/tests/parser/test_parser.py index f614fd420..9416433c5 100644 --- a/tests/parser/test_parser.py +++ b/tests/parser/test_parser.py @@ -19,24 +19,6 @@ def test_parse(self): parser._validate.assert_has_calls([call(sam_template, parameter_values)]) sam_plugins_mock.act.assert_has_calls([call(LifeCycleEvents.before_transform_template, sam_template)]) - @patch("samtranslator.parser.parser.SamTemplateValidator") - @patch("samtranslator.parser.parser.LOG") - def test_validate_validator_failure(self, log_mock, sam_template_validator_class_mock): - exception = Exception() - sam_template_validator_class_mock.side_effect = exception - log_mock.exception = Mock() - - sam_template = { - "Resources": { - "Function": {}, - "Api": {}, - } - } - paramerter_values = {"Param": "value"} - parser = Parser() - parser._validate(sam_template, paramerter_values) - log_mock.exception.assert_has_calls([call("Exception from SamTemplateValidator: %s", exception)]) - def test_validate_parameter_values_is_required(self): parser = Parser() with self.assertRaises(ValueError): From cadf5c6d7ef852201b6e2525261fb8e5dc9b973c Mon Sep 17 00:00:00 2001 From: Chris Rehn <1280602+hoffa@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:44:39 -0800 Subject: [PATCH 3/3] lint-fix --- tests/parser/test_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parser/test_parser.py b/tests/parser/test_parser.py index 9416433c5..fde6180a0 100644 --- a/tests/parser/test_parser.py +++ b/tests/parser/test_parser.py @@ -1,5 +1,5 @@ from unittest import TestCase -from unittest.mock import Mock, call, patch +from unittest.mock import Mock, call from samtranslator.model.exceptions import InvalidDocumentException from samtranslator.parser.parser import Parser