chore: Update feat/config-files branch with changes from develop #5466

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.

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

Merged

lucashuy merged 129 commits into aws:feat/config-files from lucashuy:rebase_config_files

Jul 7, 2023

.github/workflows/automated-updates-to-sam-cli.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -75,7 +75,7 @@ jobs:
  
          - uses: actions/setup-python@v4 # used for make update-reproducible-reqs below

            with:

              python-version: |

                3.7

                3.8

                3.11

          - name: Update aws-sam-translator & commit

    @@ -132,7 +132,7 @@ jobs:
  
          - uses: actions/setup-python@v4 # used for make update-reproducible-reqs below

            with:

              python-version: |

                3.7

                3.8

                3.11

          - name: Upgrade aws_lambda_builders & commit

.github/workflows/validate_pyinstaller.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -19,7 +19,7 @@ jobs:
  
        steps:

          - uses: actions/checkout@v3

          - name: Set up Go

            uses: actions/setup-go@v3

            uses: actions/setup-go@v4

            with:

              go-version: "1.20"

          - name: Build PyInstaller

    @@ -50,7 +50,7 @@ jobs:
  
            with:

              python-version: "3.7"

          - name: Set up Go

            uses: actions/setup-go@v3

            uses: actions/setup-go@v4

            with:

              go-version: "1.20"

          - name: Build PyInstaller

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -417,8 +417,11 @@ tests/integration/testdata/buildcmd/Dotnet6/obj @@
     tests/integration/testdata/buildcmd/Dotnet7/bin
     tests/integration/testdata/buildcmd/Dotnet7/obj
     tests/integration/testdata/invoke/credential_tests/inprocess/dotnet/STS/obj
+    tests/integration/testdata/sync/code/after/dotnet_function/src/HelloWorld/obj/
+    tests/integration/testdata/sync/code/before/dotnet_function/src/HelloWorld/obj/
     # End of https://www.gitignore.io/api/osx,node,macos,linux,python,windows,pycharm,intellij,sublimetext,visualstudiocode
     # Installer build folder
     .build

Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ update-reproducible-linux-reqs: @@
     	venv-update-reproducible-linux/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-linux.txt
     update-reproducible-mac-reqs:
-    	python3.7 -m venv venv-update-reproducible-mac
+    	python3.8 -m venv venv-update-reproducible-mac
     	venv-update-reproducible-mac/bin/pip install --upgrade pip-tools pip
     	venv-update-reproducible-mac/bin/pip install -r requirements/base.txt
     	venv-update-reproducible-mac/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-mac.txt
@@ Expand Down @@

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,14 +11,14 @@
  
    [Installation](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) | [Blogs](https://serverlessland.com/blog?tag=AWS%20SAM) | [Videos](https://serverlessland.com/video?tag=AWS%20SAM) | [AWS Docs](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html) | [Roadmap](https://github.com/aws/aws-sam-cli/wiki/SAM-CLI-Roadmap) | [Try It Out](https://s12d.com/jKo46elk) | [Slack Us](https://join.slack.com/t/awsdevelopers/shared_invite/zt-yryddays-C9fkWrmguDv0h2EEDzCqvw)

    The AWS Serverless Application Model (SAM) CLI is an open-source CLI tool that helps you develop serverless applications containing [Lambda functions](https://aws.amazon.com/lambda/), [Step Functions](https://aws.amazon.com/step-functions/), [API Gateway](https://aws.amazon.com/api-gateway/), [EventBridge](https://aws.amazon.com/eventbridge/), [SQS](https://aws.amazon.com/sqs/), [SNS](https://aws.amazon.com/sns/) and more. Some of the features it provides are:

    - **Initialize serverless applications** in minutes with AWS-provided infrastructure templates with `sam init`

    - **Compile, build, and package** Lambda functions with provided runtimes and with custom Makefile workflows, for zip and image types of Lambda functions with `sam build`

    - **Locally test** a Lambda function and API Gateway easily in a Docker container with `sam local` commands on SAM and CDK applications

    - **Sync and test your changes in the cloud** with `sam sync` in your developer environments

    - **Deploy** your SAM and CloudFormation templates using `sam deploy`

    - Quickly **create pipelines** with prebuilt templates with popular CI/CD systems using `sam pipeline init`

    - **Tail CloudWatch logs and X-Ray traces** with `sam logs` and `sam traces`

    * **Initialize serverless applications** in minutes with AWS-provided infrastructure templates with `sam init`

    * **Compile, build, and package** Lambda functions with provided runtimes and with custom Makefile workflows, for zip and image types of Lambda functions with `sam build`

    * **Locally test** a Lambda function and API Gateway easily in a Docker container with `sam local` commands on SAM and CDK applications

    * **Sync and test your changes in the cloud** with `sam sync` in your developer environments

    * **Deploy** your SAM and CloudFormation templates using `sam deploy`

    * Quickly **create pipelines** with prebuilt templates with popular CI/CD systems using `sam pipeline init`

    * **Tail CloudWatch logs and X-Ray traces** with `sam logs` and `sam traces`

    ## Recent blogposts and workshops

    @@ -28,53 +28,51 @@ The AWS Serverless Application Model (SAM) CLI is an open-source CLI tool that h
  
    * **Speed up development with SAM Accelerate** - quickly test your changes in the cloud. [Read docs here](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/accelerate.html).

    * **AWS Serverless Developer Experience Workshop: A day in a life of a developer** - [This advanced workshop](https://s12d.com/aws-sde-workshop) provides you with an immersive experience as a serverless developer, with hands-on experience building a serverless solution using AWS SAM and SAM CLI.

    * **The Complete SAM Workshop**- [This workshop](https://s12d.com/jKo46elk) is a great way to experience the power of SAM and SAM CLI.

    * **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

    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 SAM CLI. SAM CLI provides a Lambda-like execution

    environment that lets you locally build, test, debug, and deploy [AWS serverless](https://aws.amazon.com/serverless/) applications.

    * [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

    * [Tutorials and Workshops](https://serverlessland.com/learn)

    * [Powertools for AWS Lambda](https://aws.amazon.com/blogs/opensource/simplifying-serverless-best-practices-with-lambda-powertools/) Utilities for building Lambda functions in [Python](https://awslabs.github.io/aws-lambda-powertools-python/latest/), [Java](https://github.com/awslabs/aws-lambda-powertools-java), and [TypeScript](https://github.com/awslabs/aws-lambda-powertools-typescript)

    * **Powertools for AWS Lambda** is a developer toolkit to implement Serverless best practices and increase developer velocity. Available for [Python](https://awslabs.github.io/aws-lambda-powertools-python), [Java](https://github.com/awslabs/aws-lambda-powertools-java), [TypeScript](https://github.com/awslabs/aws-lambda-powertools-typescript) and [.NET](https://github.com/awslabs/aws-lambda-powertools-dotnet).

    **Next Steps:** Learn to build a more complex serverless application.

    * [Extract text from images and store it 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.

    * [Explore popular patterns](https://serverlessland.com/patterns)

    ## What is this Github repository? 💻

    This Github repository contains source code for SAM CLI. Here is the development team talking about this code:

    > SAM CLI code is written in Python. Source code is well documented, very modular, with 95% unit test coverage. 

    > SAM CLI code is written in Python. Source code is well documented, very modular, with 95% unit test coverage.

    It uses this awesome Python library called Click to manage the command line interaction and uses Docker to run Lambda functions locally.

    We think you'll like the code base. Clone it and run `make pr` or `./Make -pr` on Windows!

    ## Related Repositories and Resources

    + **SAM Transform** [Open source template specification](https://github.com/aws/serverless-application-model/) that provides shorthand syntax for CloudFormation

    + **SAM CLI application templates** Get started quickly with [predefined application templates](https://github.com/aws/aws-sam-cli-app-templates/blob/master/README.md) for all supported runtimes and languages, used by `sam init`

    + **Lambda Builders** [Lambda builder tools](https://github.com/aws/aws-lambda-builders) for supported runtimes and custom build workflows, used by `sam build`

    + **Build and local emulation images for CI/CD tools** [Build container images](https://gallery.ecr.aws/sam/) to use with CI/CD tasks 

    * **SAM Transform** [Open source template specification](https://github.com/aws/serverless-application-model/) that provides shorthand syntax for CloudFormation

    * **SAM CLI application templates** Get started quickly with [predefined application templates](https://github.com/aws/aws-sam-cli-app-templates/blob/master/README.md) for all supported runtimes and languages, used by `sam init`

    * **Lambda Builders** [Lambda builder tools](https://github.com/aws/aws-lambda-builders) for supported runtimes and custom build workflows, used by `sam build`

    * **Build and local emulation images for CI/CD tools** [Build container images](https://gallery.ecr.aws/sam/) to use with CI/CD tasks

    ## Contribute to SAM

    We love our contributors ❤️ We have over 100 contributors who have built various parts of the product. 

    We love our contributors ❤️ We have over 100 contributors who have built various parts of the product.

    Read this [testimonial from @ndobryanskyy](https://www.lohika.com/aws-sam-my-exciting-first-open-source-experience/) to learn

    more about what it was like contributing to SAM. 

    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;

    @@ -84,21 +82,20 @@ Make pull requests, report bugs, and share ideas to improve the full SAM templat
  
    Source code is located on Github at [aws/serverless-application-model](https://github.com/aws/serverless-application-model).

    Read the [SAM Specification Contributing Guide](https://github.com/aws/serverless-application-model/blob/master/CONTRIBUTING.md)

    to get started.

    **Strengthen SAM CLI**

    Add new commands, enhance existing ones, report bugs, or request new features for the SAM CLI.

    Source code is located on Github at [aws/aws-sam-cli](https://github.com/aws/aws-sam-cli). Read the [SAM CLI Contributing Guide](https://github.com/aws/aws-sam-cli/blob/develop/CONTRIBUTING.md) to

    get started. 

    get started.

    **Update SAM Developer Guide**

    [SAM Developer Guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/index.html) provides a 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. 

    started.

    ### Join the SAM Community on Slack

    [Join the SAM developers channel (#samdev)](https://join.slack.com/t/awsdevelopers/shared_invite/zt-yryddays-C9fkWrmguDv0h2EEDzCqvw) on Slack to collaborate with fellow community members and the AWS SAM team.

    [Join the SAM developers channel (#samdev)](https://join.slack.com/t/awsdevelopers/shared_invite/zt-yryddays-C9fkWrmguDv0h2EEDzCqvw) on Slack to collaborate with fellow community members and the AWS SAM team.

appveyor-iac-integration-ubuntu.yml

This file was deleted.

appveyor-windows.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 +134,28 @@ install: @@
       # Echo final Path
       - "echo %PATH%"
-      - "IF DEFINED BY_CANARY ECHO Logging in Public ECR && aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws"
+      # use amazon-ecr-credential-helper
+      - choco install amazon-ecr-credential-helper
+      - ps: "
+        $docker_config = Get-Content $env:HOME/.docker/config.json -raw | ConvertFrom-Json;
+        $docker_config.credsStore = 'ecr-login';
+        $docker_config | ConvertTo-Json | set-content $env:HOME/.docker/config.json;
+      "
+      - ps: "get-content $env:HOME/.docker/config.json"
+      # claim some disk space before starting the tests
+      - "docker system prune -a -f"
+      # activate virtual environment
+      - "venv\\Scripts\\activate"
+      # claim some disk space before starting the tests
+      - "docker system prune -a -f"
+      # activate virtual environment
+      - "venv\\Scripts\\activate"
       # claim some disk space before starting the tests
       - "docker system prune -a -f"
@@ Expand Down @@

pytest.ini

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,7 @@ filterwarnings = @@
         error
         ignore::DeprecationWarning:docker
         default::ResourceWarning
+    ;   The following deprecation warnings are treated as failures unless we explicitly tell pytest not to
+    ;   Remove once we no longer support python3.7
+        ignore::boto3.exceptions.PythonDeprecationWarning

requirements/base.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,13 +1,14 @@
  
    chevron~=0.12

    click~=8.0

    # 8.1.4 of Click has an issue with the typing breaking the linter - https://github.com/pallets/click/issues/2558

    click~=8.0,!=8.1.4

    Flask<2.3

    #Need to add latest lambda changes which will return invoke mode details

    boto3>=1.26.109,==1.*

    jmespath~=1.0.1

    ruamel_yaml~=0.17.21

    ruamel_yaml~=0.17.32

    PyYAML>=5.4.1,==5.*

    cookiecutter~=2.1.1

    aws-sam-translator==1.69.0

    aws-sam-translator==1.71.0

    #docker minor version updates can include breaking changes. Auto update micro version only.

    docker~=6.1.0

    dateparser~=1.1

    @@ -18,6 +19,8 @@ tomlkit==0.11.8
  
    watchdog==2.1.2

    rich~=13.3.3

    pyopenssl~=23.2.0

    # Pin to <4.18 to until SAM-T no longer uses RefResolver

    jsonschema<4.18

    # Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8

    typing_extensions~=4.4.0

requirements/dev.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,7 +9,7 @@ pytest-cov==4.1.0
  
    # here we fix its version and upgrade it manually in the future

    mypy==1.3.0

    boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]==1.26.131

    types-pywin32==306.0.0.0

    types-pywin32==306.0.0.2

    types-PyYAML==6.0.12

    types-chevron==0.14.2.4

    types-psutil==5.9.5.12

    @@ -33,7 +33,7 @@ pytest-rerunfailures==11.1.2
  
    # NOTE (hawflau): DO NOT upgrade pytest-metadata and pytest-json-report unless pytest-json-report addresses https://github.com/numirias/pytest-json-report/issues/89

    pytest-metadata==2.0.4

    pytest-json-report==1.5.0

    filelock==3.12.0

    filelock==3.12.2

    # formatter

    black==22.6.0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Update feat/config-files branch with changes from develop #5466

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!