Update Dapr to 1.12.0 (#144)

* Add missing STORAGE_ACCOUNT_KEY variable * Fix formatting * Update Dapr to 1.12.0
Azure · Nov 20, 2023 · 2f373fc · 2f373fc
1 parent 0006c1b
commit 2f373fc
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 29 deletions.
diff --git a/TasksTracker.Processor.Backend.Svc/TasksTracker.Processor.Backend.Svc.csproj b/TasksTracker.Processor.Backend.Svc/TasksTracker.Processor.Backend.Svc.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
     <PackageReference Include="SendGrid" Version="9.28.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />

diff --git a/TasksTracker.TasksManager.Backend.Api/TasksTracker.TasksManager.Backend.Api.csproj b/TasksTracker.TasksManager.Backend.Api/TasksTracker.TasksManager.Backend.Api.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.29.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />

diff --git a/TasksTracker.WebPortal.Frontend.Ui/TasksTracker.WebPortal.Frontend.Ui.csproj b/TasksTracker.WebPortal.Frontend.Ui/TasksTracker.WebPortal.Frontend.Ui.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+	  <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
   </ItemGroup>

diff --git a/docs/aca/03-aca-dapr-integration/Frontend.Ui-dotnet7.csproj b/docs/aca/03-aca-dapr-integration/Frontend.Ui-dotnet7.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/aca/03-aca-dapr-integration/Frontend.Ui-dotnet8.csproj b/docs/aca/03-aca-dapr-integration/Frontend.Ui-dotnet8.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/aca/03-aca-dapr-integration/index.md b/docs/aca/03-aca-dapr-integration/index.md
@@ -53,6 +53,11 @@ You are now ready to run the applications locally using the Dapr sidecar in a se
     $UI_APP_PORT=<web ui https port in Properties->launchSettings.json (e.g. 7000)>
     ```
 
+    !!! note
+        Remember to replace the placeholders with your own values based on image below. Remember to use https port number for the Web API application.
+
+    ![app-port](../../assets/images/03-aca-dapr-integration/self_hosted_dapr_app-port.png)
+
 - Now that we know the `UI_APP_PORT`, we can also declare the local frontend UI URL:
 
     ```shell
@@ -61,9 +66,6 @@ You are now ready to run the applications locally using the Dapr sidecar in a se
 
 --8<-- "snippets/update-variables.md::1"
 
-!!! note
-    Remember to replace the placeholders with your own values based on image below. Remember to use https port number for the Web API application.
-
 #### 2.2 Test `{{ apps.backend }}` Locally
 
 === ".NET 6 or below"
@@ -74,8 +76,6 @@ You are now ready to run the applications locally using the Dapr sidecar in a se
 
     --8<-- "snippets/dapr-run-backend-api.md:basic"
 
- ![app-port](../../assets/images/03-aca-dapr-integration/self_hosted_dapr_app-port.png)
-
 ??? tip "Want to learn more about Dapr run command above?"
     When using Dapr run command you are running a Dapr process as a sidecar next to the Web API application. The properties you have configured are as follows:
 

diff --git a/docs/aca/04-aca-dapr-stateapi/Backend.Api-dotnet7.csproj b/docs/aca/04-aca-dapr-stateapi/Backend.Api-dotnet7.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

diff --git a/docs/aca/04-aca-dapr-stateapi/Backend.Api-dotnet8.csproj b/docs/aca/04-aca-dapr-stateapi/Backend.Api-dotnet8.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

diff --git a/docs/aca/05-aca-dapr-pubsubapi/Backend.Svc-dotnet7.csproj b/docs/aca/05-aca-dapr-pubsubapi/Backend.Svc-dotnet7.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

diff --git a/docs/aca/05-aca-dapr-pubsubapi/Backend.Svc-dotnet8.csproj b/docs/aca/05-aca-dapr-pubsubapi/Backend.Svc-dotnet8.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

diff --git a/docs/aca/05-aca-dapr-pubsubapi/containerapps-pubsub-svcbus.yaml b/docs/aca/05-aca-dapr-pubsubapi/containerapps-pubsub-svcbus.yaml
@@ -1,4 +1,4 @@
-componentType: pubsub.azure.servicebus
+componentType: pubsub.azure.servicebus.topics
 version: v1
 metadata:
   - name: namespaceName

diff --git a/docs/aca/05-aca-dapr-pubsubapi/dapr-pubsub-svcbus.yaml b/docs/aca/05-aca-dapr-pubsubapi/dapr-pubsub-svcbus.yaml
@@ -3,7 +3,7 @@ kind: Component
 metadata:
   name: dapr-pubsub-servicebus
 spec:
-  type: pubsub.azure.servicebus
+  type: pubsub.azure.servicebus.topics
   version: v1
   metadata:
     - name: connectionString # Used for local dev testing.

diff --git a/docs/aca/05-aca-dapr-pubsubapi/index.md b/docs/aca/05-aca-dapr-pubsubapi/index.md
@@ -381,7 +381,7 @@ az servicebus namespace authorization-rule keys list `
 
 #### 3.2 Create a local Dapr Component file for Pub/Sub API Using Azure Service Bus
 
-Add a new files **components** as shown below:
+We need to add a new [Dapr Azure Service Bus Topic component](https://docs.dapr.io/reference/components-reference/supported-pubsub/setup-azure-servicebus-topics){target=_blank}. Add a new file in the **components** folder as shown below:
 
 ```yaml title="dapr-pubsub-svcbus.yaml"
 --8<-- "docs/aca/05-aca-dapr-pubsubapi/dapr-pubsub-svcbus.yaml"

diff --git a/docs/aca/06-aca-dapr-bindingsapi/Update.ExternalTasksProcessorController.cs b/docs/aca/06-aca-dapr-bindingsapi/Update.ExternalTasksProcessorController.cs
@@ -40,8 +40,7 @@ public async Task<IActionResult> ProcessTaskAndStore([FromBody] TaskModel taskMo
                         { "blobName", $"{taskModel.TaskId}.json" },
                     };
 
-
-                 await _daprClient.InvokeBindingAsync(OUTPUT_BINDING_NAME, OUTPUT_BINDING_OPERATION, taskModel, metaData);
+                await _daprClient.InvokeBindingAsync(OUTPUT_BINDING_NAME, OUTPUT_BINDING_OPERATION, taskModel, metaData);
 
                 _logger.LogInformation("Invoked output binding '{0}' for external task. Task name: '{1}', Task Id: '{2}'", OUTPUT_BINDING_NAME, taskModel.TaskName, taskModel.TaskId);
 

diff --git a/docs/aca/06-aca-dapr-bindingsapi/index.md b/docs/aca/06-aca-dapr-bindingsapi/index.md
@@ -191,7 +191,7 @@ Update and replace the code in the file with the code below. Pay close attention
 
 === "ExternalTasksProcessorController.cs"
 
-    ```csharp hl_lines="13-14 37-46"
+    ```csharp hl_lines="13-14 37-45"
     --8<-- "docs/aca/06-aca-dapr-bindingsapi/Update.ExternalTasksProcessorController.cs"
     ```
 

diff --git a/docs/aca/08-aca-monitoring/Backend.Api-dotnet7.csproj b/docs/aca/08-aca-monitoring/Backend.Api-dotnet7.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/docs/aca/08-aca-monitoring/Backend.Api-dotnet8.csproj b/docs/aca/08-aca-monitoring/Backend.Api-dotnet8.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/docs/aca/08-aca-monitoring/Backend.Svc-dotnet7.csproj b/docs/aca/08-aca-monitoring/Backend.Svc-dotnet7.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/docs/aca/08-aca-monitoring/Backend.Svc-dotnet8.csproj b/docs/aca/08-aca-monitoring/Backend.Svc-dotnet8.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/docs/aca/08-aca-monitoring/Frontend.Ui-dotnet7.csproj b/docs/aca/08-aca-monitoring/Frontend.Ui-dotnet7.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
   </ItemGroup>
 

diff --git a/docs/aca/08-aca-monitoring/Frontend.Ui-dotnet8.csproj b/docs/aca/08-aca-monitoring/Frontend.Ui-dotnet8.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
   </ItemGroup>
 

diff --git a/docs/aca/09-aca-autoscale-keda/index.md b/docs/aca/09-aca-autoscale-keda/index.md
@@ -133,7 +133,7 @@ az containerapp update `
 
 ### 4. Scaling Testing
 
-#### 4.1 Run an End-to-End Test and Generate a Several Messages
+#### 4.1 Run an End-to-End Test and Generate Several Messages
 
 Now we are ready to test out our Azure Service Bus Scaling Rule. To produce a high volume of messages, you can utilize the Service Bus Explorer located within your Azure Service Bus namespace. Navigate to Azure Service Bus, choose your topic/subscription, and then select the Service Bus Explorer option.
 
@@ -146,7 +146,7 @@ az containerapp replica list `
 --query [].name
 ```
 
-The message structure our backend processor expects is similar to the JSON shown below. So copy this message and click on Send messages button, paste the message content, set the content type to `application/json`, check the `Repeat Send` check box, select `10000` messages and put an interval of `1ms` between them. This ensures that we are sending high volume at short intervals, so that the single replica container app cannot absorb and process quickly enough and will consequently need to scale out. Finally click `Send` when you are ready.
+The message structure our backend processor expects is similar to the JSON shown below. So copy this message and click on `Send messages` button, paste the message content, set the content type to `application/json`, check the `Repeat Send` check box, select `10000` messages and put an interval of `1ms` between them. This ensures that we are sending high volume at short intervals, so that the single replica container app cannot absorb and process quickly enough and will consequently need to scale out. Finally click `Send` when you are ready.
 
 ```json
 {

diff --git a/docs/aca/13-appendix/Set-Variables.ps1 b/docs/aca/13-appendix/Set-Variables.ps1
@@ -41,6 +41,7 @@ $vars = @(
     "SERVICE_BUS_TOPIC_SUBSCRIPTION",
     "SIGNEDIN_USERID",
     "STORAGE_ACCOUNT_NAME",
+    "STORAGE_ACCOUNT_KEY",
     "TARGET_PORT",
     "UI_APP_PORT",
     "VNET_NAME",

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -108,7 +108,7 @@ extra:
     backendsvc: "ACA Processor - Backend"
     frontend: "ACA Web - Frontend"
   dapr:
-    version: 1.9.0
+    version: 1.12.0
   docker:
     targetport: 5000
   social: