Merge branch 'release-v1.52.0'

Author: aws-sam-cli-bot

.github/workflows/pr-labeler.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const maintainers = ['jfuss', 'c2tarun', 'hoffa', 'awood45', 'CoshUS', 'aahung', 'hawflau', 'mndeveci', 'ssenchenko', 'wchengru', 'mingkun2020', 'qingchm', 'moelasmar', 'xazhao', 'mildaniel', 'marekaiv', 'torresxb1']
+            const maintainers = ['jfuss', 'hoffa', 'awood45', 'aahung', 'hawflau', 'mndeveci', 'ssenchenko', 'qingchm', 'moelasmar', 'xazhao', 'mildaniel', 'marekaiv', 'torresxb1', 'lucashuy', 'hnnasit', 'sriram-mv']
             if (maintainers.includes(context.payload.sender.login)) {
               github.rest.issues.addLabels({
                 issue_number: context.issue.number,

.gitignore

@@ -113,4 +113,7 @@ venv.bak/
 .vscode
 
 # PyCharm
-.idea
+.idea
+
+# Companion stack config
+integration/config/file_to_s3_map_modified.json

MANIFEST.in

@@ -4,6 +4,7 @@ include requirements/dev.txt
 recursive-include samtranslator/validator/sam_schema *.json
 include samtranslator/policy_templates_data/policy_templates.json
 include samtranslator/policy_templates_data/schema.json
+include samtranslator/model/connector_profiles/profiles.json
 include README.md
 include THIRD_PARTY_LICENSES
 

Makefile

@@ -6,7 +6,7 @@ init:
 	pip install -e '.[dev]'
 
 test:
-	pytest --cov samtranslator --cov-report term-missing --cov-fail-under 95 -n auto tests/*
+	AWS_DEFAULT_REGION=us-east-1 pytest --cov samtranslator --cov-report term-missing --cov-fail-under 95 -n auto tests/*
 
 test-fast:
 	pytest -x --cov samtranslator --cov-report term-missing --cov-fail-under 95 -n auto tests/*

README.md

@@ -1,47 +1,40 @@
-<p align="center">
-</p>
-
 # AWS Serverless Application Model (AWS SAM)
 
-![Apache-2.0](https://img.shields.io/github/license/aws/serverless-application-model.svg)
-![SAM_CLI release](https://img.shields.io/github/release/aws/aws-sam-cli.svg?label=CLI%20Version)
+[![Build status](https://ci.appveyor.com/api/projects/status/qlm7sj35nu9o12jc/branch/develop?svg=true)](https://ci.appveyor.com/project/AWSSAMCLI/serverless-application-model/branch/develop)
 [![codecov](https://codecov.io/gh/aws/serverless-application-model/branch/master/graphs/badge.svg?style=flat)](https://codecov.io/gh/aws/serverless-application-model)
+[![PyPI](https://img.shields.io/pypi/v/aws-sam-translator?label=PyPI)](https://pypi.org/project/aws-sam-translator/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aws-sam-translator)](https://pypi.org/project/aws-sam-translator/)
+
+The [AWS Serverless Application Model](https://aws.amazon.com/serverless/sam/) (SAM) is an open-source framework for building serverless applications.
 
-The AWS Serverless Application Model (SAM) is an open-source framework for building serverless applications.
 It provides shorthand syntax to express functions, APIs, databases, and event source mappings.
 With just a few lines of configuration, you can define the application you want and model it.
 
-[![Getting Started with AWS SAM](./docs/get-started-youtube.png)](https://www.youtube.com/watch?v=QBBewrKR1qg)
-
 ## Recent blogposts and workshops
 
-* **Develop Node projects with SAM CLI using esbuild (Beta)** - and use SAM Accelerate on Typescript projects. [Read blogpost here](https://s12d.com/5Aa6u0o7)
-
-* **Speed up development with SAM Accelerate (Beta)** - quickly test your changes in the cloud. [Read blogpost here](https://s12d.com/WeMib4nf)
-
-* **Getting started with CI/CD? SAM pipelines can help you get started** - [This workshop](https://s12d.com/_JQ48d5T) walks you through the basics
-
+* **Develop Node projects with SAM CLI using esbuild (Beta)** - And use SAM Accelerate on TypeScript projects. [Read blogpost here](https://s12d.com/5Aa6u0o7).
+* **Speed up development with SAM Accelerate (Beta)** - Quickly test your changes in the cloud. [Read blogpost here](https://s12d.com/WeMib4nf).
+* **Getting started with CI/CD? SAM pipelines can help you get started** - [This workshop](https://s12d.com/_JQ48d5T) walks you through the basics.
 * **Get started with Serverless Application development using SAM CLI** - [This workshop](https://s12d.com/Tq9ZE-Br) walks you through the basics.
 
-## Get Started
+## Get started
 
-To get started with building SAM-based applications, use the SAM CLI. SAM CLI provides a Lambda-like execution
+To get started with building SAM-based applications, use the [AWS SAM CLI](https://github.com/aws/aws-sam-cli). SAM CLI provides a Lambda-like execution
 environment that lets you locally build, test, debug, and deploy applications defined by SAM templates.
 
 * [Install SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
-* [Build & Deploy a "Hello World" Web App](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-quick-start.html)
-* [Install AWS Toolkit](https://aws.amazon.com/getting-started/tools-sdks/#IDE_and_IDE_Toolkits) to use SAM with your favorite IDEs.
+* [Build & deploy a "hello world" web app](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-quick-start.html)
+* [Install AWS Toolkit](https://aws.amazon.com/getting-started/tools-sdks/#IDE_and_IDE_Toolkits) to use SAM with your favorite IDEs
 
-
-**Next Steps:** Learn to build a more complex serverless application.
+**Next steps:** Learn to build a more complex serverless application.
 * [Extract text from images and store in a database](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-example-s3.html) using Amazon S3 and Amazon Rekognition services.
 * [Detect when records are added to a database](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-example-ddb.html) using Amazon DynamoDB database and asynchronous stream processing.
+* Watch the [Mastering the AWS Serverless Application Model](https://www.youtube.com/watch?v=QBBewrKR1qg) AWS Online Tech Talk.
 
-
-**Detailed References:** Explains SAM commands and usage in depth.
-* [CLI Commands](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-command-reference.html)
-* [SAM Template Specification](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification.html)
-* [Policy Templates](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-policy-templates.html)
+**Detailed references:** Explains SAM commands and usage in depth.
+* [CLI commands](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-command-reference.html)
+* [SAM template specification](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification.html)
+* [Policy templates](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-policy-templates.html)
 
 ## Why SAM
 
@@ -60,7 +53,7 @@ environment that lets you locally build, test, debug, and deploy applications de
 
 + **Extension of AWS CloudFormation**\. Because SAM is an extension of AWS CloudFormation, you get the reliable deployment capabilities of AWS CloudFormation\. You can define resources by using CloudFormation in your SAM template\. Also, you can use the full suite of resources, intrinsic functions, and other template features that are available in CloudFormation\.
 
-## What is this GitHub repository? 💻
+## What is this GitHub repository?
 
 This GitHub repository contains the SAM Specification, the Python code that translates SAM templates into AWS CloudFormation stacks and lots of example applications.
 In the words of SAM developers:
@@ -77,7 +70,7 @@ more about what it was like contributing to SAM.
 
 Depending on your interest and skill, you can help build the different parts of the SAM project;
 
-**Enhance the SAM Specification**
+**Enhance the SAM specification**
 
 Make pull requests, report bugs, and share ideas to improve the full SAM template specification.
 Source code is located on GitHub at [awslabs/serverless-application-model](https://github.com/awslabs/serverless-application-model).
@@ -90,12 +83,12 @@ Add new commands or enhance existing ones, report bugs, or request new features
 Source code is located on GitHub at [awslabs/aws-sam-cli](https://github.com/awslabs/aws-sam-cli). Read the [SAM CLI Contributing Guide](https://github.com/awslabs/aws-sam-cli/blob/develop/CONTRIBUTING.md) to 
 get started.
 
-**Update SAM Developer Guide**
+**Update SAM developer guide**
 
 [SAM Developer Guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/index.html) provides comprehensive getting started guide and reference documentation.
 Source code is located on GitHub at [awsdocs/aws-sam-developer-guide](https://github.com/awsdocs/aws-sam-developer-guide).
 Read the [SAM Documentation Contribution Guide](https://github.com/awsdocs/aws-sam-developer-guide/blob/master/CONTRIBUTING.md) to get
 started.
 
-### Join the SAM Community on Slack
-[Join the SAM developers channel (#samdev)](https://join.slack.com/t/awsdevelopers/shared_invite/zt-idww18e8-Z1kXhI7GNuDewkweCF3YjA) on Slack to collaborate with fellow community members and the AWS SAM team.
+### Join the SAM community on Slack
+[Join the `#samdev` channel](https://join.slack.com/t/awsdevelopers/shared_invite/zt-yryddays-C9fkWrmguDv0h2EEDzCqvw) on Slack to collaborate with fellow community members and the AWS SAM team.

integration/combination/test_api_settings.py

@@ -162,7 +162,7 @@ def test_implicit_api_settings(self):
 
     def verify_binary_media_request(self, url, expected_status_code):
         headers = {"accept": "image/png"}
-        response = BaseTest.do_get_request_with_logging(url, headers)
+        response = self.do_get_request_with_logging(url, headers)
 
         status = response.status_code
         expected_file_path = str(Path(self.code_dir, "AWS_logo_RGB.png"))

integration/combination/test_api_with_authorizer_apikey.py

@@ -80,10 +80,10 @@ def verify_authorized_request(
         header_value=None,
     ):
         if not header_key or not header_value:
-            response = BaseTest.do_get_request_with_logging(url)
+            response = self.do_get_request_with_logging(url)
         else:
             headers = {header_key: header_value}
-            response = BaseTest.do_get_request_with_logging(url, headers)
+            response = self.do_get_request_with_logging(url, headers)
         status = response.status_code
         if status != expected_status_code:
             raise StatusCodeError(

integration/combination/test_api_with_authorizers.py

@@ -436,10 +436,10 @@ def verify_authorized_request(
         header_value=None,
     ):
         if not header_key or not header_value:
-            response = BaseTest.do_get_request_with_logging(url)
+            response = self.do_get_request_with_logging(url)
         else:
             headers = {header_key: header_value}
-            response = BaseTest.do_get_request_with_logging(url, headers)
+            response = self.do_get_request_with_logging(url, headers)
         status = response.status_code
 
         if status != expected_status_code:

integration/combination/test_connectors.py

@@ -0,0 +1,144 @@
+from time import sleep
+from parameterized import parameterized
+from integration.conftest import clean_bucket
+from integration.helpers.base_test import S3_BUCKET_PREFIX, BaseTest
+from integration.helpers.resource import generate_suffix
+
+
+class TestConnectors(BaseTest):
+    def tearDown(self):
+        # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
+        # manually empty the bucket to allow stacks to be deleted successfully.
+        bucket_name = self.get_physical_id_by_type("AWS::S3::Bucket")
+        if bucket_name:
+            clean_bucket(bucket_name, self.client_provider.s3_client)
+        super().tearDown()
+
+    @parameterized.expand(
+        [
+            ("combination/connector_function_to_function",),
+            ("combination/connector_restapi_to_function",),
+            ("combination/connector_httpapi_to_function",),
+            ("combination/connector_function_to_bucket_read",),
+            ("combination/connector_function_to_bucket_write",),
+            ("combination/connector_function_to_table_read",),
+            ("combination/connector_function_to_table_write",),
+            ("combination/connector_function_to_sfn_read",),
+            ("combination/connector_function_to_sfn_write",),
+            ("combination/connector_function_to_queue_write",),
+            ("combination/connector_function_to_queue_read",),
+            ("combination/connector_function_to_topic_write",),
+            ("combination/connector_function_to_eventbus_write",),
+            ("combination/connector_topic_to_queue_write",),
+            ("combination/connector_event_rule_to_sqs_write",),
+            ("combination/connector_event_rule_to_sns_write",),
+            ("combination/connector_event_rule_to_sfn_write",),
+            ("combination/connector_event_rule_to_eb_default_write",),
+            ("combination/connector_event_rule_to_eb_custom_write",),
+            ("combination/connector_event_rule_to_lambda_write",),
+            ("combination/connector_sqs_to_function",),
+            ("combination/connector_sns_to_function_write",),
+            ("combination/connector_table_to_function_read",),
+        ]
+    )
+    def test_connector_by_invoking_a_function(self, template_file_path):
+        self.skip_using_service_detector(template_file_path)
+        self.create_and_verify_stack(template_file_path)
+
+        lambda_function_name = self.get_physical_id_by_logical_id("TriggerFunction")
+        lambda_client = self.client_provider.lambda_client
+        s3_client = self.client_provider.s3_client
+
+        request_params = {
+            "FunctionName": lambda_function_name,
+            "InvocationType": "RequestResponse",
+            "Payload": "{}",
+        }
+        response = lambda_client.invoke(**request_params)
+        self.assertEqual(response.get("StatusCode"), 200)
+        self.assertEqual(response.get("FunctionError"), None)
+
+    @parameterized.expand(
+        [
+            ("combination/connector_sfn_to_table_read",),
+            ("combination/connector_sfn_to_table_write",),
+            ("combination/connector_sfn_to_sqs_write",),
+            ("combination/connector_sfn_to_sns_write",),
+            ("combination/connector_sfn_to_function_write",),
+            ("combination/connector_sfn_to_bucket_write",),
+            ("combination/connector_sfn_to_bucket_read",),
+            ("combination/connector_sfn_to_sfn_async",),
+            ("combination/connector_sfn_to_eb_default_write",),
+            ("combination/connector_sfn_to_eb_custom_write",),
+        ]
+    )
+    def test_connector_by_sync_execute_an_state_machine(self, template_file_path):
+        self.skip_using_service_detector(template_file_path)
+        self.create_and_verify_stack(template_file_path)
+
+        state_machine_arn = self.get_physical_id_by_logical_id("TriggerStateMachine")
+        sfn_client = self.client_provider.sfn_client
+        s3_client = self.client_provider.s3_client
+
+        response = sfn_client.start_sync_execution(
+            stateMachineArn=state_machine_arn,
+        )
+        # Without permission, it will be "FAILED"
+        self.assertEqual(response.get("status"), "SUCCEEDED")
+
+    @parameterized.expand(
+        [
+            ("combination/connector_sfn_to_sfn_sync",),
+        ]
+    )
+    def test_connector_by_async_execute_an_state_machine(self, template_file_path):
+        self.skip_using_service_detector(template_file_path)
+        self.create_and_verify_stack(template_file_path)
+
+        state_machine_arn = self.get_physical_id_by_logical_id("TriggerStateMachine")
+        sfn_client = self.client_provider.sfn_client
+
+        response = sfn_client.start_execution(
+            stateMachineArn=state_machine_arn,
+        )
+        execution_arn = response["executionArn"]
+
+        status = None
+        wait_tries = 5
+        while wait_tries > 0:
+            response = sfn_client.describe_execution(executionArn=execution_arn)
+            status = response["status"]
+            if status == "RUNNING":
+                wait_tries -= 1
+                sleep(5)
+                continue
+            else:
+                break
+
+        # Without permission, it will be "FAILED"
+        self.assertEqual(status, "SUCCEEDED")
+
+    @parameterized.expand(
+        [
+            ("combination/connector_bucket_to_function_write",),
+        ]
+    )
+    def test_connector_by_execute_a_s3_bucket(self, template_file_path):
+        self.skip_using_service_detector(template_file_path)
+        bucket_name = S3_BUCKET_PREFIX + "connector" + generate_suffix()
+        self.create_and_verify_stack(
+            template_file_path, [{"ParameterKey": "BucketName", "ParameterValue": bucket_name}]
+        )
+
+        lambda_function_name = self.get_physical_id_by_logical_id("TriggerFunction")
+        lambda_client = self.client_provider.lambda_client
+        s3_client = self.client_provider.s3_client
+
+        request_params = {
+            "FunctionName": lambda_function_name,
+            "InvocationType": "RequestResponse",
+            "Payload": "{}",
+        }
+        response = lambda_client.invoke(**request_params)
+        self.assertEqual(response.get("StatusCode"), 200)
+        self.assertEqual(response.get("FunctionError"), None)

integration/config/logger_configurations.py

@@ -8,7 +8,9 @@ def configure_request_logger(logger):
         console_handler = logging.StreamHandler()
         console_handler.setLevel(logging.INFO)
         console_handler.setFormatter(
-            logging.Formatter("%(asctime)s %(message)s | Status: %(status)s | Headers: %(headers)s ")
+            logging.Formatter(
+                "\nREQUEST LOG [%(test)s] | Time: %(asctime)s %(message)s | Status: %(status)s | Headers: %(headers)s"
+            )
         )
         logger.addHandler(console_handler)
         logger.propagate = False