Update additional templates to use annotations #1287

ashovlin · 2022-08-26T23:57:09Z

Issue #, if available: DOTNET-6189

Description of changes:
Updates to the Visual Studio 2022 templates:

Updated Lambda Empty Serverless to use annotations. Instructions are provided in the readme to manually revert to the older style.
Updated Lambda Empty Serverless (.NET 6 Container Image) to use annotations. Instructions are provided in the readme to manually revert to the older style.
Updated the Annotations Framework template to remove "preview" language.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

...ueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Function.cs

normj · 2022-08-29T23:00:26Z

...ueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Function.cs

-    /// <returns>The API Gateway response.</returns>
-    public APIGatewayProxyResponse Get(APIGatewayProxyRequest request, ILambdaContext context)
+    /// <remarks>
+    /// This uses the Lambda Annotations programming model to bridge the gap between 


Can you add a link to the README also call out that it takes care of syncing with CloudFormation. It is important users realize this change in behavior.

I added both:

A link to the GitHub readme

A line about template syncing.

I couldn't figure out how to do a <see> link to the local readme, I think because it's not a .NET object.

...BlueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Readme.md

...ueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Function.cs

...nts/BlueprintDefinitions/vs2022/EmptyServerless/template/src/BlueprintBaseName.1/Function.cs

normj · 2022-08-29T23:09:22Z

Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/blueprint-manifest.json

@@ -1,7 +1,7 @@
 {
  "display-name": "Annotations Framework",
  "system-name": "Annotations",
-  "description": "(Preview) Use the .NET Lambda Annotations framework to write Lambda Functions.",
+  "description": "Use the .NET Lambda Annotations framework to write Lambda Functions.",


Rename this to Annotations Framework Sample

Edit the description to here to show how this is a sample to demonstrate the features of the framework.

Show off the DI by adding an ICalculatorService and registering it in the DI. Then updated Startup class to register it.

In the test project you could create a Mock ICalculatorService to show how with DI you can mocking the services.

Done.

I only injected the ICalculatorService into the constructor since that felt more realistic, but we could also do a [FromServices] for the sake of it.

.../BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Readme.md

…ew messaging from annotations template

… package version

ashovlin · 2023-07-14T21:34:58Z

Finished a round of updates:

Annotations-related blueprints now rely on 1.0.0
serverless.Annotations was missing from the testing target in the build.proj, added it
Incremented Amazon.Lambda.Templates 16.13.1 -> 16.14.0

ashovlin · 2023-07-14T21:38:10Z

.../BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Readme.md

@@ -1,10 +1,18 @@
-# .NET Lambda Annotations Framework (Preview)
+# Amazon.Lambda.Annotations


This is just the entire package README copied and pasted, don't think we need to re-review content here

normj

I did a sanity check deployment through Visual Studio with 3 templates being updated here and they all deployed correctly.

Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/blueprint-manifest.json

...ions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

...initions/vs2022/AnnotationsFramework/template/test/BlueprintBaseName.1.Tests/FunctionTest.cs

...ts/BlueprintDefinitions/vs2022/EmptyServerless/template/src/BlueprintBaseName.1/Functions.cs

...BlueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Readme.md

...rints/BlueprintDefinitions/vs2022/EmptyServerless/template/src/BlueprintBaseName.1/Readme.md

...nts/BlueprintDefinitions/vs2022/AnnotationsFramework/template/.template.config/template.json

...ions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

philasmar · 2023-07-17T13:06:04Z

...BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Startup.cs

@@ -15,6 +15,9 @@ public class Startup
    /// </summary>
    public void ConfigureServices(IServiceCollection services)
    {
+        // Here we'll add an instance of our calculator service that be used by each function


nit: missing "will" before "be used"

...nitions/vs2022/AnnotationsFramework/template/test/BlueprintBaseName.1.Tests/FunctionsTest.cs

...nnotationsFramework/template/src/BlueprintBaseName.1/CalculatorService/ICalculatorService.cs

...AnnotationsFramework/template/src/BlueprintBaseName.1/CalculatorService/CalculatorService.cs

...eprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Functions.cs

...BlueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Readme.md

...lueprintDefinitions/vs2022/EmptyServerless-Image/template/src/BlueprintBaseName.1/Startup.cs

...rints/BlueprintDefinitions/vs2022/EmptyServerless/template/src/BlueprintBaseName.1/Readme.md

...ints/BlueprintDefinitions/vs2022/EmptyServerless/template/src/BlueprintBaseName.1/Startup.cs

ashovlin requested review from normj, 96malhar and philasmar August 26, 2022 23:57

normj requested changes Aug 29, 2022

View reviewed changes

ashovlin force-pushed the shovlia/annotations-template-updates branch 2 times, most recently from ee17af0 to 48a3d87 Compare August 31, 2022 21:16

ashovlin requested a review from normj August 31, 2022 21:26

philasmar approved these changes Sep 1, 2022

View reviewed changes

ashovlin changed the title ~~Update additional templates to use annotations~~ Update additional templates to use annotations [hold until 1.0] Sep 12, 2022

ashishdhingra added the feature-request A feature should be added or improved. label Oct 11, 2022

ashovlin force-pushed the shovlia/annotations-template-updates branch from 48a3d87 to 972f0d0 Compare July 14, 2023 15:12

Update EmptyServerless templates to use annotations, and remove previ…

bec4d79

…ew messaging from annotations template

ashovlin force-pushed the shovlia/annotations-template-updates branch from 972f0d0 to bec4d79 Compare July 14, 2023 15:13

ashovlin changed the base branch from features/annotations-templates-ga to dev July 14, 2023 15:15

normj and others added 3 commits July 14, 2023 11:09

Fix tests for empty serverless blueprint

88da6dc

Update additional template to use 1.0.0 of Annotations

ece0bae

Fix merge conflicts in annotations blueprints, and increment template…

c44572a

… package version

ashovlin changed the title ~~Update additional templates to use annotations [hold until 1.0]~~ Update additional templates to use annotations Jul 14, 2023

ashovlin requested a review from philasmar July 14, 2023 21:33

ashovlin commented Jul 14, 2023

View reviewed changes

normj requested changes Jul 14, 2023

View reviewed changes

Polish annotations-related blueprints

322d8d2

ashovlin requested a review from normj July 15, 2023 01:25

normj approved these changes Jul 15, 2023

View reviewed changes

philasmar approved these changes Jul 17, 2023

View reviewed changes

Further polish annotations-related blueprints

c535beb

ashovlin merged commit 7e1f386 into dev Jul 17, 2023

ashovlin deleted the shovlia/annotations-template-updates branch July 17, 2023 14:14

		@@ -1,10 +1,18 @@
		# .NET Lambda Annotations Framework (Preview)
		# Amazon.Lambda.Annotations

Update additional templates to use annotations #1287

Update additional templates to use annotations #1287

Uh oh!

Conversation

ashovlin commented Aug 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

normj Aug 29, 2022

Choose a reason for hiding this comment

Uh oh!

ashovlin Aug 31, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

normj Aug 29, 2022

Choose a reason for hiding this comment

Uh oh!

ashovlin Aug 31, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ashovlin commented Jul 14, 2023

Uh oh!

ashovlin Jul 14, 2023

Choose a reason for hiding this comment

Uh oh!

normj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

philasmar Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ashovlin commented Aug 26, 2022 •

edited

Loading