Skip to content

Commit

Permalink
Merge branch 'master' into remove-node14
Browse files Browse the repository at this point in the history
  • Loading branch information
hawflau committed Dec 4, 2023
2 parents 779c864 + f1f83d6 commit 9e72e9a
Show file tree
Hide file tree
Showing 194 changed files with 48 additions and 7,103 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.8.2" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.5.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>

<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.0.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.4.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.0.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.4.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>

<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.5.0" />
{%- if cookiecutter["Powertools for AWS Lambda (.NET) Tracing"] == "enabled"%}
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.3.2" />
{%- endif %}
{%- if cookiecutter["Powertools for AWS Lambda (.NET) Metrics"] == "enabled"%}
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="1.4.2" />
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="1.5.3" />
{%- endif %}
{%- if cookiecutter["Powertools for AWS Lambda (.NET) Logging"] == "enabled"%}
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.3.2" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.4.4" />
{%- endif %}
</ItemGroup>
</Project>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>

<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
</ItemGroup>
</Project>

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>

<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.SNSEvents" Version="2.0.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.SNSEvents" Version="2.1.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
</ItemGroup>
</Project>
69 changes: 0 additions & 69 deletions manifest-v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -943,65 +943,6 @@
"useCaseName": "Hello World Example"
}
],
"python3.7": [
{
"directory": "python3.7/hello",
"displayName": "Hello World Example",
"dependencyManager": "pip",
"appTemplate": "hello-world",
"packageType": "Zip",
"useCaseName": "Hello World Example"
},
{
"directory": "python3.7/hello-pt",
"displayName": "Hello World Example Python With Powertools for AWS Lambda",
"dependencyManager": "pip",
"appTemplate": "hello-world-powertools-python",
"packageType": "Zip",
"useCaseName": "Hello World Example with Powertools for AWS Lambda"
},
{
"directory": "python3.7/event-bridge",
"displayName": "EventBridge Hello World",
"dependencyManager": "pip",
"appTemplate": "eventBridge-hello-world",
"packageType": "Zip",
"useCaseName": "Infrastructure event management"
},
{
"directory": "python3.7/event-bridge-schema",
"displayName": "EventBridge App from scratch (100+ Event Schemas)",
"dependencyManager": "pip",
"appTemplate": "eventBridge-schema-app",
"isDynamicTemplate": "True",
"packageType": "Zip",
"useCaseName": "Infrastructure event management"
},
{
"directory": "python3.7/step-func",
"displayName": "Step Functions Sample App (Stock Trader)",
"dependencyManager": "pip",
"appTemplate": "step-functions-sample-app",
"packageType": "Zip",
"useCaseName": "Multi-step workflow"
},
{
"directory": "python3.7/web-conn",
"displayName": "Quick Start: Web Backend With Connectors",
"dependencyManager": "pip",
"appTemplate": "hello-world-connector",
"packageType": "Zip",
"useCaseName": "Serverless Connector Hello World Example"
},
{
"directory": "python3.7/step-func-conn",
"displayName": "Step Functions Sample App (Stock Trader) With Connectors",
"dependencyManager": "pip",
"appTemplate": "step-functions-with-connectors",
"packageType": "Zip",
"useCaseName": "Multi-step workflow with Connectors"
}
],
"python3.8": [
{
"directory": "python3.8/hello",
Expand Down Expand Up @@ -1709,16 +1650,6 @@
"useCaseName": "Hello World Example"
}
],
"amazon/python3.7-base": [
{
"directory": "python3.7/hello-img",
"displayName": "Hello World Lambda Image Example",
"dependencyManager": "pip",
"appTemplate": "hello-world-lambda-image",
"packageType": "Image",
"useCaseName": "Hello World Example"
}
],
"amazon/java8-base": [
{
"directory": "java8/hello-img-gradle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "SAM CLI",
"license": "MIT",
"dependencies": {
"axios": ">=0.21.1"
"axios": ">=1.6.0"
},
"scripts": {
"test": "mocha tests/unit/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "SAM CLI",
"license": "MIT",
"dependencies": {
"axios": ">=0.21.1"
"axios": ">=1.6.0"
},
"scripts": {
"test": "mocha tests/unit/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "vitest"
},
"dependencies": {
"axios": "^0.22.0",
"axios": "^1.6.0",
"core-js": "^3.18.1",
"vue": "^3.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "SAM CLI",
"license": "MIT",
"dependencies": {
"axios": ">=0.21.1"
"axios": ">=1.6.0"
},
"scripts": {
"test": "mocha tests/unit/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "SAM CLI",
"license": "MIT",
"dependencies": {
"axios": ">=0.21.1"
"axios": ">=1.6.0"
},
"scripts": {
"test": "mocha tests/unit/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "vitest"
},
"dependencies": {
"axios": "^0.22.0",
"axios": "^1.6.0",
"core-js": "^3.18.1",
"vue": "^3.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "SAM CLI",
"license": "MIT",
"dependencies": {
"axios": ">=0.21.1"
"axios": ">=1.6.0"
},
"scripts": {
"test": "mocha tests/unit/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "SAM CLI",
"license": "MIT",
"dependencies": {
"axios": ">=0.21.1"
"axios": ">=1.6.0"
},
"scripts": {
"test": "mocha tests/unit/"
Expand Down
1 change: 0 additions & 1 deletion python3.10/hello-img/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Generate a boilerplate template in your current project directory using the foll
* **Python 3.10**: `sam init --runtime python3.10`
* **Python 3.9**: `sam init --runtime python3.9`
* **Python 3.8**: `sam init --runtime python3.8`
* **Python 3.7**: `sam init --runtime python3.7`

> **NOTE**: ``--name`` allows you to specify a different project folder name (`sam-app` is the default)
Expand Down
1 change: 0 additions & 1 deletion python3.11/hello-img/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Generate a boilerplate template in your current project directory using the foll
* **Python 3.10**: `sam init --runtime python3.10`
* **Python 3.9**: `sam init --runtime python3.9`
* **Python 3.8**: `sam init --runtime python3.8`
* **Python 3.7**: `sam init --runtime python3.7`

> **NOTE**: ``--name`` allows you to specify a different project folder name (`sam-app` is the default)
Expand Down
1 change: 0 additions & 1 deletion python3.12/hello-img/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Generate a boilerplate template in your current project directory using the foll
- **Python 3.10**: `sam init --runtime python3.10`
- **Python 3.9**: `sam init --runtime python3.9`
- **Python 3.8**: `sam init --runtime python3.8`
- **Python 3.7**: `sam init --runtime python3.7`

> **NOTE**: `--name` allows you to specify a different project folder name (`sam-app` is the default)
Expand Down
Empty file removed python3.7/__init__.py
Empty file.
Loading

0 comments on commit 9e72e9a

Please sign in to comment.