From dd5f016b4814c145a0fe879cb84be3ee31122833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=BB=20=F0=9F=92=AA=20=F0=9F=98=89=20James=20Hood?= Date: Thu, 23 Jan 2020 13:09:47 -0800 Subject: [PATCH] fix: use isinstance check instead of type --- bin/sam-translate.py | 2 +- samtranslator/model/sam_resources.py | 13 ++++++++++--- samtranslator/translator/translator.py | 2 +- .../test_deployment_preference_collection.py | 4 ++-- tests/translator/test_api_resource.py | 2 +- tests/translator/test_translator.py | 12 ++++++------ tests/translator/validator/test_validator.py | 4 ++-- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/bin/sam-translate.py b/bin/sam-translate.py index 5c0c7ede2f..bffb9fe84f 100755 --- a/bin/sam-translate.py +++ b/bin/sam-translate.py @@ -101,7 +101,7 @@ def transform_template(input_file_path, output_file_path): with open(output_file_path, "w") as f: f.write(cloud_formation_template_prettified) - print ("Wrote transformed CloudFormation template to: " + output_file_path) + print("Wrote transformed CloudFormation template to: " + output_file_path) except InvalidDocumentException as e: errorMessage = reduce(lambda message, error: message + " " + error.message, e.causes, e.message) LOG.error(errorMessage) diff --git a/samtranslator/model/sam_resources.py b/samtranslator/model/sam_resources.py index 27744a7374..789b136383 100644 --- a/samtranslator/model/sam_resources.py +++ b/samtranslator/model/sam_resources.py @@ -799,9 +799,16 @@ def to_cloudformation(self, **kwargs): domain=self.Domain, ) - rest_api, deployment, stage, permissions, domain, basepath_mapping, route53, usage_plan_resources = api_generator.to_cloudformation( - redeploy_restapi_parameters - ) + ( + rest_api, + deployment, + stage, + permissions, + domain, + basepath_mapping, + route53, + usage_plan_resources, + ) = api_generator.to_cloudformation(redeploy_restapi_parameters) resources.extend([rest_api, deployment, stage]) resources.extend(permissions) diff --git a/samtranslator/translator/translator.py b/samtranslator/translator/translator.py index 5655b92df2..95d1602875 100644 --- a/samtranslator/translator/translator.py +++ b/samtranslator/translator/translator.py @@ -52,7 +52,7 @@ def _get_function_names(self, resource_dict, intrinsics_resolver): # adds to the function_names dict with key as the api_name and value as the function_name if item.get("Type") == "Api" and item.get("Properties") and item.get("Properties").get("RestApiId"): rest_api = item.get("Properties").get("RestApiId") - if type(rest_api) == dict or isinstance(rest_api, OrderedDict): + if isinstance(rest_api, (dict, OrderedDict)): api_name = item.get("Properties").get("RestApiId").get("Ref") else: api_name = item.get("Properties").get("RestApiId") diff --git a/tests/translator/model/preferences/test_deployment_preference_collection.py b/tests/translator/model/preferences/test_deployment_preference_collection.py index 6307248087..ae8b39bdc8 100644 --- a/tests/translator/model/preferences/test_deployment_preference_collection.py +++ b/tests/translator/model/preferences/test_deployment_preference_collection.py @@ -104,7 +104,7 @@ def test_deployment_preference_with_codedeploy_predifined_configuration(self): deployment_preference_collection.add(self.function_logical_id, {"Type": deployment_type}) deployment_group = deployment_preference_collection.deployment_group(self.function_logical_id) - print (deployment_group.DeploymentConfigName) + print(deployment_group.DeploymentConfigName) self.assertEqual(expected_deployment_config_name, deployment_group.DeploymentConfigName) @patch("boto3.session.Session.region_name", "ap-southeast-1") @@ -133,7 +133,7 @@ def test_deployment_preference_with_conditional_custom_configuration(self): deployment_preference_collection = DeploymentPreferenceCollection() deployment_preference_collection.add(self.function_logical_id, {"Type": deployment_type}) deployment_group = deployment_preference_collection.deployment_group(self.function_logical_id) - print (deployment_group.DeploymentConfigName) + print(deployment_group.DeploymentConfigName) self.assertEqual(expected_deployment_config_name, deployment_group.DeploymentConfigName) @patch("boto3.session.Session.region_name", "ap-southeast-1") diff --git a/tests/translator/test_api_resource.py b/tests/translator/test_api_resource.py index 30c3b2086e..41be5fddb0 100644 --- a/tests/translator/test_api_resource.py +++ b/tests/translator/test_api_resource.py @@ -96,7 +96,7 @@ def test_redeploy_implicit_api(): def translate_and_find_deployment_ids(manifest): parameter_values = get_template_parameter_values() output_fragment = transform(manifest, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) deployment_ids = set() for key, value in output_fragment["Resources"].items(): diff --git a/tests/translator/test_translator.py b/tests/translator/test_translator.py index 54373f86a7..53fce21ece 100644 --- a/tests/translator/test_translator.py +++ b/tests/translator/test_translator.py @@ -312,7 +312,7 @@ def test_transform_success(self, testcase, partition_with_region): output_fragment = transform(manifest, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) # Only update the deployment Logical Id hash in Py3. if sys.version_info.major >= 3: @@ -385,7 +385,7 @@ def test_transform_success_openapi3(self, testcase, partition_with_region): output_fragment = transform(manifest, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) # Only update the deployment Logical Id hash in Py3. if sys.version_info.major >= 3: @@ -443,7 +443,7 @@ def test_transform_success_resource_policy(self, testcase, partition_with_region } output_fragment = transform(manifest, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) # Only update the deployment Logical Id hash in Py3. if sys.version_info.major >= 3: @@ -706,7 +706,7 @@ def test_swagger_body_sha_gets_recomputed(): output_fragment = transform(document, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) deployment_key = get_deployment_key(output_fragment) assert deployment_key @@ -742,7 +742,7 @@ def test_swagger_definitionuri_sha_gets_recomputed(): output_fragment = transform(document, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) deployment_key = get_deployment_key(output_fragment) assert deployment_key @@ -824,7 +824,7 @@ def _do_transform(self, document, parameter_values=get_template_parameter_values mock_policy_loader = get_policy_mock() output_fragment = transform(document, parameter_values, mock_policy_loader) - print (json.dumps(output_fragment, indent=2)) + print(json.dumps(output_fragment, indent=2)) return output_fragment diff --git a/tests/translator/validator/test_validator.py b/tests/translator/validator/test_validator.py index d76aa94eaa..ad6d142669 100644 --- a/tests/translator/validator/test_validator.py +++ b/tests/translator/validator/test_validator.py @@ -117,6 +117,6 @@ def test_validate_template_success(testcase): validation_errors = SamTemplateValidator.validate(manifest) has_errors = len(validation_errors) if has_errors: - print ("\nFailing template: {0}\n".format(testcase)) - print (validation_errors) + print("\nFailing template: {0}\n".format(testcase)) + print(validation_errors) assert len(validation_errors) == 0