Merge pull request #10340 from NuGet/dev

[ReleasePrep][2025.02.17]RI of dev into main

Author: v-ponkumar

src/NuGet.Jobs.Common/StorageAccountExtensions.cs

@@ -141,9 +141,7 @@ public static TableServiceClient CreateTableServiceClient(
             }
 
             StorageMsiConfiguration msiConfiguration = serviceProvider.GetRequiredService<IOptions<StorageMsiConfiguration>>().Value;
-            return CreateTableServiceClientClient(
-                msiConfiguration,
-                storageConnectionString);
+            return CreateTableServiceClient(msiConfiguration, storageConnectionString);
         }
 
         public static IRegistrationBuilder<TableServiceClient, SimpleActivatorData, SingleRegistrationStyle> RegisterTableServiceClient<TConfiguration>(
@@ -165,9 +163,7 @@ public static IRegistrationBuilder<TableServiceClient, SimpleActivatorData, Sing
                 IOptionsSnapshot<TConfiguration> options = c.Resolve<IOptionsSnapshot<TConfiguration>>();
                 string storageConnectionString = getConnectionString(options.Value);
                 StorageMsiConfiguration msiConfiguration = c.Resolve<IOptions<StorageMsiConfiguration>>().Value;
-                return CreateTableServiceClientClient(
-                    msiConfiguration,
-                    storageConnectionString);
+                return CreateTableServiceClient(msiConfiguration, storageConnectionString);
             });
         }
 
@@ -277,27 +273,27 @@ public static BlobServiceClientFactory CreateBlobServiceClientFactory(
             }
         }
 
-        private static TableServiceClient CreateTableServiceClientClient(
+        public static TableServiceClient CreateTableServiceClient(
             StorageMsiConfiguration msiConfiguration,
             string tableStorageConnectionString)
         {
             if (msiConfiguration.UseManagedIdentity)
             {
+                Uri tableEndpointUri = new Uri(tableStorageConnectionString);
+
                 if (string.IsNullOrWhiteSpace(msiConfiguration.ManagedIdentityClientId))
                 {
-                    return new TableServiceClient(new Uri(tableStorageConnectionString),
-                        new DefaultAzureCredential());
+                    return new TableServiceClient(tableEndpointUri, new DefaultAzureCredential());
                 }
                 else
                 {
-                    return new TableServiceClient(new Uri(tableStorageConnectionString),
-                        new ManagedIdentityCredential(msiConfiguration.ManagedIdentityClientId));
+                    return new TableServiceClient(tableEndpointUri, new ManagedIdentityCredential(msiConfiguration.ManagedIdentityClientId));
                 }
             }
 
             // workaround for https://github.com/Azure/azure-sdk-for-net/issues/44373
-            tableStorageConnectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");
-            return new TableServiceClient(tableStorageConnectionString);
+            var connectionString = tableStorageConnectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");
+            return new TableServiceClient(connectionString);
         }
     }
 }

src/NuGet.Services.Cursor/NuGet.Services.Cursor.csproj

@@ -6,6 +6,10 @@
     <Description>Shared cursor classes</Description>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\NuGet.Services.Storage\NuGet.Services.Storage.csproj" />
   </ItemGroup>

src/NuGet.Services.KeyVault/NuGet.Services.KeyVault.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="Azure.Security.KeyVault.Secrets" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>

src/NuGet.Services.ServiceBus/NuGet.Services.ServiceBus.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>

src/NuGet.Services.Status.Table/NuGet.Services.Status.Table.csproj

@@ -7,7 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Data.Tables" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>

src/NuGet.Services.Storage/AzureStorage.cs

@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Data.Tables;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
@@ -436,10 +437,11 @@ private Uri ResolvePathedUri(string filename)
             return ResolveUri(Path.Combine(_path, filename));
         }
 
+        // Returns the primary blob service URI from the connection string
         public static Uri GetPrimaryServiceUri(string storageConnectionString)
         {
             var tempClient = new BlobServiceClient(storageConnectionString);
-            // if _storageConnectionString has SAS token, Uri will contain SAS signature, we need to strip it 
+            // if _storageConnectionString has SAS token, Uri will contain SAS signature, we need to strip it
             return new Uri(tempClient.Uri.GetLeftPart(UriPartial.Path));
         }
     }

src/NuGet.Services.Storage/BlobLeaseService.cs

@@ -8,6 +8,7 @@
 using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Specialized;
+using Microsoft.Extensions.Logging;
 
 namespace NuGet.Services.Storage
 {
@@ -20,11 +21,11 @@ public class BlobLeaseService : IBlobLeaseService
     {
         private static readonly TimeSpan MinLeaseTime = TimeSpan.FromSeconds(15);
         private static readonly TimeSpan MaxLeaseTime = TimeSpan.FromSeconds(60);
-
         private readonly BlobContainerClient _containerClient;
         private readonly string _basePath;
+        private readonly bool _createBlobWhenMissing;
 
-        public BlobLeaseService(BlobServiceClient blobServiceClient, string containerName, string basePath)
+        public BlobLeaseService(BlobServiceClient blobServiceClient, string containerName, string basePath, Boolean createBlobsWhenMissing = true)
         {
             if (blobServiceClient == null)
             {
@@ -34,13 +35,13 @@ public BlobLeaseService(BlobServiceClient blobServiceClient, string containerNam
             {
                 throw new ArgumentException("The container name must be provided.", nameof(containerName));
             }
-            if (string.IsNullOrEmpty(basePath))
+            if (basePath == null)
             {
                 throw new ArgumentException("The base path must be provided.", nameof(basePath));
             }
-
             _containerClient = blobServiceClient.GetBlobContainerClient(containerName);
             _basePath = string.IsNullOrEmpty(basePath) ? string.Empty : basePath.TrimEnd('/') + '/';
+            _createBlobWhenMissing = createBlobsWhenMissing;
         }
 
         public async Task<BlobLeaseResult> TryAcquireAsync(string resourceName, TimeSpan leaseTime, CancellationToken cancellationToken)
@@ -54,7 +55,11 @@ public async Task<BlobLeaseResult> TryAcquireAsync(string resourceName, TimeSpan
             catch (RequestFailedException ex) when (ex.Status == (int)HttpStatusCode.NotFound)
             {
                 // The lease file does not exist. Try to create it and lease it.
-                return await TryCreateAndAcquireAsync(blob, leaseTime, cancellationToken);
+                if (_createBlobWhenMissing)
+                {
+                    return await TryCreateAndAcquireAsync(blob, leaseTime, cancellationToken);
+                }
+                return BlobLeaseResult.Failure();
             }
         }
 
@@ -65,7 +70,6 @@ public async Task<bool> ReleaseAsync(string resourceName, string leaseId, Cancel
                 var blob = GetBlob(resourceName);
                 var leaseClient = blob.GetBlobLeaseClient(leaseId);
                 await leaseClient.ReleaseAsync(conditions: null, cancellationToken: cancellationToken);
-
                 return true;
             }
             catch (RequestFailedException ex) when (ex.Status == (int)HttpStatusCode.Conflict)
@@ -94,6 +98,7 @@ public async Task<BlobLeaseResult> RenewAsync(string resourceName, string leaseI
             try
             {
                 var lease = await leaseClient.RenewAsync(conditions: null, cancellationToken: cancellationToken);
+
                 return BlobLeaseResult.Success(lease);
             }
             catch (RequestFailedException ex) when (ex.Status == (int)HttpStatusCode.Conflict || ex.Status == (int)HttpStatusCode.PreconditionFailed)
@@ -135,6 +140,7 @@ private async Task<BlobLeaseResult> TryAcquireAsync(BlobClient blob, TimeSpan le
             {
                 var leaseClient = blob.GetBlobLeaseClient();
                 var blobLease = await leaseClient.AcquireAsync(leaseTime, conditions: null, cancellationToken: cancellationToken);
+  
                 return BlobLeaseResult.Success(blobLease);
             }
             catch (RequestFailedException ex) when (ex.Status == (int)HttpStatusCode.Conflict)

src/NuGet.Services.Storage/NuGet.Services.Storage.csproj

@@ -7,11 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Data.Tables" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Storage.Blobs" />
     <PackageReference Include="Azure.Storage.Queues" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>

src/NuGet.Services.Validation.Issues/UnauthorizedCertificateFailure.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -9,14 +9,14 @@ namespace NuGet.Services.Validation.Issues
     public sealed class UnauthorizedCertificateFailure : ValidationIssue
     {
         [JsonConstructor]
-        public UnauthorizedCertificateFailure(string sha1Thumbprint)
+        public UnauthorizedCertificateFailure(string sha256Thumbprint)
         {
-            Sha1Thumbprint = sha1Thumbprint ?? throw new ArgumentNullException(nameof(sha1Thumbprint));
+            Sha256Thumbprint = sha256Thumbprint ?? throw new ArgumentNullException(nameof(sha256Thumbprint));
         }
 
         public override ValidationIssueCode IssueCode => ValidationIssueCode.PackageIsSignedWithUnauthorizedCertificate;
 
         [JsonProperty("t", Required = Required.Always)]
-        public string Sha1Thumbprint { get; }
+        public string Sha256Thumbprint { get; }
     }
-}
+}

src/NuGet.Services.Validation/NuGet.Services.Validation.csproj

@@ -17,6 +17,7 @@
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="EntityFramework" />
     <PackageReference Include="NuGet.Versioning" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>