From 05d4836affcc6970957bb03b67e26914113438e9 Mon Sep 17 00:00:00 2001
From: Ruben Guerrero <rubengu@microsoft.com>
Date: Wed, 14 Aug 2024 15:00:20 -0700
Subject: [PATCH] Fix Component Governance alerts (#254)

---
 .../WinGet.RestSource.AppConfig.csproj             | 14 +++++++-------
 src/WinGet.RestSource.Functions/SourceFunctions.cs |  8 +-------
 src/WinGet.RestSource.Functions/Startup.cs         |  7 +++++--
 .../WinGet.RestSource.Functions.csproj             |  4 ++--
 .../Tests/AzFunctions/SourceFunctionsTests.cs      |  4 ++--
 src/WinGet.RestSource/WinGet.RestSource.csproj     |  3 ++-
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/WinGet.RestSource.AppConfig/WinGet.RestSource.AppConfig.csproj b/src/WinGet.RestSource.AppConfig/WinGet.RestSource.AppConfig.csproj
index f03cb729..d50639c9 100644
--- a/src/WinGet.RestSource.AppConfig/WinGet.RestSource.AppConfig.csproj
+++ b/src/WinGet.RestSource.AppConfig/WinGet.RestSource.AppConfig.csproj
@@ -14,7 +14,7 @@
     <PropertyGroup>
         <WarningsAsErrors />
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <!-- Warning 1701;1702: These two compiler warnings are raised when a reference is bound to a different version
+        <!-- Warning 1701;1702: These two compiler warnings are raised when a reference is bound to a different version
              than specified in the assembly reference version number. -->
         <!-- Warning NU1701: Warning for using Nuget packages in a .Net Core project compiled in .Net Framework. -->
         <NoWarn>1701;1702;NU1701</NoWarn>
@@ -42,13 +42,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.22.0" />
         <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="4.1.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.12" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.12" />
-        <PackageReference Include="Microsoft.FeatureManagement" Version="2.2.0" />
-        <PackageReference Include="Azure.Identity" Version="1.11.3" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.FeatureManagement" Version="2.2.0" />
+        <PackageReference Include="Azure.Identity" Version="1.11.4" />
     </ItemGroup>
 
     <!-- Component Governance fix Item Group. -->
@@ -57,6 +56,7 @@
         <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+        <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Microsoft.WindowsPackageManager.Rest\Microsoft.WindowsPackageManager.Rest.csproj" />
diff --git a/src/WinGet.RestSource.Functions/SourceFunctions.cs b/src/WinGet.RestSource.Functions/SourceFunctions.cs
index 99cb80aa..ae93772e 100644
--- a/src/WinGet.RestSource.Functions/SourceFunctions.cs
+++ b/src/WinGet.RestSource.Functions/SourceFunctions.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <copyright file="SourceFunctions.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -311,8 +311,6 @@ internal async Task<SourceResultOutputHelper> SourceOrchestratorHelperAsync<TFun
                 customDimensions.Add("FunctionName", executionContext.FunctionName);
                 customDimensions.Add("OperationId", inputHelper.OperationId);
 
-                this.telemetryClient.TrackEvent("ExecutionStart", customDimensions);
-
                 durableContext.LogInfo($"{loggingContext}{orchestrationFunction} executed at: {durableContext.CurrentUtcDateTime}." +
                     $" Calling {activityFunction} activity function.");
 
@@ -326,10 +324,7 @@ internal async Task<SourceResultOutputHelper> SourceOrchestratorHelperAsync<TFun
             catch (Exception e)
             {
                 durableContext.LogError($"{loggingContext}Error occurred in SourceOrchestratorHelperAsync {e}");
-
-                this.telemetryClient.TrackException(e, customDimensions);
                 customDimensions.Add("Exception", e.GetType().FullName);
-
                 Metrics.EmitMetric(errorMetric, customDimensions, logger);
             }
             finally
@@ -339,7 +334,6 @@ internal async Task<SourceResultOutputHelper> SourceOrchestratorHelperAsync<TFun
                     durableContext.LogInfo($"{loggingContext}Task result: {sourceResultOutput}");
                 }
 
-                this.telemetryClient.TrackEvent("ExecutionCompleted", customDimensions);
                 customDimensions.Add("Result", sourceResultOutput.ToString());
             }
 
diff --git a/src/WinGet.RestSource.Functions/Startup.cs b/src/WinGet.RestSource.Functions/Startup.cs
index 1f089a8d..bdd33544 100644
--- a/src/WinGet.RestSource.Functions/Startup.cs
+++ b/src/WinGet.RestSource.Functions/Startup.cs
@@ -25,6 +25,7 @@ namespace Microsoft.WinGet.RestSource.Functions
     using Microsoft.WinGet.RestSource.Interfaces;
     using Microsoft.WinGet.RestSource.Utils.Common;
     using Microsoft.WinGet.RestSource.Utils.Constants;
+    using YamlDotNet.Core.Tokens;
 
     /// <summary>
     /// Azure function startup class.
@@ -66,12 +67,14 @@ private static void InjectTelemetryConfiguration(IFunctionsHostBuilder builder)
             builder.Services.AddSingleton<TelemetryConfiguration>(sp =>
             {
                 var key = AzureFunctionEnvironment.AppInsightsInstrumentationKey;
+                var telemetryConfiguration = new TelemetryConfiguration();
+
                 if (!string.IsNullOrWhiteSpace(key))
                 {
-                    return new TelemetryConfiguration(key);
+                    telemetryConfiguration.ConnectionString = $"InstrumentationKey={key}";
                 }
 
-                return new TelemetryConfiguration();
+                return telemetryConfiguration;
             });
         }
     }
diff --git a/src/WinGet.RestSource.Functions/WinGet.RestSource.Functions.csproj b/src/WinGet.RestSource.Functions/WinGet.RestSource.Functions.csproj
index d712dd7a..51f54dbb 100644
--- a/src/WinGet.RestSource.Functions/WinGet.RestSource.Functions.csproj
+++ b/src/WinGet.RestSource.Functions/WinGet.RestSource.Functions.csproj
@@ -13,7 +13,7 @@
   <PropertyGroup>
     <WarningsAsErrors />
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- Warning 1701;1702: These two compiler warnings are raised when a reference is bound to a different version
+    <!-- Warning 1701;1702: These two compiler warnings are raised when a reference is bound to a different version
          than specified in the assembly reference version number. -->
     <!-- Warning NU1701: Warning for using Nuget packages in a .Net Core project compiled in .Net Framework. -->
     <NoWarn>1701;1702;NU1701</NoWarn>
@@ -46,7 +46,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.CosmosDB" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.7.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.13.5" />
   </ItemGroup>
 
   <!-- Component Governance fix Item Group. -->
diff --git a/src/WinGet.RestSource.UnitTest/Tests/AzFunctions/SourceFunctionsTests.cs b/src/WinGet.RestSource.UnitTest/Tests/AzFunctions/SourceFunctionsTests.cs
index d4519e2e..40e15093 100644
--- a/src/WinGet.RestSource.UnitTest/Tests/AzFunctions/SourceFunctionsTests.cs
+++ b/src/WinGet.RestSource.UnitTest/Tests/AzFunctions/SourceFunctionsTests.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <copyright file="SourceFunctionsTests.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -51,7 +51,7 @@ public SourceFunctionsTests(ITestOutputHelper log)
             this.telemetryConfiguration = new TelemetryConfiguration
             {
                 TelemetryChannel = this.mockTelemetryChannel.Object,
-                InstrumentationKey = Guid.NewGuid().ToString(),
+                ConnectionString = $"InstrumentationKey={Guid.NewGuid()}",
             };
 
             this.mockHttpClientFactory.Setup(
diff --git a/src/WinGet.RestSource/WinGet.RestSource.csproj b/src/WinGet.RestSource/WinGet.RestSource.csproj
index 9c4cc61c..c4622315 100644
--- a/src/WinGet.RestSource/WinGet.RestSource.csproj
+++ b/src/WinGet.RestSource/WinGet.RestSource.csproj
@@ -46,7 +46,7 @@
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.22.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Azure.Identity" Version="1.11.3" />
+    <PackageReference Include="Azure.Identity" Version="1.11.4" />
   </ItemGroup>
 
   <!-- Component Governance fix Item Group. -->
@@ -56,6 +56,7 @@
     <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
   <ItemGroup>