36 Upgrade Functions -> v3

.github/workflows/dotnet.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: 
       - '*'
+    paths: [ 'dotnet/**' ]
   pull_request:
     branches: [ main ]
 

.github/workflows/nodejs.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: 
       - '*'
+    paths: [ 'nodejs/**' ]
   pull_request:
     branches: [ main ]
 

.github/workflows/spa.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: 
       - '*'
+    paths: [ 'web/serverless-microservices-web/**' ]
   pull_request:
     branches: [ main ]
 

.gitignore

@@ -17,3 +17,7 @@
 
 # Build temp package lock
 pipelines/package-lock.json
+
+bicep/parameters.local.json
+local.settings.json
+

bicep/main.bicep

@@ -27,7 +27,7 @@ var applicationInsightsName = '${applicationName}Insights'
 var apimName = '${applicationName}Apim'
 var sqlServerName = '${applicationName}-db'
 var staticWebAppName = '${applicationName}Web'
-var storageAccountName = toLower('${applicationName}functionstore')
+var storageAccountName = take(toLower(replace('${applicationName}func', '-', '')), 24)
 var functionsApps = [
   'Trips'
   'Drivers'

bicep/modules/cosmosdb.bicep

@@ -9,6 +9,8 @@ param location string = resourceGroup().location
 param databaseName string
 param resourceTags object
 
+param throughput int = 400
+
 var containerNames = [
   'main'
   'archiver'
@@ -24,11 +26,6 @@ resource cosmosAccount 'Microsoft.DocumentDB/databaseAccounts@2021-06-15' = {
     consistencyPolicy: {
       defaultConsistencyLevel: 'Session'
     }
-    capabilities: [
-      {
-        name: 'EnableServerless'
-      }
-    ]
     enableFreeTier: false
     locations: [
       {
@@ -53,6 +50,9 @@ resource cosmosDB 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-06-15
     resource: {
       id: '${toLower(databaseName)}'
     }
+    options: {
+      throughput: throughput
+    }
   }
 }
 

bicep/parameters.json

@@ -21,6 +21,9 @@
         },
         "secretName": "sqlAdminPassword"
       }
+    },
+    "staticWebAppLocation": {
+      "value": "westus2"
     }
   }
 }

documentation/monitoring-testing.md

@@ -12,6 +12,22 @@ The .NET `ServerlessMicroservices.Seeder` project contains a multi-thread tester
 
 **Please note** that the test will usually run against a deployment environment where the `AuthEnabled` setting is set to false.
 
+```powershell
+> ServerlessMicroservices.Seeder.exe testTrips --help
+
+Usage:  testTrips [options]
+
+Options:
+  --help               Show help information
+  -t|--seeddriversurl  Set seed drivers url
+  -t|--testurl         Set test url
+  -i|--testiterations  Set test iterations
+  -s|--testseconds     Set test seconds
+  -v|--signalrinfourl  Set SignalR Info URL
+
+> ServerlessMicroservices.Seeder.exe testTrips --seeddriversurl http://localhost:7071 --testurl http://localhost:7072/api/triptestparameters
+```
+
 The `testTrips` command takes 1 mandatory argument and 2 optional arguments i.e. `ServerlessMicroservices.Seeder testTrips testUrl testiterations testseconds`
 
 - Test Parameters URL to read the test data from.

documentation/setup.md

@@ -3,6 +3,7 @@
 In this document:
 
 - [Serverless Microservices reference architecture](#serverless-microservices-reference-architecture)
+  - [Getting Started](#getting-started)
   - [Resources](#resources)
   - [Provision](#provision)
     - [Manual via the Portal](#manual-via-the-portal)
@@ -67,6 +68,53 @@ In this document:
     - [Running in ACI](#running-in-aci)
     - [Running in AKS](#running-in-aks)
 
+## Getting Started
+
+In your local development environment you will need latest versions of:
+
+* Visual Studio or VSCode
+* git
+* `func` CLI
+* `az` CLI
+* Powershell
+
+Deploy Azure resources:
+
+```powershell
+copy bicep/parameters.json bicep/parameters.local.json
+# Change params in @bicep/parameters.local.json to suit
+az group create -n serverless-microservices-dev -l westus2
+az deployment group create -g serverless-microservices-dev -f bicep/main.bicep -p @bicep/parameters.local.json
+```
+
+Create local settings:
+
+``` powershell
+cd dotnet
+copy ServerlessMicroservices.FunctionApp.Drivers/local.settings.example.json ServerlessMicroservices.FunctionApp.Drivers/local.settings.json
+copy ServerlessMicroservices.FunctionApp.Orchestrators/local.settings.example.json ServerlessMicroservices.FunctionApp.Orchestrators/local.settings.json
+copy ServerlessMicroservices.FunctionApp.Passengers/local.settings.example.json ServerlessMicroservices.FunctionApp.Passengers/local.settings.json
+copy ServerlessMicroservices.FunctionApp.Trips/local.settings.example.json ServerlessMicroservices.FunctionApp.Trips/local.settings.json
+
+cd ../nodejs
+copy serverless-microservices-functionapp-triparchiver/local.settings.example.json serverless-microservices-functionapp-triparchiver/local.settings.json
+# Update local settings with your environment's values
+```
+
+Build and run local:
+
+```powershell
+cd scripts
+./run-local.ps1
+```
+
+Integration test:
+
+```powershell
+cd scripts
+./test-local.ps1
+```
+
 ## Resources
 
 The following is a summary of all Azure resources required to deploy the solution:
@@ -103,11 +151,12 @@ The following is a summary of all Azure resources required to deploy the solutio
 
 ## Provision
 
-There are 3 ways to provision the required resources:
+There are 4 ways to provision the required resources:
 
 - [Manual via the Portal](#manual-via-the-portal)
 - [ARM Template](#deploy-from-arm-template)
 - [Cake](#cake-provision)
+- [Bicep](#deploy-from-bicep) (recommended)
 
 ### Manual via the Portal
 
@@ -1476,16 +1525,27 @@ From a PowerShell command, use the following commands for the `Prod` environment
 
 ## Seeding
 
-The .NET `ServerlessMicroservices.Seeder` project contains a seeding command that can be used to seed `drivers` and `passengers` using the `Drivers APIs` and `Passengers APIs`, respectively.
+The .NET `ServerlessMicroservices.Seeder` project contains a seeding command that can be used to seed `drivers` using the `Drivers APIs`.
 
-**Please note** that the `seed` command will seed drivers only if there are no drivers and will seed passengers only if there are no passengers in the solution's database.
+**Please note** that the `seed` command will seed drivers only if there are no drivers.
 
 > You must set the **EnableAuth** App Setting on the **Drivers** and **Passengers** Function Apps to `false` for the seeder to work.
 
-The `seed` command takes 5 non-optional arguments i.e. `ServerlessMicroservices.Seeder.exe seed --seeddriversurl https://ridesharedrivers.azurewebsites.net --seedpassengersurl https://ridesharepassengers.azurewebsites.net`
+```
+> ServerlessMicroservices.Seeder.exe seed --help
+
+Usage:  seed [options]
 
-- Drivers Function Base URL  
-- Passengers Function Base URL
+Options:
+  --help               Show help information
+  -t|--seeddriversurl  Set seed drivers url
+  -t|--testurl         Set test url
+  -i|--testiterations  Set test iterations
+  -s|--testseconds     Set test seconds
+  -v|--signalrinfourl  Set SignalR Info URL
+
+> ServerlessMicroservices.Seeder.exe seed --seeddriversurl https://ridesharedrivers.azurewebsites.net
+```
 
 ## Containers
 

dotnet/ServerlessMicroservices.FunctionApp.Drivers/ServerlessMicroservices.FunctionApp.Drivers.csproj

@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AzureFunctionsVersion>v2</AzureFunctionsVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
+    <!--<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />-->
+    <!--<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.12" />-->
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.13" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServerlessMicroservices.Models\ServerlessMicroservices.Models.csproj" />
@@ -15,7 +17,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </None>
   </ItemGroup>

dotnet/ServerlessMicroservices.FunctionApp.Drivers/host.json

@@ -1,2 +1,3 @@
 {
+  "version": "2.0"
 }

dotnet/ServerlessMicroservices.FunctionApp.Drivers/local.settings.example.json

@@ -0,0 +1,11 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
+    "DocDbEndpointUri": "",
+    "DocDbApiKey": "",
+    "DocDbRideShareDatabaseName": "",
+    "DocDbRideShareMainCollectionName": ""
+  }
+}

dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "ServerlessMicroservices.FunctionApp.Orchestrators": {
+      "commandName": "Project",
+      "commandLineArgs": "start --port 7074"
+    }
+  }
+}

dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/ServerlessMicroservices.FunctionApp.Orchestrators.csproj

@@ -1,17 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AzureFunctionsVersion>v2</AzureFunctionsVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.7.1" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.3" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.6.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.13" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServerlessMicroservices.Models\ServerlessMicroservices.Models.csproj" />

dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/TripDemoOrchestrator.cs

@@ -1,4 +1,5 @@
 using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.DurableTask;
 using Microsoft.Extensions.Logging;
 using ServerlessMicroservices.Models;
 using ServerlessMicroservices.Shared.Services;
@@ -15,7 +16,7 @@ public static class TripDemoOrchestrator
 
         [FunctionName("O_DemoTrip")]
         public static async Task<object> DemoTrip(
-            [OrchestrationTrigger] DurableOrchestrationContext context,
+            [OrchestrationTrigger] IDurableOrchestrationContext context,
             ILogger log)
         {
             TripDemoState state = context.GetInput<TripDemoState>();

dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/TripDemoOrchestratorTriggers.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.DurableTask;
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -15,7 +16,7 @@ public static class TripDemoOrchestratorTriggers
     {
         [FunctionName("T_StartTripDemoViaQueueTrigger")]
         public static async Task StartTripDemoViaQueueTrigger(
-            [OrchestrationClient] DurableOrchestrationClient context,
+            [DurableClient] IDurableClient context,
             [QueueTrigger("%TripDemosQueue%", Connection = "AzureWebJobsStorage")] TripDemoState demoState,
             ILogger log)
         {
@@ -34,7 +35,7 @@ public static async Task StartTripDemoViaQueueTrigger(
 
         [FunctionName("T_StartTripDemo")]
         public static async Task<IActionResult> StartTripDemo([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "tripdemos")] HttpRequest req,
-            [OrchestrationClient] DurableOrchestrationClient context,
+            [DurableClient] IDurableClient context,
             ILogger log)
         {
             try
@@ -63,7 +64,7 @@ public static async Task<IActionResult> StartTripDemo([HttpTrigger(Authorization
 
         [FunctionName("T_GetTripDemo")]
         public static async Task<IActionResult> GetTripDemo([HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "tripdemos/{code}")] HttpRequest req,
-            [OrchestrationClient] DurableOrchestrationClient context,
+            [DurableClient] IDurableClient context,
             string code,
             ILogger log)
         {
@@ -85,7 +86,7 @@ public static async Task<IActionResult> GetTripDemo([HttpTrigger(AuthorizationLe
 
         [FunctionName("T_TerminateTripDemo")]
         public static async Task<IActionResult> TerminateTripDemo([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "tripdemos/{code}/terminate")] HttpRequest req,
-            [OrchestrationClient] DurableOrchestrationClient context,
+            [DurableClient] IDurableClient context,
             string code,
             ILogger log)
         {
@@ -105,7 +106,7 @@ public static async Task<IActionResult> TerminateTripDemo([HttpTrigger(Authoriza
         //TODO: Implement Get Trip Demo Instances, Restart Trip Demo Instances and Terminate Trip Demo Instances if Persist to table storage if persist instances is activated
 
         /** PRIVATE **/
-        private static async Task StartInstance(DurableOrchestrationClient context, TripDemoState state, string instanceId, ILogger log)
+        private static async Task StartInstance(IDurableOrchestrationClient context, TripDemoState state, string instanceId, ILogger log)
         {
             try
             {
@@ -127,7 +128,7 @@ private static async Task StartInstance(DurableOrchestrationClient context, Trip
             }
         }
 
-        private static async Task TeminateInstance(DurableOrchestrationClient context, string instanceId, ILogger log)
+        private static async Task TeminateInstance(IDurableClient context, string instanceId, ILogger log)
         {
             try
             {

dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/TripManagerOrchestrator.cs

@@ -1,4 +1,5 @@
 using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.DurableTask;
 using Microsoft.Extensions.Logging;
 using ServerlessMicroservices.Models;
 using ServerlessMicroservices.Shared.Helpers;
@@ -16,7 +17,7 @@ public static class TripManagerOrchestrator
     {
         [FunctionName("O_ManageTrip")]
         public static async Task<object> ManageTrip(
-            [OrchestrationTrigger] DurableOrchestrationContext context,
+            [OrchestrationTrigger] IDurableOrchestrationContext context,
             ILogger log)
         {
             TripItem trip = context.GetInput<TripItem>();