Merging main into release/main (#2843)

.github/ISSUE_TEMPLATE/02b-net9-question-or-issue.yml

@@ -0,0 +1,15 @@
+name: .NET 9 issue or question
+description: Ask questions or raise issues related to .NET 9
+labels: [".NET 9"]
+body: 
+- type: markdown
+  attributes:
+    value: |
+      Please use this template for any issues you have using .NET 9 or for any questions not answered in our [tracking thread for .NET 9 GA support](https://github.com/Azure/azure-functions-dotnet-worker/issues/2817).
+- id: description
+  type: textarea
+  attributes:
+    label: Description
+    placeholder: Please provide a succinct description of the question or issue. For issue reports, please include the versions of the Azure Functions packages your projects references.
+  validations:
+    required: true

.github/workflows/codeql-analysis.yml

@@ -1,72 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
-  schedule:
-    - cron: '30 17 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'csharp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

.github/workflows/dependency-review.yml

@@ -0,0 +1,17 @@
+name: Dependency Review
+on: [pull_request]
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Dependency Review
+        uses: actions/dependency-review-action@v4
+        with:
+          comment-summary-in-pr: on-failure

Directory.Build.props

@@ -11,8 +11,20 @@
     <TargetsRoot>$(EngRoot)build/</TargetsRoot>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  <PropertyGroup>
+    <ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild>
+    <CI>$(ContinuousIntegrationBuild)</CI>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
+    <!-- Except for in CI, critical will fail the build. -->
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);NU1901;NU1902;NU1903</WarningsNotAsErrors>
+    <WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904</WarningsNotAsErrors>
+    <WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904</WarningsAsErrors>
+    <NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
+    <NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
   </PropertyGroup>
 
 </Project>

extensions/Worker.Extensions.Kafka/release_notes.md

@@ -4,6 +4,7 @@
 - My change description (#PR/#issue)
 -->
 
-### Microsoft.Azure.Functions.Worker.Extensions.Kafka 3.10.1
+### Microsoft.Azure.Functions.Worker.Extensions.Kafka 4.0.0
 
-- Add `DefaultValue` attribute to Kafka Trigger's `IsBatched` prop to signal default cardinality value to source generators (#2139)
+- Add OAuthBearer trigger and output Attributes to the dotnet isolated model(#2799)
+- Update kafka extension version to 4.0.0(#2799)

extensions/Worker.Extensions.Kafka/src/BrokerAuthenticationMode.cs

@@ -13,6 +13,7 @@ namespace Microsoft.Azure.Functions.Worker
         Gssapi,
         Plain,
         ScramSha256,
-        ScramSha512
+        ScramSha512,
+        OAuthBearer
     }
 }

extensions/Worker.Extensions.Kafka/src/KafkaOutputAttribute.cs

@@ -67,7 +67,7 @@ namespace Microsoft.Azure.Functions.Worker
 
         /// <summary>
         /// SASL mechanism to use for authentication. 
-        /// Allowed values: Gssapi, Plain, ScramSha256, ScramSha512
+        /// Allowed values: Gssapi, Plain, ScramSha256, ScramSha512, OAuthBearer
         /// Default: Plain
         /// 
         /// sasl.mechanism in librdkafka
@@ -143,5 +143,49 @@ namespace Microsoft.Azure.Functions.Worker
         /// Password for the Avro Schema Registry
         /// </summary>
         public string SchemaRegistryPassword { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer method.
+        /// Either 'default' or 'oidc'
+        /// sasl.oauthbearer in librdkafka
+        /// </summary>
+        public OAuthBearerMethod OAuthBearerMethod { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer Client Id
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.client.id in librdkafka
+        /// </summary>
+        public string OAuthBearerClientId { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer Client Secret
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.client.secret in librdkafka
+        /// </summary>
+        public string OAuthBearerClientSecret { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer scope.
+        /// Client use this to specify the scope of the access request to the broker. 
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.extensions in librdkafka
+        /// </summary>
+        public string OAuthBearerScope { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer token endpoint url.
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.token.endpoint.url in librdkafka
+        /// </summary>
+        public string OAuthBearerTokenEndpointUrl { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer extensions.
+        /// Allow additional information to be provided to the broker.
+        /// Comma-separated list of key=value pairs. E.g., "supportFeatureX=true,organizationId=sales-emea"
+        /// sasl.oauthbearer.extensions in librdkafka
+        /// </summary>
+        public string OAuthBearerExtensions { get; set; }
     }
 }

extensions/Worker.Extensions.Kafka/src/KafkaTriggerAttribute.cs

@@ -47,7 +47,7 @@ namespace Microsoft.Azure.Functions.Worker
 
         /// <summary>
         /// SASL mechanism to use for authentication. 
-        /// Allowed values: Gssapi, Plain, ScramSha256, ScramSha512
+        /// Allowed values: Gssapi, Plain, ScramSha256, ScramSha512, OAuthBearer
         /// Default: Plain
         /// 
         /// sasl.mechanism in librdkafka
@@ -127,6 +127,50 @@ namespace Microsoft.Azure.Functions.Worker
         /// </summary>
         public string SchemaRegistryPassword { get; set; }
 
+        /// <summary>
+        /// OAuth Bearer method.
+        /// Either 'default' or 'oidc'
+        /// sasl.oauthbearer in librdkafka
+        /// </summary>
+        public OAuthBearerMethod OAuthBearerMethod { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer Client Id
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.client.id in librdkafka
+        /// </summary>
+        public string OAuthBearerClientId { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer Client Secret
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.client.secret in librdkafka
+        /// </summary>
+        public string OAuthBearerClientSecret { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer scope.
+        /// Client use this to specify the scope of the access request to the broker. 
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.extensions in librdkafka
+        /// </summary>
+        public string OAuthBearerScope { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer token endpoint url.
+        /// Specify only when OAuthBearerMethod is 'oidc'
+        /// sasl.oauthbearer.token.endpoint.url in librdkafka
+        /// </summary>
+        public string OAuthBearerTokenEndpointUrl { get; set; }
+
+        /// <summary>
+        /// OAuth Bearer extensions.
+        /// Allow additional information to be provided to the broker.
+        /// Comma-separated list of key=value pairs. E.g., "supportFeatureX=true,organizationId=sales-emea"
+        /// sasl.oauthbearer.extensions in librdkafka
+        /// </summary>
+        public string OAuthBearerExtensions { get; set; }
+        
         /// <summary>
         /// Gets or sets the configuration to enable batch processing of events. Default value is "false".
         /// </summary>

extensions/Worker.Extensions.Kafka/src/OAuthBearerMethod.cs

@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Azure.Functions.Worker
+{
+    /// <summary>
+    /// Defines the OAuth bearer method
+    /// </summary>
+    public enum OAuthBearerMethod
+    {
+        Default,
+        Oidc
+    }
+}

extensions/Worker.Extensions.Kafka/src/Worker.Extensions.Kafka.csproj

@@ -6,7 +6,7 @@
     <Description>Kafka extensions for .NET isolated functions</Description>
 
     <!--Version information-->
-    <VersionPrefix>3.10.1</VersionPrefix>
+    <VersionPrefix>4.0.0</VersionPrefix>
 
     <!--Temporarily opting out of documentation. Pending documentation-->
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <WebJobsExtension Include="Microsoft.Azure.WebJobs.Extensions.Kafka" Version="3.9.0" />
+    <WebJobsExtension Include="Microsoft.Azure.WebJobs.Extensions.Kafka" Version="4.0.0" />
   </ItemGroup>
 
 </Project>

src/DotNetWorker.Core/Hosting/ServiceCollectionExtensions.cs

@@ -110,10 +110,11 @@ namespace Microsoft.Extensions.DependencyInjection
             {
                 builder = new FunctionsWorkerApplicationBuilder(services);
                 services.AddSingleton<IFunctionsWorkerApplicationBuilder>(builder);
-            }
 
-            // Execute startup code from worker extensions if present.
-            RunExtensionStartupCode(builder);
+                // Execute startup code from worker extensions if present
+                // Only run this once when builder is first added.
+                RunExtensionStartupCode(builder);
+            }
 
             return builder;
         }