Merge from aws/aws-sam-cli/develop

.github/workflows/validate_pyinstaller.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - develop
 
+env:
+  CI_OVERRIDE: "1"
+
 jobs:
   build-for-linux:
     name: build-pyinstaller-linux
@@ -15,15 +18,20 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
       - name: Build PyInstaller
         run: |
           chmod +x ./installer/pyinstaller/build-linux.sh
-          CI_OVERRIDE=1 ./installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip
+          ./installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip
       - name: Basic tests for PyInstaller
         run: |
           unzip .build/output/aws-sam-cli-linux-x86_64.zip -d sam-installation
           ./sam-installation/install
           sam-beta --version
+          ./tests/sanity-check.sh
       - uses: actions/upload-artifact@v3
         with:
           name: pyinstaller-linux-zip
@@ -41,15 +49,20 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.7"
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
       - name: Build PyInstaller
         run: |
           chmod +x ./installer/pyinstaller/build-mac.sh
-          CI_OVERRIDE=1 ./installer/pyinstaller/build-mac.sh aws-sam-cli-macos-x86_64.zip
+          ./installer/pyinstaller/build-mac.sh aws-sam-cli-macos-x86_64.zip
       - name: Basic tests for PyInstaller
         run: |
           unzip .build/output/aws-sam-cli-macos-x86_64.zip -d sam-installation
           sudo ./sam-installation/install
           sam-beta --version
+          ./tests/sanity-check.sh
       - uses: actions/upload-artifact@v3
         with:
           name: pyinstaller-macos-zip

.gitignore

@@ -412,19 +412,16 @@ coverage.xml
 
 # Temporary scratch directory used by the tests
 tests/integration/buildcmd/scratch
-tests/integration/testdata/buildcmd/Dotnetcore2.0/bin
-tests/integration/testdata/buildcmd/Dotnetcore2.0/obj
-tests/integration/testdata/buildcmd/Dotnetcore2.1/bin
-tests/integration/testdata/buildcmd/Dotnetcore2.1/obj
-tests/integration/testdata/buildcmd/Dotnetcore3.1/bin
-tests/integration/testdata/buildcmd/Dotnetcore3.1/obj
 tests/integration/testdata/buildcmd/Dotnet6/bin
 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
+

README.md

@@ -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.

designs/build_debug_artifacts.md

@@ -16,7 +16,7 @@ We will introduce a way in `sam build` to produce these debuggable artifacts for
 Success criteria for the change
 -------------------------------
 
-1. Artifacts generated will be debuggable for runtimes DotNetCore 2.0 and above. 
+1. Artifacts generated will be debuggable for runtimes DotNet 6.0 and above. 
 
 Out-of-Scope
 ------------

designs/sam_build_cmd.md

@@ -494,7 +494,7 @@ build actions. This section will look like:
     "build": {
         "actions": {
             "java8": "gradle build",
-            "dotnetcore2.1": "./build.sh"
+            "dotnet6": "./build.sh"
         }
     }
 }

requirements/base.txt

@@ -7,7 +7,7 @@ jmespath~=1.0.1
 ruamel_yaml~=0.17.21
 PyYAML>=5.4.1,==5.*
 cookiecutter~=2.1.1
-aws-sam-translator==1.69.0
+aws-sam-translator==1.70.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=6.1.0
 dateparser~=1.1

requirements/reproducible-linux.txt

@@ -19,9 +19,9 @@ aws-lambda-builders==1.34.0 \
     --hash=sha256:0790f7e9b7ee7286b96fbcf49450c5be0341bb7cb852ca7d74beae190139eb48 \
     --hash=sha256:20456a942a417407b42ecf8ab7fce6a47306fd063051e7cb09d02d1be24d5cf3
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.69.0 \
-    --hash=sha256:bf26c061675f20367e87d48963ada1ec983a8d897e85db02d0f35913a6174bb0 \
-    --hash=sha256:c6ed7a25c77d30d3d31156049415d15fde46c0d3b77a4c5cdc0ef8b53ba9bca2
+aws-sam-translator==1.70.0 \
+    --hash=sha256:753288eda07b057e5350773b7617076962b59404d49cd05e2259ac96a7694436 \
+    --hash=sha256:a2df321607d29791893707ef2ded9e79be00dbb71ac430696f6e6d7d0b0301a5
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint

requirements/reproducible-mac.txt

@@ -19,9 +19,9 @@ aws-lambda-builders==1.34.0 \
     --hash=sha256:0790f7e9b7ee7286b96fbcf49450c5be0341bb7cb852ca7d74beae190139eb48 \
     --hash=sha256:20456a942a417407b42ecf8ab7fce6a47306fd063051e7cb09d02d1be24d5cf3
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.69.0 \
-    --hash=sha256:bf26c061675f20367e87d48963ada1ec983a8d897e85db02d0f35913a6174bb0 \
-    --hash=sha256:c6ed7a25c77d30d3d31156049415d15fde46c0d3b77a4c5cdc0ef8b53ba9bca2
+aws-sam-translator==1.70.0 \
+    --hash=sha256:753288eda07b057e5350773b7617076962b59404d49cd05e2259ac96a7694436 \
+    --hash=sha256:a2df321607d29791893707ef2ded9e79be00dbb71ac430696f6e6d7d0b0301a5
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.88.0"
+__version__ = "1.89.0"

samcli/commands/build/command.py

@@ -54,7 +54,7 @@
   2. Nodejs 18.x, 16.x, 14.x, 12.x using NPM\n
   3. Ruby 2.7, 3.2 using Bundler\n
   4. Java 8, Java 11, Java 17 using Gradle and Maven\n
-  5. Dotnetcore 3.1, Dotnet6 using Dotnet CLI (without --use-container)\n
+  5. Dotnet6 using Dotnet CLI (without --use-container)\n
   6. Go 1.x using Go Modules (without --use-container)\n
 """
 

samcli/commands/init/init_templates.py

@@ -211,17 +211,17 @@ def get_preprocessed_manifest(
         """
         This method get the manifest cloned from the git repo and preprocessed it.
         Below is the link to manifest:
-        https://github.com/aws/aws-sam-cli-app-templates/blob/master/manifest.json
+        https://github.com/aws/aws-sam-cli-app-templates/blob/master/manifest-v2.json
         The structure of the manifest is shown below:
         {
-            "dotnetcore3.1": [
+            "dotnet6": [
                 {
-                    "directory": "dotnetcore3.1/cookiecutter-aws-sam-hello-dotnet",
+                    "directory": "dotnet6/hello",
                     "displayName": "Hello World Example",
                     "dependencyManager": "cli-package",
                     "appTemplate": "hello-world",
                     "packageType": "Zip",
-                    "useCaseName": "Serverless API"
+                    "useCaseName": "Hello World Example"
                 },
             ]
         }

samcli/lib/build/constants.py

@@ -10,6 +10,7 @@
     "nodejs10.x",
     "dotnetcore2.0",
     "dotnetcore2.1",
+    "dotnetcore3.1",
     "python2.7",
     "python3.6",
     "ruby2.5",

samcli/lib/build/workflow_config.py

@@ -161,7 +161,6 @@ def get_workflow_config(
         "nodejs18.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "ruby2.7": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG),
         "ruby3.2": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG),
-        "dotnetcore3.1": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG),
         "dotnet6": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG),
         "go1.x": BasicWorkflowSelector(GO_MOD_CONFIG),
         # When Maven builder exists, add to this list so we can automatically choose a builder based on the supported

samcli/lib/init/local_manifest.json

@@ -1,5 +1,5 @@
 {
-    "dotnetcore3.1": [
+    "dotnet6": [
         {
             "directory": "template/cookiecutter-aws-sam-hello-dotnet",
             "displayName": "Hello World Example",

samcli/lib/init/templates/cookiecutter-aws-sam-hello-dotnet/cookiecutter.json

@@ -1,6 +1,6 @@
 {
     "project_name": "Name of the project",
-    "runtime": "dotnetcore3.1",
+    "runtime": "dotnet6",
     "architectures": {
         "value": [
             "x86_64"

samcli/lib/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/HelloWorld.csproj

@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    {%- if cookiecutter.runtime == 'dotnetcore3.1' %}
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    {%- else %}
     <TargetFramework>net6.0</TargetFramework>
-    {%- endif %}
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 

samcli/lib/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/aws-lambda-tools-defaults.json

@@ -11,9 +11,6 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  {%- if cookiecutter.runtime == 'dotnetcore3.1' %}
-  "framework" : "netcoreapp3.1",
-  {%- endif %}
   "function-runtime":"{{ cookiecutter.runtime }}",
   "function-memory-size" : 256,
   "function-timeout" : 30,

samcli/lib/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/template.yaml

@@ -14,8 +14,8 @@ Resources:
     Properties:
       CodeUri: ./src/HelloWorld/
       Handler: HelloWorld::HelloWorld.Function::FunctionHandler
-      {%- if cookiecutter.runtime == 'dotnetcore3.1' %}
-      Runtime: dotnetcore3.1
+      {%- if cookiecutter.runtime == 'dotnet6' %}
+      Runtime: dotnet6
       {%- endif %}
       Architectures:
       {%- for arch in cookiecutter.architectures.value %}

samcli/lib/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj

@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    {%- if cookiecutter.runtime == 'dotnetcore3.1' %}
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    {%- else %}
+    {%- if cookiecutter.runtime == 'dotnet6' %}
     <TargetFramework>net6.0</TargetFramework>
     {%- endif %}
   </PropertyGroup>

samcli/lib/utils/architecture.py

@@ -29,7 +29,6 @@
     "java11": [ARM64, X86_64],
     "java17": [ARM64, X86_64],
     "go1.x": [X86_64],
-    "dotnetcore3.1": [ARM64, X86_64],
     "dotnet6": [ARM64, X86_64],
     "provided": [X86_64],
     "provided.al2": [ARM64, X86_64],