Merge branch 'dev' into dajusto/remove-potentially-sensitive-logs

.github/workflows/validate-build-analyzer.yml

@@ -0,0 +1,60 @@
+name: Validate Build (analyzer)
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    paths-ignore: [ '**.md' ]
+  pull_request:
+    branches:
+      - main
+      - dev
+    paths-ignore: [ '**.md' ]
+
+env:
+  solution: WebJobs.Extensions.DurableTask.sln
+  config: Release
+  AzureWebJobsStorage: UseDevelopmentStorage=true
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+
+    - name: Set up .NET Core 3.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '3.1.x'
+
+    - name: Set up .NET Core 2.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '2.1.x'
+
+    - name: Restore dependencies
+      run: dotnet restore $solution
+
+    - name: Build
+      run: dotnet build $solution
+
+    # Install Azurite
+    - name: Set up Node.js (needed for Azurite)
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x' # Azurite requires at least Node 18
+
+    - name: Install Azurite
+      run: npm install -g azurite
+
+    # Run tests
+    - name: Run Analyzer tests
+      run: azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002 & dotnet test ./test/WebJobs.Extensions.DurableTask.Analyzers.Test/WebJobs.Extensions.DurableTask.Analyzers.Test.csproj
+

.github/workflows/validate-build-e2e.yml

@@ -0,0 +1,62 @@
+name: Validate Build (E2E tests)
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    paths-ignore: [ '**.md' ]
+  pull_request:
+    branches:
+      - main
+      - dev
+    paths-ignore: [ '**.md' ]
+
+env:
+  solution: WebJobs.Extensions.DurableTask.sln
+  config: Release
+  AzureWebJobsStorage: UseDevelopmentStorage=true
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+
+    - name: Set up .NET Core 3.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '3.1.x'
+
+    - name: Set up .NET Core 2.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '2.1.x'
+
+    - name: Restore dependencies
+      run: dotnet restore $solution
+
+    - name: Build
+      run: dotnet build $solution
+
+    # Install Azurite
+    - name: Set up Node.js (needed for Azurite)
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x' # Azurite requires at least Node 18
+
+    - name: Install Azurite
+      run: npm install -g azurite
+
+    # Run tests
+    - name: Run FunctionsV2 tests (only DurableEntity_CleanEntityStorage test, which is flaky)
+      run: azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002 & dotnet test ./test/FunctionsV2/WebJobs.Extensions.DurableTask.Tests.V2.csproj  --filter "FullyQualifiedName~Microsoft.Azure.WebJobs.Extensions.DurableTask.Tests.DurableTaskEndToEndTests.DurableEntity_CleanEntityStorage"
+
+    - name: Run FunctionsV2 tests (all other E2E tests)
+      run: azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002 & dotnet test ./test/FunctionsV2/WebJobs.Extensions.DurableTask.Tests.V2.csproj  --filter "FullyQualifiedName~Microsoft.Azure.WebJobs.Extensions.DurableTask.Tests.DurableTaskEndToEndTests&FullyQualifiedName!~Microsoft.Azure.WebJobs.Extensions.DurableTask.Tests.DurableTaskEndToEndTests.DurableEntity_CleanEntityStorage"

.github/workflows/validate-build.yml

@@ -0,0 +1,63 @@
+name: Validate Build (except E2E tests)
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    paths-ignore: [ '**.md' ]
+  pull_request:
+    branches:
+      - main
+      - dev
+    paths-ignore: [ '**.md' ]
+
+env:
+  solution: WebJobs.Extensions.DurableTask.sln
+  config: Release
+  AzureWebJobsStorage: UseDevelopmentStorage=true
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+
+    - name: Set up .NET Core 3.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '3.1.x'
+
+    - name: Set up .NET Core 2.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '2.1.x'
+
+    - name: Restore dependencies
+      run: dotnet restore $solution
+
+    - name: Build
+      run: dotnet build $solution
+
+    # Install Azurite
+    - name: Set up Node.js (needed for Azurite)
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x' # Azurite requires at least Node 18
+
+    - name: Install Azurite
+      run: npm install -g azurite
+
+    # Run tests
+    - name: Run FunctionsV2 tests (except E2E tests)
+      run: azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002 & dotnet test ./test/FunctionsV2/WebJobs.Extensions.DurableTask.Tests.V2.csproj  --filter "FullyQualifiedName!~Microsoft.Azure.WebJobs.Extensions.DurableTask.Tests.DurableTaskEndToEndTests"
+
+    - name: Run Worker Extension tests
+      run: azurite --silent --blobPort 10000 --queuePort 10001 --tablePort 10002 & dotnet test ./test/Worker.Extensions.DurableTask.Tests/Worker.Extensions.DurableTask.Tests.csproj
+

eng/ci/official-build.yml

@@ -0,0 +1,36 @@
+variables:
+  - template: ci/variables/cfs.yml@eng
+
+trigger:
+    batch: true
+    branches:
+        include:
+            - main
+
+# CI only, does not trigger on PRs.
+pr: none
+
+resources:
+    repositories:
+        - repository: 1es
+          type: git
+          name: 1ESPipelineTemplates/1ESPipelineTemplates
+          ref: refs/tags/release
+        - repository: eng
+          type: git
+          name: engineering
+          ref: refs/tags/release
+
+extends:
+    template: v1/1ES.Official.PipelineTemplate.yml@1es
+    parameters:
+        pool:
+            name: 1es-pool-azfunc
+            image: 1es-windows-2022
+            os: windows
+
+        stages:
+            - stage: BuildAndSign
+              dependsOn: []
+              jobs:
+                  - template: /eng/templates/build.yml@self

eng/templates/build.yml

@@ -0,0 +1,105 @@
+jobs:
+    - job: Build
+
+      templateContext:
+        outputs:
+            - output: pipelineArtifact
+              path: $(build.artifactStagingDirectory)
+              artifact: drop
+              sbomBuildDropPath: $(build.artifactStagingDirectory)
+              sbomPackageName: 'Durable Functions Extension SBOM'
+
+      steps:
+
+      # Configure all the .NET SDK versions we need
+      - task: UseDotNet@2
+        displayName: 'Use the .NET Core 2.1 SDK (required for build signing)'
+        inputs:
+            packageType: 'sdk'
+            version: '2.1.x'
+
+      - task: UseDotNet@2
+        displayName: 'Use the .NET Core 3.1 SDK'
+        inputs:
+            packageType: 'sdk'
+            version: '3.1.x'
+
+      - task: UseDotNet@2
+        displayName: 'Use the .NET 6 SDK'
+        inputs:
+            packageType: 'sdk'
+            version: '6.0.x'
+
+      # Start by restoring all the dependencies.
+      - task: DotNetCoreCLI@2
+        displayName: 'dotnet restore'
+        inputs:
+            command: restore
+            projects: '**/**/*.csproj'
+            feedsToUse: config
+            nugetConfigPath: 'nuget.config'
+
+      # Build durable-extension
+      - task: VSBuild@1
+        displayName: 'Build Durable Extension'
+        inputs:
+            solution: '**/WebJobs.Extensions.DurableTask.sln'
+            vsVersion: "16.0"
+            configuration: Release
+
+      - template: ci/sign-files.yml@eng
+        parameters:
+            displayName: Sign assemblies
+            folderPath: 'src/WebJobs.Extensions.DurableTask/bin/Release'
+            pattern: '*DurableTask.dll'
+            signType: dll
+
+      # dotnet pack
+      # Packaging needs to be a separate step from build.
+      # This will automatically pick up the signed DLLs.
+      - task: DotNetCoreCLI@2
+        displayName: 'dotnet pack WebJobs.Extensions.DurableTask.csproj'
+        inputs:
+            command: pack
+            packagesToPack: 'src/**/WebJobs.Extensions.DurableTask.csproj'
+            configuration: Release
+            packDirectory: 'azure-functions-durable-extension'
+            nobuild: true
+
+      # Remove redundant symbol package(s)
+      - script: |
+          echo *** Searching for .symbols.nupkg files to delete...
+          dir /s /b *.symbols.nupkg
+        
+          echo *** Deleting .symbols.nupkg files...
+          del /S /Q *.symbols.nupkg
+        
+          echo *** Listing remaining packages
+          dir /s /b *.nupkg
+        displayName: 'Remove Redundant Symbols Package(s)'
+        continueOnError: true
+
+      - template: ci/sign-files.yml@eng
+        parameters:
+            displayName: Sign NugetPackages
+            folderPath: $(build.artifactStagingDirectory)
+            pattern: '*.nupkg'
+            signType: nuget
+
+      # zip .NET in-proc perf tests
+      - task: DotNetCoreCLI@2
+        displayName: 'Zip .NET in-proc perf tests'
+        inputs:
+            command: 'publish'
+            publishWebProjects: false
+            projects: '$(System.DefaultWorkingDirectory)/test/PerfTests/DFPerfTests/**/*.csproj'
+            arguments: '-o $(System.DefaultWorkingDirectory)/test/PerfTests/DFPerfTests/Output'
+            zipAfterPublish: true
+            modifyOutputPath: true
+
+      # Move zip'ed .NET in-proc perf tests to the ADO publishing directory
+      - task: CopyFiles@2
+        inputs:
+            SourceFolder: '$(System.DefaultWorkingDirectory)/test/PerfTests/DFPerfTests/Output/'
+            Contents: '**'
+            TargetFolder: '$(System.DefaultWorkingDirectory)/azure-functions-durable-extension/'

src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <NoWarn>RS1026</NoWarn> <!-- Disable 'Enable concurrent execution' warning until we investigate if it's safe to enable-->
   </PropertyGroup>
 
   <PropertyGroup>

src/WebJobs.Extensions.DurableTask/AzureStorageAccountProvider.cs

@@ -2,9 +2,11 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System;
+using System.Collections.Concurrent;
 using DurableTask.AzureStorage;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask.Options;
 using Microsoft.Extensions.Configuration;
+
 #if !FUNCTIONS_V1
 using Microsoft.Azure.WebJobs.Extensions.DurableTask.Auth;
 using Microsoft.WindowsAzure.Storage.Auth;
@@ -19,6 +21,9 @@ internal sealed class AzureStorageAccountProvider : IStorageAccountProvider
 #if !FUNCTIONS_V1
         private readonly ITokenCredentialFactory credentialFactory;
 
+        private readonly ConcurrentDictionary<string, TokenCredential> cachedTokenCredentials =
+            new ConcurrentDictionary<string, TokenCredential>();
+
         public AzureStorageAccountProvider(IConnectionInfoResolver connectionInfoResolver, ITokenCredentialFactory credentialFactory)
         {
             this.connectionInfoResolver = connectionInfoResolver ?? throw new ArgumentNullException(nameof(connectionInfoResolver));
@@ -44,7 +49,9 @@ public StorageAccountDetails GetStorageAccountDetails(string connectionName)
             AzureStorageAccountOptions account = connectionInfo.Get<AzureStorageAccountOptions>();
             if (account != null)
             {
-                TokenCredential credential = this.credentialFactory.Create(connectionInfo);
+                TokenCredential credential = this.cachedTokenCredentials.GetOrAdd(
+                    connectionName,
+                    attr => this.credentialFactory.Create(connectionInfo));
 
                 return new StorageAccountDetails
                 {

src/WebJobs.Extensions.DurableTask/HttpApiHandler.cs

@@ -1241,7 +1241,9 @@ private HttpResponseMessage CreateCheckStatusResponseMessage(
 
         internal Uri GetWebhookUri()
         {
-            return this.webhookUrlProvider?.Invoke() ?? throw new InvalidOperationException("Webhooks are not configured");
+            string errorMessage = "Webhooks are not configured. This may occur if the environment variable `WEBSITE_HOSTNAME` is not set (should be automatically set for Azure Functions). " +
+                "Try setting it to the appropiate URI to reach your app. For example: the DNS name of the app, or a value of the form <ip-address>:<port>.";
+            return this.webhookUrlProvider?.Invoke() ?? throw new InvalidOperationException(errorMessage);
         }
 
         internal bool TryGetRpcBaseUrl(out Uri rpcBaseUrl)