Skip to content

Commit d68ea22

Browse files
karpikplkarpikpl
authored
Merge pull request #1 from aws/master
updating master
2 parents 8d25d2e + 1a76fa0 commit d68ea22

File tree

166 files changed

+12149
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+12149
-526
lines changed

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<None Include="serverless.template" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="3.0.1" />
18+
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="3.0.4" />
1919
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
2020
</ItemGroup>
2121
</Project>

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Logging": {
33
"LogLevel": {
4-
"Default": "Warning"
4+
"Default": "Information"
55
}
66
}
77
}

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebAPI/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
9-
<PackageReference Include="AWSSDK.S3" Version="3.3.31.15" />
10-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.6" />
11-
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="3.0.1" />
9+
<PackageReference Include="AWSSDK.S3" Version="3.3.101.11" />
10+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.100.1" />
11+
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="3.0.4" />
1212
</ItemGroup>
1313
</Project>

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebAPI/template/src/BlueprintBaseName.1/appsettings.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
2-
"Lambda.Logging": {
2+
"Logging": {
33
"LogLevel": {
4-
"Default": "Debug",
5-
"Microsoft": "Information"
4+
"Default": "Information"
65
}
76
},
87
"AppS3Bucket": ""

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebAPI/template/src/BlueprintBaseName.1/serverless.template

Lines changed: 121 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,127 @@
11
{
2-
"AWSTemplateFormatVersion" : "2010-09-09",
3-
"Transform" : "AWS::Serverless-2016-10-31",
4-
"Description" : "An AWS Serverless Application that uses the ASP.NET Core framework running in Amazon Lambda.",
2+
"AWSTemplateFormatVersion": "2010-09-09",
3+
"Transform": "AWS::Serverless-2016-10-31",
4+
"Description": "An AWS Serverless Application that uses the ASP.NET Core framework running in Amazon Lambda.",
55

6-
"Parameters" : {
7-
"ShouldCreateBucket" : {
8-
"Type" : "String",
9-
"AllowedValues" : ["true", "false"],
10-
"Description" : "If true then the S3 bucket that will be proxied will be created with the CloudFormation stack."
11-
},
12-
"BucketName" : {
13-
"Type" : "String",
14-
"Description" : "Name of S3 bucket that will be proxied. If left blank a name will be generated.",
15-
"MinLength" : "0"
16-
}
17-
},
6+
"Parameters": {
7+
"ShouldCreateBucket": {
8+
"Type": "String",
9+
"AllowedValues": [
10+
"true",
11+
"false"
12+
],
13+
"Description": "If true then the S3 bucket that will be proxied will be created with the CloudFormation stack."
14+
},
15+
"BucketName": {
16+
"Type": "String",
17+
"Description": "Name of S3 bucket that will be proxied. If left blank a name will be generated.",
18+
"MinLength": "0"
19+
}
20+
},
21+
"Conditions": {
22+
"CreateS3Bucket": {
23+
"Fn::Equals": [
24+
{
25+
"Ref": "ShouldCreateBucket"
26+
},
27+
"true"
28+
]
29+
},
30+
"BucketNameGenerated": {
31+
"Fn::Equals": [
32+
{
33+
"Ref": "BucketName"
34+
},
35+
""
36+
]
37+
}
38+
},
1839

19-
"Conditions" : {
20-
"CreateS3Bucket" : {"Fn::Equals" : [{"Ref" : "ShouldCreateBucket"}, "true"]},
21-
"BucketNameGenerated" : {"Fn::Equals" : [{"Ref" : "BucketName"}, ""]}
22-
},
40+
"Resources": {
41+
"AspNetCoreFunction": {
42+
"Type": "AWS::Serverless::Function",
43+
"Properties": {
44+
"Handler": "BlueprintBaseName.1::BlueprintBaseName._1.LambdaEntryPoint::FunctionHandlerAsync",
45+
"Runtime": "dotnetcore2.1",
46+
"CodeUri": "",
47+
"MemorySize": 256,
48+
"Timeout": 30,
49+
"Role": null,
50+
"Policies": [
51+
"AWSLambdaFullAccess"
52+
],
53+
"Environment": {
54+
"Variables": {
55+
"AppS3Bucket": {
56+
"Fn::If": [
57+
"CreateS3Bucket",
58+
{
59+
"Ref": "Bucket"
60+
},
61+
{
62+
"Ref": "BucketName"
63+
}
64+
]
65+
}
66+
}
67+
},
68+
"Events": {
69+
"ProxyResource": {
70+
"Type": "Api",
71+
"Properties": {
72+
"Path": "/{proxy+}",
73+
"Method": "ANY"
74+
}
75+
},
76+
"RootResource": {
77+
"Type": "Api",
78+
"Properties": {
79+
"Path": "/",
80+
"Method": "ANY"
81+
}
82+
}
83+
}
84+
}
85+
},
2386

24-
"Resources" : {
87+
"Bucket": {
88+
"Type": "AWS::S3::Bucket",
89+
"Condition": "CreateS3Bucket",
90+
"Properties": {
91+
"BucketName": {
92+
"Fn::If": [
93+
"BucketNameGenerated",
94+
{
95+
"Ref": "AWS::NoValue"
96+
},
97+
{
98+
"Ref": "BucketName"
99+
}
100+
]
101+
}
102+
}
103+
}
104+
},
25105

26-
"AspNetCoreFunction" : {
27-
"Type" : "AWS::Serverless::Function",
28-
"Properties": {
29-
"Handler": "BlueprintBaseName.1::BlueprintBaseName._1.LambdaEntryPoint::FunctionHandlerAsync",
30-
"Runtime": "dotnetcore2.1",
31-
"CodeUri": "",
32-
"MemorySize": 256,
33-
"Timeout": 30,
34-
"Role": null,
35-
"Policies": [ "AWSLambdaFullAccess" ],
36-
"Environment" : {
37-
"Variables" : {
38-
"AppS3Bucket" : { "Fn::If" : ["CreateS3Bucket", {"Ref":"Bucket"}, { "Ref" : "BucketName" } ] }
39-
}
40-
},
41-
"Events": {
42-
"ProxyResource": {
43-
"Type": "Api",
44-
"Properties": {
45-
"Path": "/{proxy+}",
46-
"Method": "ANY"
47-
}
48-
},
49-
"RootResource": {
50-
"Type": "Api",
51-
"Properties": {
52-
"Path": "/",
53-
"Method": "ANY"
54-
}
55-
}
56-
}
57-
}
58-
},
59-
60-
"Bucket" : {
61-
"Type" : "AWS::S3::Bucket",
62-
"Condition" : "CreateS3Bucket",
63-
"Properties" : {
64-
"BucketName" : { "Fn::If" : ["BucketNameGenerated", {"Ref" : "AWS::NoValue" }, { "Ref" : "BucketName" } ] }
65-
}
66-
}
67-
},
68-
69-
"Outputs" : {
70-
"ApiURL" : {
71-
"Description" : "API endpoint URL for Prod environment",
72-
"Value" : { "Fn::Sub" : "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/" }
73-
},
74-
"S3ProxyBucket" : {
75-
"Value" : { "Fn::If" : ["CreateS3Bucket", {"Ref":"Bucket"}, { "Ref" : "BucketName" } ] }
76-
}
77-
}
106+
"Outputs": {
107+
"ApiURL": {
108+
"Description": "API endpoint URL for Prod environment",
109+
"Value": {
110+
"Fn::Sub": "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
111+
}
112+
},
113+
"S3ProxyBucket": {
114+
"Value": {
115+
"Fn::If": [
116+
"CreateS3Bucket",
117+
{
118+
"Ref": "Bucket"
119+
},
120+
{
121+
"Ref": "BucketName"
122+
}
123+
]
124+
}
125+
}
126+
}
78127
}

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebAPI/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="Amazon.Lambda.Core" Version="1.1.0" />
1919
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="1.1.0" />
2020
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="1.2.0" />
21-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.6" />
21+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.100.1" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
2323
<PackageReference Include="xunit" Version="2.3.1" />
2424
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebApp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AWSProjectType>Lambda</AWSProjectType>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="3.0.1" />
8+
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="3.0.4" />
99
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
1010
</ItemGroup>
1111
<ItemGroup>

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/AspNetCoreWebApp/template/src/BlueprintBaseName.1/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Logging": {
33
"IncludeScopes": false,
44
"LogLevel": {
5-
"Default": "Warning"
5+
"Default": "Information"
66
}
77
}
88
}

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/ChatBotTutorial/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<ItemGroup>
88
<PackageReference Include="Amazon.Lambda.Core" Version="1.1.0" />
99
<PackageReference Include="Amazon.Lambda.LexEvents" Version="1.1.0" />
10-
<PackageReference Include="Amazon.Lambda.Serialization.Json" Version="1.4.0" />
10+
<PackageReference Include="Amazon.Lambda.Serialization.Json" Version="1.5.0" />
1111
</ItemGroup>
1212
</Project>

‎Blueprints/BlueprintDefinitions/Msbuild-NETCore_2_1/CustomRuntimeFunction-FSharp/blueprint-manifest.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"display-name":"Custom Runtime Function",
3+
"system-name":"CustomRuntimeFunction",
4+
"description": "Use Lambda Custom Runtime feature to build Lambda functions using .NET Core 2.2 or 3.0.",
5+
"sort-order" : 101,
6+
"hidden-tags" : ["F#","LambdaProject"],
7+
"tags":["Custom"]
8+
}

0 commit comments

Comments
 (0)