Update feature configuration package

src/ApiService/ApiService/ApiService.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.0.0-preview3" />
     <PackageReference Include="Semver" Version="2.1.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.1.0" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.Functions.Worker" Version="6.0.0" />
     <PackageReference Include="Microsoft.FeatureManagement" Version="2.5.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="5.0.0" />

src/ApiService/ApiService/FeatureFlags.cs

@@ -1,7 +1,7 @@
 namespace Microsoft.OneFuzz.Service;
 
 public static class FeatureFlagConstants {
-    public const string EnableScribanOnly = "EnableScribanOnly";
+    public const string RenderOnlyScribanTemplates = "RenderOnlyScribanTemplates";
     public const string EnableNodeDecommissionStrategy = "EnableNodeDecommissionStrategy";
-    public const string EnableValidateNotificationConfigSemantics = "EnableValidateNotificationConfigSemantics";
+    public const string SemanticNotificationConfigValidation = "SemanticNotificationConfigValidation";
 }

src/ApiService/ApiService/Program.cs

@@ -65,15 +65,7 @@ public static async Async.Task Main() {
                     });
                 }
             })
-            .ConfigureFunctionsWorkerDefaults(builder => {
-                builder.UseMiddleware<LoggingMiddleware>();
-                builder.AddApplicationInsights(options => {
-                    options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}";
-                });
-            })
             .ConfigureServices((context, services) => {
-                services.AddAzureAppConfiguration();
-                _ = services.AddFeatureManagement();
                 services.Configure<JsonSerializerOptions>(options => {
                     options = EntityConverter.GetJsonSerializerOptions();
                 });
@@ -139,7 +131,17 @@ public static async Async.Task Main() {
                 .AddSingleton<IStorage, Storage>()
                 .AddSingleton<ILogSinks, LogSinks>()
                 .AddHttpClient()
-                .AddMemoryCache();
+                .AddMemoryCache()
+                .AddAzureAppConfiguration();
+
+                _ = services.AddFeatureManagement();
+            })
+            .ConfigureFunctionsWorkerDefaults(builder => {
+                builder.UseAzureAppConfiguration();
+                builder.UseMiddleware<LoggingMiddleware>();
+                builder.AddApplicationInsights(options => {
+                    options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}";
+                });
             })
             .Build();
 

src/ApiService/ApiService/onefuzzlib/NotificationOperations.cs

@@ -91,12 +91,12 @@ public async Async.Task<OneFuzzResult<Notification>> Create(Container container,
             return OneFuzzResult<Notification>.Error(ErrorCode.INVALID_REQUEST, "invalid container");
         }
 
-        if (await _context.FeatureManagerSnapshot.IsEnabledAsync(FeatureFlagConstants.EnableScribanOnly) &&
+        if (await _context.FeatureManagerSnapshot.IsEnabledAsync(FeatureFlagConstants.RenderOnlyScribanTemplates) &&
             !await JinjaTemplateAdapter.IsValidScribanNotificationTemplate(_context, _logTracer, config)) {
             return OneFuzzResult<Notification>.Error(ErrorCode.INVALID_REQUEST, "The notification config is not a valid scriban template");
         }
 
-        if (await _context.FeatureManagerSnapshot.IsEnabledAsync(FeatureFlagConstants.EnableValidateNotificationConfigSemantics)) {
+        if (await _context.FeatureManagerSnapshot.IsEnabledAsync(FeatureFlagConstants.SemanticNotificationConfigValidation)) {
             var validConfig = await config.Validate();
             if (!validConfig.IsOk) {
                 return OneFuzzResult<Notification>.Error(validConfig.ErrorV);

src/ApiService/ApiService/onefuzzlib/notifications/NotificationsBase.cs

@@ -76,7 +76,7 @@ public static async Async.Task<Renderer> ConstructRenderer(
                 inputUrl = new Uri(context.Containers.AuthDownloadUrl(report.InputBlob.Container, report.InputBlob.Name));
             }
 
-            var scribanOnlyFeatureFlag = await context.FeatureManagerSnapshot.IsEnabledAsync(FeatureFlagConstants.EnableScribanOnly);
+            var scribanOnlyFeatureFlag = await context.FeatureManagerSnapshot.IsEnabledAsync(FeatureFlagConstants.RenderOnlyScribanTemplates);
             log.Info($"ScribanOnlyFeatureFlag: {scribanOnlyFeatureFlag}");
 
             var scribanOnly = scribanOnlyOverride ?? scribanOnlyFeatureFlag;

src/ApiService/ApiService/packages.lock.json

@@ -157,6 +157,16 @@
         "resolved": "0.12.2",
         "contentHash": "JgMAGj8ekeAzKkagubXqf1UqgfHq89GyA1UQYWbkAe441uRr2Rh2rktkx5Z0LPwmD/aOqu9cxjekD2GZjP8rbw=="
       },
+      "Microsoft.Azure.AppConfiguration.Functions.Worker": {
+        "type": "Direct",
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "cwj73rhjH27VOg5pGB7mlTkX6do96u733T8m8int62RuxcQRKQVTuzh91hpQYFsf9IFAgS/RAwdO7fTAPJ7vOA==",
+        "dependencies": {
+          "Microsoft.Azure.Functions.Worker": "1.6.0",
+          "Microsoft.Extensions.Configuration.AzureAppConfiguration": "6.0.0"
+        }
+      },
       "Microsoft.Azure.Functions.Extensions": {
         "type": "Direct",
         "requested": "[1.1.0, )",
@@ -272,21 +282,6 @@
           "System.Net.Http": "4.3.0"
         }
       },
-      "Microsoft.Extensions.Configuration.AzureAppConfiguration": {
-        "type": "Direct",
-        "requested": "[5.1.0, )",
-        "resolved": "5.1.0",
-        "contentHash": "FoAfgvT/rjL/+c7BP7q0LrJIdc4Hu6SH56BTIUbwCwVjHoUw4dpgGtLQULi5GmMjdbdAxyLQSnbwpOEWuBy+RA==",
-        "dependencies": {
-          "Azure.Data.AppConfiguration": "1.2.0",
-          "Azure.Messaging.EventGrid": "4.7.0",
-          "Azure.Security.KeyVault.Secrets": "4.0.1",
-          "Microsoft.Extensions.Configuration": "3.1.18",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.18",
-          "Microsoft.Extensions.Logging": "3.1.18",
-          "System.Text.Json": "4.6.0"
-        }
-      },
       "Microsoft.FeatureManagement": {
         "type": "Direct",
         "requested": "[2.5.1, )",
@@ -724,6 +719,20 @@
           "Microsoft.Extensions.Primitives": "7.0.0"
         }
       },
+      "Microsoft.Extensions.Configuration.AzureAppConfiguration": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "oRCr8qqBp/37CXttfgbEWnPznHy0/ZCkgNVFFQ5cnXGvG8TBWicnAK032opyrbGIH3n2jYSg/PvIw7aLoOTy3Q==",
+        "dependencies": {
+          "Azure.Data.AppConfiguration": "1.2.0",
+          "Azure.Messaging.EventGrid": "4.7.0",
+          "Azure.Security.KeyVault.Secrets": "4.3.0",
+          "Microsoft.Extensions.Configuration": "3.1.18",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.18",
+          "Microsoft.Extensions.Logging": "3.1.18",
+          "System.Text.Json": "4.7.2"
+        }
+      },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
         "resolved": "5.0.0",

src/ApiService/IntegrationTests/packages.lock.json

@@ -374,6 +374,15 @@
         "resolved": "7.0.4",
         "contentHash": "LrTtzEkC28PBGDpohPtMOf26a8Sg5yvQyEtlG7z2YB93qloK2u8sqG6BDzj0rBiz/mpyVlkc8Nj36IJCvqWtPg=="
       },
+      "Microsoft.Azure.AppConfiguration.Functions.Worker": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "cwj73rhjH27VOg5pGB7mlTkX6do96u733T8m8int62RuxcQRKQVTuzh91hpQYFsf9IFAgS/RAwdO7fTAPJ7vOA==",
+        "dependencies": {
+          "Microsoft.Azure.Functions.Worker": "1.6.0",
+          "Microsoft.Extensions.Configuration.AzureAppConfiguration": "6.0.0"
+        }
+      },
       "Microsoft.Azure.Functions.Extensions": {
         "type": "Transitive",
         "resolved": "1.1.0",
@@ -645,16 +654,16 @@
       },
       "Microsoft.Extensions.Configuration.AzureAppConfiguration": {
         "type": "Transitive",
-        "resolved": "5.1.0",
-        "contentHash": "FoAfgvT/rjL/+c7BP7q0LrJIdc4Hu6SH56BTIUbwCwVjHoUw4dpgGtLQULi5GmMjdbdAxyLQSnbwpOEWuBy+RA==",
+        "resolved": "6.0.0",
+        "contentHash": "oRCr8qqBp/37CXttfgbEWnPznHy0/ZCkgNVFFQ5cnXGvG8TBWicnAK032opyrbGIH3n2jYSg/PvIw7aLoOTy3Q==",
         "dependencies": {
           "Azure.Data.AppConfiguration": "1.2.0",
           "Azure.Messaging.EventGrid": "4.7.0",
-          "Azure.Security.KeyVault.Secrets": "4.0.1",
+          "Azure.Security.KeyVault.Secrets": "4.3.0",
           "Microsoft.Extensions.Configuration": "3.1.18",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.18",
           "Microsoft.Extensions.Logging": "3.1.18",
-          "System.Text.Json": "4.6.0"
+          "System.Text.Json": "4.7.2"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
@@ -2487,6 +2496,7 @@
           "Azure.Storage.Blobs": "[12.13.0, )",
           "Azure.Storage.Queues": "[12.11.0, )",
           "Faithlife.Utility": "[0.12.2, )",
+          "Microsoft.Azure.AppConfiguration.Functions.Worker": "[6.0.0, )",
           "Microsoft.Azure.Functions.Extensions": "[1.1.0, )",
           "Microsoft.Azure.Functions.Worker": "[1.10.0, )",
           "Microsoft.Azure.Functions.Worker.ApplicationInsights": "[1.0.0-preview3, )",
@@ -2498,7 +2508,6 @@
           "Microsoft.Azure.Functions.Worker.Sdk": "[1.7.0, )",
           "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
           "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
-          "Microsoft.Extensions.Configuration.AzureAppConfiguration": "[5.1.0, )",
           "Microsoft.FeatureManagement": "[2.5.1, )",
           "Microsoft.Graph": "[4.37.0, )",
           "Microsoft.Identity.Client": "[4.52.0, )",

src/ApiService/Tests/packages.lock.json

@@ -423,6 +423,15 @@
         "resolved": "7.0.4",
         "contentHash": "LrTtzEkC28PBGDpohPtMOf26a8Sg5yvQyEtlG7z2YB93qloK2u8sqG6BDzj0rBiz/mpyVlkc8Nj36IJCvqWtPg=="
       },
+      "Microsoft.Azure.AppConfiguration.Functions.Worker": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "cwj73rhjH27VOg5pGB7mlTkX6do96u733T8m8int62RuxcQRKQVTuzh91hpQYFsf9IFAgS/RAwdO7fTAPJ7vOA==",
+        "dependencies": {
+          "Microsoft.Azure.Functions.Worker": "1.6.0",
+          "Microsoft.Extensions.Configuration.AzureAppConfiguration": "6.0.0"
+        }
+      },
       "Microsoft.Azure.Functions.Extensions": {
         "type": "Transitive",
         "resolved": "1.1.0",
@@ -694,16 +703,16 @@
       },
       "Microsoft.Extensions.Configuration.AzureAppConfiguration": {
         "type": "Transitive",
-        "resolved": "5.1.0",
-        "contentHash": "FoAfgvT/rjL/+c7BP7q0LrJIdc4Hu6SH56BTIUbwCwVjHoUw4dpgGtLQULi5GmMjdbdAxyLQSnbwpOEWuBy+RA==",
+        "resolved": "6.0.0",
+        "contentHash": "oRCr8qqBp/37CXttfgbEWnPznHy0/ZCkgNVFFQ5cnXGvG8TBWicnAK032opyrbGIH3n2jYSg/PvIw7aLoOTy3Q==",
         "dependencies": {
           "Azure.Data.AppConfiguration": "1.2.0",
           "Azure.Messaging.EventGrid": "4.7.0",
-          "Azure.Security.KeyVault.Secrets": "4.0.1",
+          "Azure.Security.KeyVault.Secrets": "4.3.0",
           "Microsoft.Extensions.Configuration": "3.1.18",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.18",
           "Microsoft.Extensions.Logging": "3.1.18",
-          "System.Text.Json": "4.6.0"
+          "System.Text.Json": "4.7.2"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
@@ -2614,6 +2623,7 @@
           "Azure.Storage.Blobs": "[12.13.0, )",
           "Azure.Storage.Queues": "[12.11.0, )",
           "Faithlife.Utility": "[0.12.2, )",
+          "Microsoft.Azure.AppConfiguration.Functions.Worker": "[6.0.0, )",
           "Microsoft.Azure.Functions.Extensions": "[1.1.0, )",
           "Microsoft.Azure.Functions.Worker": "[1.10.0, )",
           "Microsoft.Azure.Functions.Worker.ApplicationInsights": "[1.0.0-preview3, )",
@@ -2625,7 +2635,6 @@
           "Microsoft.Azure.Functions.Worker.Sdk": "[1.7.0, )",
           "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
           "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
-          "Microsoft.Extensions.Configuration.AzureAppConfiguration": "[5.1.0, )",
           "Microsoft.FeatureManagement": "[2.5.1, )",
           "Microsoft.Graph": "[4.37.0, )",
           "Microsoft.Identity.Client": "[4.52.0, )",

src/deployment/bicep-templates/feature-flags.bicep

@@ -13,10 +13,10 @@ resource featureFlags 'Microsoft.AppConfiguration/configurationStores@2022-05-01
 
 resource configStoreFeatureflag 'Microsoft.AppConfiguration/configurationStores/keyValues@2021-10-01-preview' = {
   parent: featureFlags
-  name: '.appconfig.featureflag~2FEnableScribanOnly'
+  name: '.appconfig.featureflag~2FRenderOnlyScribanTemplates'
   properties: {
     value: string({
-      id: 'EnableScribanOnly'
+      id: 'RenderOnlyScribanTemplates'
       description: 'Render notification templates with scriban only'
       enabled: false
     })
@@ -26,10 +26,10 @@ resource configStoreFeatureflag 'Microsoft.AppConfiguration/configurationStores/
 
 resource validateNotificationConfigSemantics 'Microsoft.AppConfiguration/configurationStores/keyValues@2021-10-01-preview' = {
   parent: featureFlags
-  name: '.appconfig.featureflag~2FEnableValidateNotificationConfigSemantics'
+  name: '.appconfig.featureflag~2FSemanticNotificationConfigValidation'
   properties: {
     value: string({
-      id: 'EnableScribanOnly'
+      id: 'SemanticNotificationConfigValidation'
       description: 'Check notification configs for valid PATs and fields'
       enabled: true
     })