Merge branch 'dev'

Author: ashovlin

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

@@ -1,15 +1,13 @@
 {
-  "display-name": "Annotations Framework",
+  "display-name": "Annotations Framework Sample",
   "system-name": "Annotations",
-  "description": "(Preview) Use the .NET Lambda Annotations framework to write Lambda Functions.",
+  "description": "Sample application demonstrating how to use the Lambda Annotations framework.",
   "sort-order": 120,
   "hidden-tags": [
     "C#",
     "ServerlessProject"
   ],
   "tags": [
-    "Container",
-    "Annotations",
-    "Preview"
+    "Annotations"
   ]
 }

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

@@ -5,7 +5,7 @@
     "Lambda",
     "Serverless"
   ],
-  "name": "Lambda Annotations Framework (Preview)",
+  "name": "Lambda Annotations Framework Sample",
   "identity": "AWS.Lambda.Serverless.Annotations.CSharp",
   "groupIdentity": "AWS.Lambda.Serverless.Annotations",
   "shortName": "serverless.Annotations",

Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

@@ -15,8 +15,13 @@
     <PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.6.0" />
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-    <PackageReference Include="Amazon.Lambda.Annotations" Version="0.13.2" />
+    <PackageReference Include="Amazon.Lambda.Annotations" Version="1.0.0" />
   </ItemGroup>
+  <!-- 
+    The FrameworkReference is used to reduce the deployment bundle size by not having to include 
+    dependencies like Microsoft.Extensions.DependencyInjection. The Microsoft.AspNetCore.App
+    which is available in the Managed .NET Lambda runtime already includes those assemblies.
+  -->
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>

Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/CalculatorService/CalculatorService.cs

@@ -0,0 +1,32 @@
+namespace BlueprintBaseName._1;
+
+/// <summary>
+/// The implementation of <see cref="ICalculatorService"/> 
+/// that will be used by our Lambda functions.
+/// </summary>
+public class CalculatorService : ICalculatorService
+{
+    /// <inheritdoc/>
+    public int Add(int x, int y)
+    {
+        return x + y;
+    }
+
+    /// <inheritdoc/>
+    public int Subtract(int x, int y)
+    {
+        return x - y;
+    }
+
+    /// <inheritdoc/>
+    public int Multiply(int x, int y)
+    {
+        return x * y;
+    }
+
+    /// <inheritdoc/>
+    public int Divide(int x, int y)
+    {
+        return x / y;
+    }
+}

Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/CalculatorService/ICalculatorService.cs

@@ -0,0 +1,39 @@
+namespace BlueprintBaseName._1;
+
+/// <summary>
+/// An interface for a service that implements the business logic of our Lambda functions
+/// </summary>
+public interface ICalculatorService
+{
+    /// <summary>
+    /// Adds x and y together
+    /// </summary>
+    /// <param name="x">Addend</param>
+    /// <param name="y">Addend</param>
+    /// <returns>Sum of x and y</returns>
+    int Add(int x, int y);
+
+    /// <summary>
+    /// Subtracts y from x
+    /// </summary>
+    /// <param name="x">Minuend</param>
+    /// <param name="y">Subtrahend</param>
+    /// <returns>x - y</returns>
+    int Subtract(int x, int y);
+
+    /// <summary>
+    /// Multiplies x and y
+    /// </summary>
+    /// <param name="x">Multiplicand</param>
+    /// <param name="y">Multiplier</param>
+    /// <returns>x * y</returns>
+    int Multiply(int x, int y);
+
+    /// <summary>
+    /// Divides x by y
+    /// </summary>
+    /// <param name="x">Dividend</param>
+    /// <param name="y">Divisor</param>
+    /// <returns>x / y</returns>
+    int Divide(int x, int y);
+}

Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/Functions.cs

@@ -11,11 +11,21 @@ namespace BlueprintBaseName._1;
 /// </summary>
 public class Functions
 {
+    private ICalculatorService _calculatorService;
+
     /// <summary>
     /// Default constructor.
     /// </summary>
-    public Functions()
+    /// <remarks>
+    /// The <see cref="ICalculatorService"/> implementation that we
+    /// instantiated in <see cref="Startup"/> will be injected here.
+    /// 
+    /// As an alternative, a dependency could be injected into each 
+    /// Lambda function handler via the [FromServices] attribute.
+    /// </remarks>
+    public Functions(ICalculatorService calculatorService)
     {
+        _calculatorService = calculatorService;
     }
 
     /// <summary>
@@ -46,8 +56,10 @@ public string Default()
     [HttpApi(LambdaHttpMethod.Get, "/add/{x}/{y}")]
     public int Add(int x, int y, ILambdaContext context)
     {
-        context.Logger.LogInformation($"{x} plus {y} is {x + y}");
-        return x + y;
+        var sum = _calculatorService.Add(x, y);
+
+        context.Logger.LogInformation($"{x} plus {y} is {sum}");
+        return sum;
     }
 
     /// <summary>
@@ -60,8 +72,10 @@ public int Add(int x, int y, ILambdaContext context)
     [HttpApi(LambdaHttpMethod.Get, "/subtract/{x}/{y}")]
     public int Subtract(int x, int y, ILambdaContext context)
     {
-        context.Logger.LogInformation($"{x} subtract {y} is {x - y}");
-        return x - y;
+        var difference = _calculatorService.Subtract(x, y);
+
+        context.Logger.LogInformation($"{x} subtract {y} is {difference}");
+        return difference;
     }
 
     /// <summary>
@@ -74,8 +88,10 @@ public int Subtract(int x, int y, ILambdaContext context)
     [HttpApi(LambdaHttpMethod.Get, "/multiply/{x}/{y}")]
     public int Multiply(int x, int y, ILambdaContext context)
     {
-        context.Logger.LogInformation($"{x} multiply {y} is {x * y}");
-        return x * y;
+        var product = _calculatorService.Multiply(x, y);
+
+        context.Logger.LogInformation($"{x} multiplied by {y} is {product}");
+        return product;
     }
 
     /// <summary>
@@ -88,7 +104,9 @@ public int Multiply(int x, int y, ILambdaContext context)
     [HttpApi(LambdaHttpMethod.Get, "/divide/{x}/{y}")]
     public int Divide(int x, int y, ILambdaContext context)
     {
-        context.Logger.LogInformation($"{x} divide {y} is {x / y}");
-        return x / y;
+        var quotient = _calculatorService.Divide(x, y);
+
+        context.Logger.LogInformation($"{x} divided by {y} is {quotient}");
+        return quotient;
     }
 }