Update to latest ServerCommon (v2.123.0) (#10108)

The enablePublicAccess values were determined based on current PROD container public access.
NuGet · Aug 2, 2024 · d8c3780 · d8c3780
1 parent a782405
commit d8c3780
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
     <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
     <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
-    <ServerCommonPackageVersion>2.122.0</ServerCommonPackageVersion>
+    <ServerCommonPackageVersion>2.123.0</ServerCommonPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />

diff --git a/src/Gallery.CredentialExpiration/Job.cs b/src/Gallery.CredentialExpiration/Job.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;
@@ -56,6 +56,7 @@ public override void Init(IServiceContainer serviceContainer, IDictionary<string
             var storageFactory = new AzureStorageFactory(
                 storageAccount,
                 InitializationConfiguration.ContainerName,
+                enablePublicAccess: false,
                 LoggerFactory.CreateLogger<AzureStorage>());
             Storage = storageFactory.Create();
         }
@@ -182,4 +183,4 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi
             ConfigureInitializationSection<InitializationConfiguration>(services, configurationRoot);
         }
     }
-}
+}
diff --git a/src/GitHubVulnerabilities2Db/Job.cs b/src/GitHubVulnerabilities2Db/Job.cs
@@ -176,6 +176,7 @@ protected void ConfigureCollectorServices(ContainerBuilder containerBuilder)
                     return new AzureStorageFactory(
                         ctx.Resolve<BlobServiceClient>(),
                         ctx.Resolve<GitHubVulnerabilities2DbConfiguration>().CursorContainerName,
+                        enablePublicAccess: true,
                         ctx.Resolve<ILogger<AzureStorage>>());
                 })
                 .As<StorageFactory>()

diff --git a/src/GitHubVulnerabilities2v3/Job.cs b/src/GitHubVulnerabilities2v3/Job.cs
@@ -128,6 +128,7 @@ protected void ConfigureCollectorServices(ContainerBuilder containerBuilder)
                     return new AzureStorageFactory(
                         ctx.Resolve<BlobServiceClient>(),
                         ctx.Resolve<GitHubVulnerabilities2v3Configuration>().V3VulnerabilityContainerName,
+                        enablePublicAccess: true,
                         ctx.Resolve<ILogger<AzureStorage>>());
                 })
                 .As<StorageFactory>()

diff --git a/src/Stats.PostProcessReports/Job.cs b/src/Stats.PostProcessReports/Job.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.Threading.Tasks;
@@ -50,6 +50,7 @@ protected override void ConfigureAutofacServices(ContainerBuilder containerBuild
                     var factory = new AzureStorageFactory(
                         c.Resolve<BlobServiceClient>(),
                         cfg.SourceContainerName,
+                        enablePublicAccess: false,
                         c.Resolve<ILogger<AzureStorage>>(),
                         cfg.SourcePath + cfg.DetailedReportDirectoryName,
                         initializeContainer: false);
@@ -66,6 +67,7 @@ protected override void ConfigureAutofacServices(ContainerBuilder containerBuild
                     var factory = new AzureStorageFactory(
                         c.Resolve<BlobServiceClient>(),
                         cfg.WorkContainerName,
+                        enablePublicAccess: false,
                         c.Resolve<ILogger<AzureStorage>>(),
                         cfg.WorkPath,
                         initializeContainer: false);
@@ -82,6 +84,7 @@ protected override void ConfigureAutofacServices(ContainerBuilder containerBuild
                     var factory = new AzureStorageFactory(
                         c.Resolve<BlobServiceClient>(),
                         cfg.DestinationContainerName,
+                        enablePublicAccess: true,
                         c.Resolve<ILogger<AzureStorage>>(),
                         cfg.DestinationPath,
                         initializeContainer: false);

diff --git a/src/Validation.PackageSigning.ProcessSignature/Job.cs b/src/Validation.PackageSigning.ProcessSignature/Job.cs
@@ -52,7 +52,11 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi
                 var config = p.GetRequiredService<IOptionsSnapshot<CertificateStoreConfiguration>>().Value;
                 var targetStorageAccount = new BlobServiceClient(AzureStorageFactory.PrepareConnectionString(config.DataStorageAccount));
 
-                var storageFactory = new AzureStorageFactory(targetStorageAccount, config.ContainerName, LoggerFactory.CreateLogger<AzureStorage>());
+                var storageFactory = new AzureStorageFactory(
+                    targetStorageAccount,
+                    config.ContainerName,
+                    enablePublicAccess: false,
+                    LoggerFactory.CreateLogger<AzureStorage>());
                 var storage = storageFactory.Create();
 
                 return new CertificateStore(storage, LoggerFactory.CreateLogger<CertificateStore>());

diff --git a/src/Validation.PackageSigning.ValidateCertificate/Job.cs b/src/Validation.PackageSigning.ValidateCertificate/Job.cs
@@ -33,7 +33,11 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi
                 var config = p.GetRequiredService<IOptionsSnapshot<CertificateStoreConfiguration>>().Value;
                 var targetStorageAccount = new BlobServiceClient(AzureStorageFactory.PrepareConnectionString(config.DataStorageAccount));
 
-                var storageFactory = new AzureStorageFactory(targetStorageAccount, config.ContainerName, LoggerFactory.CreateLogger<AzureStorage>());
+                var storageFactory = new AzureStorageFactory(
+                    targetStorageAccount,
+                    config.ContainerName,
+                    enablePublicAccess: false,
+                    LoggerFactory.CreateLogger<AzureStorage>());
                 var storage = storageFactory.Create();
 
                 return new CertificateStore(storage, LoggerFactory.CreateLogger<CertificateStore>());