Skip to content

Commit 0c269f7

Browse files
committed
Revert "Use MSI for storage access in GitHubVulnerabilities2Db"
This reverts commit 5e3dd5f.
1 parent 5e3dd5f commit 0c269f7

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

  • src/GitHubVulnerabilities2Db

src/GitHubVulnerabilities2Db/Job.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Threading;
77
using System.Threading.Tasks;
88
using Autofac;
9-
using Azure.Identity;
109
using Azure.Storage.Blobs;
1110
using GitHubVulnerabilities2Db.Configuration;
1211
using GitHubVulnerabilities2Db.Fakes;
@@ -32,7 +31,6 @@ namespace GitHubVulnerabilities2Db
3231
{
3332
public class Job : JsonConfigurationJob, IDisposable
3433
{
35-
private const string ManagedIdentityClientIdKey = "UserManagedIdentityClientId";
3634
private readonly HttpClient _client = new HttpClient();
3735

3836
public override async Task Run()
@@ -61,7 +59,7 @@ protected override void ConfigureAutofacServices(ContainerBuilder containerBuild
6159

6260
ConfigureQueryServices(containerBuilder);
6361
ConfigureIngestionServices(containerBuilder);
64-
ConfigureCollectorServices(containerBuilder, configurationRoot);
62+
ConfigureCollectorServices(containerBuilder);
6563
}
6664

6765
protected void ConfigureIngestionServices(ContainerBuilder containerBuilder)
@@ -161,14 +159,14 @@ protected void ConfigureQueryServices(ContainerBuilder containerBuilder)
161159
.As<IAdvisoryQueryService>();
162160
}
163161

164-
protected void ConfigureCollectorServices(ContainerBuilder containerBuilder, IConfigurationRoot configurationRoot)
162+
protected void ConfigureCollectorServices(ContainerBuilder containerBuilder)
165163
{
166164
containerBuilder
167165
.Register(ctx =>
168166
{
169167
var config = ctx.Resolve<GitHubVulnerabilities2DbConfiguration>();
170-
var credential = new ManagedIdentityCredential(configurationRoot[ManagedIdentityClientIdKey]);
171-
return new BlobServiceClient(new Uri(config.StorageConnectionString), credential);
168+
var connectionString = AzureStorageFactory.PrepareConnectionString(config.StorageConnectionString);
169+
return new BlobServiceClient(connectionString);
172170
})
173171
.As<BlobServiceClient>();
174172

0 commit comments

Comments
 (0)