Migrate StatusAggregator job to MSI storage authentication (#10328)

drewgillies · advay26 · web-flow · commit 8219a5baed8b · 2025-02-19T09:23:23.000+10:00
Co-authored-by: Advay Tandon &lt;advaytandon@microsoft.com&gt;
diff --git a/src/NuGet.Jobs.Common/StorageAccountExtensions.cs b/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);
         }
     }
 }
diff --git a/src/NuGet.Services.Storage/AzureStorage.cs b/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));
         }
     }
diff --git a/src/NuGet.Services.Storage/NuGet.Services.Storage.csproj b/src/NuGet.Services.Storage/NuGet.Services.Storage.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Data.Tables" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Storage.Blobs" />
     <PackageReference Include="Azure.Storage.Queues" />
diff --git a/src/StatusAggregator/Container/ContainerWrapper.cs b/src/StatusAggregator/Container/ContainerWrapper.cs
@@ -1,6 +1,8 @@
 // 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.IO;
+using System.Text;
 using System.Threading.Tasks;
 using Azure.Storage.Blobs;
 
@@ -20,10 +22,13 @@ public Task CreateIfNotExistsAsync()
             return _container.CreateIfNotExistsAsync();
         }
 
-        public Task SaveBlobAsync(string name, string contents)
+        public async Task SaveBlobAsync(string name, string contents)
         {
             var blob = _container.GetBlobClient(name);
-            return blob.UploadAsync(contents);
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
+            {
+                await blob.UploadAsync(stream, overwrite: true);
+            }
         }
     }
-}
+}
diff --git a/src/StatusAggregator/Job.cs b/src/StatusAggregator/Job.cs
@@ -115,8 +115,14 @@ private static void AddStorage(ContainerBuilder containerBuilder)
         {
             var statusStorageConnectionBuilders = new StatusStorageConnectionBuilder[]
             {
-                new StatusStorageConnectionBuilder(PrimaryStorageAccountName, configuration => configuration.StorageAccount),
-                new StatusStorageConnectionBuilder(SecondaryStorageAccountName, configuration => configuration.StorageAccountSecondary)
+                new StatusStorageConnectionBuilder(
+                        PrimaryStorageAccountName,
+                        configuration => configuration.PrimaryStorageBlobEndpoint,
+                        configuration => configuration.PrimaryStorageTableEndpoint),
+                new StatusStorageConnectionBuilder(
+                        SecondaryStorageAccountName,
+                        configuration => configuration.SecondaryStorageBlobEndpoint,
+                        configuration => configuration.SecondaryStorageTableEndpoint)
             };
             
             // Add all storages to the container by name.
@@ -165,35 +171,31 @@ private static void AddStorage(ContainerBuilder containerBuilder)
             }
         }
 
-        private static string GetConnectionString(IComponentContext ctx, StatusStorageConnectionBuilder statusStorageConnectionBuilder)
-        {
-            var configuration = ctx.Resolve<StatusAggregatorConfiguration>();
-            var connectionString = statusStorageConnectionBuilder.GetConnectionString(configuration);
-
-            // workaround for https://github.com/Azure/azure-sdk-for-net/issues/44373
-            connectionString = connectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");
-            return connectionString;
-        }
-
         private static TableServiceClient GetTableServiceClient(IComponentContext ctx, StatusStorageConnectionBuilder statusStorageConnectionBuilder)
         {
-            string connectionString = GetConnectionString(ctx, statusStorageConnectionBuilder);
-            return new TableServiceClient(connectionString);
+            StorageMsiConfiguration storageMsiConfiguration = ctx.Resolve<IOptionsSnapshot<StorageMsiConfiguration>>().Value;
+            StatusAggregatorConfiguration configuration = ctx.Resolve<IOptionsSnapshot<StatusAggregatorConfiguration>>().Value;
+            string connectionString = statusStorageConnectionBuilder.GetTableConnectionString(configuration);
+
+            return StorageAccountHelper.CreateTableServiceClient(storageMsiConfiguration, connectionString);
         }
 
-        private static ITableWrapper GetTableWrapper(IComponentContext ctx, TableServiceClient tableServiceClient)
+        private static TableWrapper GetTableWrapper(IComponentContext ctx, TableServiceClient tableServiceClient)
         {
             var configuration = ctx.Resolve<StatusAggregatorConfiguration>();
             return new TableWrapper(tableServiceClient, configuration.TableName);
         }
 
         private static BlobServiceClient GetBlobServiceClient(IComponentContext ctx, StatusStorageConnectionBuilder statusStorageConnectionBuilder)
         {
-            string connectionString = GetConnectionString(ctx, statusStorageConnectionBuilder);
-            return new BlobServiceClient(connectionString);
+            StorageMsiConfiguration storageMsiConfiguration = ctx.Resolve<IOptionsSnapshot<StorageMsiConfiguration>>().Value;
+            StatusAggregatorConfiguration configuration = ctx.Resolve<IOptionsSnapshot<StatusAggregatorConfiguration>>().Value;
+            string connectionString = statusStorageConnectionBuilder.GetBlobConnectionString(configuration);
+
+            return StorageAccountHelper.CreateBlobServiceClient(storageMsiConfiguration, connectionString);
         }
 
-        private static IContainerWrapper GetContainerWrapper(IComponentContext ctx, BlobServiceClient blobServiceClient)
+        private static ContainerWrapper GetContainerWrapper(IComponentContext ctx, BlobServiceClient blobServiceClient)
         {
             var configuration = ctx.Resolve<StatusAggregatorConfiguration>();
             var container = blobServiceClient.GetBlobContainerClient(configuration.ContainerName);
diff --git a/src/StatusAggregator/StatusAggregatorConfiguration.cs b/src/StatusAggregator/StatusAggregatorConfiguration.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.Collections.Generic;
@@ -8,9 +8,24 @@ namespace StatusAggregator
     public class StatusAggregatorConfiguration
     {
         /// <summary>
-        /// A connection string for the storage account to use.
+        /// A connection string for the primary storage account's blob endpoint.
         /// </summary>
-        public string StorageAccount { get; set; }
+        public string PrimaryStorageBlobEndpoint { get; set; }
+
+        /// <summary>
+        /// A connection string for the primary storage account's table endpoint.
+        /// </summary>
+        public string PrimaryStorageTableEndpoint { get; set; }
+
+        /// <summary>
+        /// A connection string for the secondary storage account's blob endpoint.
+        /// </summary>
+        public string SecondaryStorageBlobEndpoint { get; set; }
+
+        /// <summary>
+        /// A connection string for the secondary storage account's table endpoint.
+        /// </summary>
+        public string SecondaryStorageTableEndpoint { get; set; }
 
         /// <summary>
         /// The container name to export the <see cref="ServiceStatus"/> to.
@@ -22,11 +37,6 @@ public class StatusAggregatorConfiguration
         /// </summary>
         public string TableName { get; set; }
 
-        /// <summary>
-        /// A connection string for the secondary storage account to use.
-        /// </summary>
-        public string StorageAccountSecondary { get; set; }
-
         /// <summary>
         /// A list of environments to filter incidents by.
         /// See <see cref="EnvironmentFilter"/>.
diff --git a/src/StatusAggregator/StatusStorageConnectionBuilder.cs b/src/StatusAggregator/StatusStorageConnectionBuilder.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;
@@ -17,16 +17,23 @@ public class StatusStorageConnectionBuilder
         public string Name { get; }
 
         /// <summary>
-        /// Describes how to access this storage account's connection string using the job's configuration.
+        /// Describes how to access this storage account's blob connection string using the job's configuration.
         /// </summary>
-        public Func<StatusAggregatorConfiguration, string> GetConnectionString { get; }
+        public Func<StatusAggregatorConfiguration, string> GetBlobConnectionString { get; }
+
+        /// <summary>
+        /// Describes how to access this storage account's table connection string using the job's configuration.
+        /// </summary>
+        public Func<StatusAggregatorConfiguration, string> GetTableConnectionString { get; }
 
         public StatusStorageConnectionBuilder(
             string name,
-            Func<StatusAggregatorConfiguration, string> getConnectionString)
+            Func<StatusAggregatorConfiguration, string> getBlobConnectionString,
+            Func<StatusAggregatorConfiguration, string> getTableConnectionString)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
-            GetConnectionString = getConnectionString ?? throw new ArgumentNullException(nameof(getConnectionString));
+            GetBlobConnectionString = getBlobConnectionString ?? throw new ArgumentNullException(nameof(getBlobConnectionString));
+            GetTableConnectionString = getTableConnectionString ?? throw new ArgumentNullException(nameof(getTableConnectionString));
         }
     }
 }
diff --git a/src/StatusAggregator/Table/TableWrapper.cs b/src/StatusAggregator/Table/TableWrapper.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;
@@ -35,7 +35,7 @@ public Task CreateIfNotExistsAsync()
         public async Task<T> RetrieveAsync<T>(string rowKey) 
             where T : class, ITableEntity
         {
-            return (await _table.GetEntityAsync<T>(TablePartitionKeys.Get<T>(), rowKey)) as T;
+            return (await _table.GetEntityAsync<T>(TablePartitionKeys.Get<T>(), rowKey))?.Value as T;
         }
 
         public Task InsertAsync(ITableEntity tableEntity)

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,7 @@ public static TableServiceClient CreateTableServiceClient(`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`StorageMsiConfiguration msiConfiguration = serviceProvider.GetRequiredService<IOptions<StorageMsiConfiguration>>().Value;`
`144`		`- return CreateTableServiceClientClient(`
`145`		`- msiConfiguration,`
`146`		`- storageConnectionString);`
	`144`	`+ return CreateTableServiceClient(msiConfiguration, storageConnectionString);`
`147`	`145`	`}`
`148`	`146`
`149`	`147`	`public static IRegistrationBuilder<TableServiceClient, SimpleActivatorData, SingleRegistrationStyle> RegisterTableServiceClient<TConfiguration>(`
`@@ -165,9 +163,7 @@ public static IRegistrationBuilder<TableServiceClient, SimpleActivatorData, Sing`
`165`	`163`	`IOptionsSnapshot<TConfiguration> options = c.Resolve<IOptionsSnapshot<TConfiguration>>();`
`166`	`164`	`string storageConnectionString = getConnectionString(options.Value);`
`167`	`165`	`StorageMsiConfiguration msiConfiguration = c.Resolve<IOptions<StorageMsiConfiguration>>().Value;`
`168`		`- return CreateTableServiceClientClient(`
`169`		`- msiConfiguration,`
`170`		`- storageConnectionString);`
	`166`	`+ return CreateTableServiceClient(msiConfiguration, storageConnectionString);`
`171`	`167`	`});`
`172`	`168`	`}`
`173`	`169`
`@@ -277,27 +273,27 @@ public static BlobServiceClientFactory CreateBlobServiceClientFactory(`
`277`	`273`	`}`
`278`	`274`	`}`
`279`	`275`
`280`		`- private static TableServiceClient CreateTableServiceClientClient(`
	`276`	`+ public static TableServiceClient CreateTableServiceClient(`
`281`	`277`	`StorageMsiConfiguration msiConfiguration,`
`282`	`278`	`string tableStorageConnectionString)`
`283`	`279`	`{`
`284`	`280`	`if (msiConfiguration.UseManagedIdentity)`
`285`	`281`	`{`
	`282`	`+ Uri tableEndpointUri = new Uri(tableStorageConnectionString);`
	`283`	`+`
`286`	`284`	`if (string.IsNullOrWhiteSpace(msiConfiguration.ManagedIdentityClientId))`
`287`	`285`	`{`
`288`		`- return new TableServiceClient(new Uri(tableStorageConnectionString),`
`289`		`- new DefaultAzureCredential());`
	`286`	`+ return new TableServiceClient(tableEndpointUri, new DefaultAzureCredential());`
`290`	`287`	`}`
`291`	`288`	`else`
`292`	`289`	`{`
`293`		`- return new TableServiceClient(new Uri(tableStorageConnectionString),`
`294`		`- new ManagedIdentityCredential(msiConfiguration.ManagedIdentityClientId));`
	`290`	`+ return new TableServiceClient(tableEndpointUri, new ManagedIdentityCredential(msiConfiguration.ManagedIdentityClientId));`
`295`	`291`	`}`
`296`	`292`	`}`
`297`	`293`
`298`	`294`	`// workaround for https://github.com/Azure/azure-sdk-for-net/issues/44373`
`299`		`- tableStorageConnectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");`
`300`		`- return new TableServiceClient(tableStorageConnectionString);`
	`295`	`+ var connectionString = tableStorageConnectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");`
	`296`	`+ return new TableServiceClient(connectionString);`
`301`	`297`	`}`
`302`	`298`	`}`
`303`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Threading;`
`10`	`10`	`using System.Threading.Tasks;`
`11`	`11`	`using Azure;`
	`12`	`+using Azure.Data.Tables;`
`12`	`13`	`using Azure.Storage.Blobs;`
`13`	`14`	`using Azure.Storage.Blobs.Models;`
`14`	`15`	`using Azure.Storage.Blobs.Specialized;`
`@@ -436,10 +437,11 @@ private Uri ResolvePathedUri(string filename)`
`436`	`437`	`return ResolveUri(Path.Combine(_path, filename));`
`437`	`438`	`}`
`438`	`439`
	`440`	`+ // Returns the primary blob service URI from the connection string`
`439`	`441`	`public static Uri GetPrimaryServiceUri(string storageConnectionString)`
`440`	`442`	`{`
`441`	`443`	`var tempClient = new BlobServiceClient(storageConnectionString);`
`442`		`- // if _storageConnectionString has SAS token, Uri will contain SAS signature, we need to strip it`
	`444`	`+ // if _storageConnectionString has SAS token, Uri will contain SAS signature, we need to strip it`
`443`	`445`	`return new Uri(tempClient.Uri.GetLeftPart(UriPartial.Path));`
`444`	`446`	`}`
`445`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
	`4`	`+using System.IO;`
	`5`	`+using System.Text;`
`4`	`6`	`using System.Threading.Tasks;`
`5`	`7`	`using Azure.Storage.Blobs;`
`6`	`8`
`@@ -20,10 +22,13 @@ public Task CreateIfNotExistsAsync()`
`20`	`22`	`return _container.CreateIfNotExistsAsync();`
`21`	`23`	`}`
`22`	`24`
`23`		`- public Task SaveBlobAsync(string name, string contents)`
	`25`	`+ public async Task SaveBlobAsync(string name, string contents)`
`24`	`26`	`{`
`25`	`27`	`var blob = _container.GetBlobClient(name);`
`26`		`- return blob.UploadAsync(contents);`
	`28`	`+ using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))`
	`29`	`+ {`
	`30`	`+ await blob.UploadAsync(stream, overwrite: true);`
	`31`	`+ }`
`27`	`32`	`}`
`28`	`33`	`}`
`29`		`-}`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,14 @@ private static void AddStorage(ContainerBuilder containerBuilder)`
`115`	`115`	`{`
`116`	`116`	`var statusStorageConnectionBuilders = new StatusStorageConnectionBuilder[]`
`117`	`117`	`{`
`118`		`- new StatusStorageConnectionBuilder(PrimaryStorageAccountName, configuration => configuration.StorageAccount),`
`119`		`- new StatusStorageConnectionBuilder(SecondaryStorageAccountName, configuration => configuration.StorageAccountSecondary)`
	`118`	`+ new StatusStorageConnectionBuilder(`
	`119`	`+ PrimaryStorageAccountName,`
	`120`	`+ configuration => configuration.PrimaryStorageBlobEndpoint,`
	`121`	`+ configuration => configuration.PrimaryStorageTableEndpoint),`
	`122`	`+ new StatusStorageConnectionBuilder(`
	`123`	`+ SecondaryStorageAccountName,`
	`124`	`+ configuration => configuration.SecondaryStorageBlobEndpoint,`
	`125`	`+ configuration => configuration.SecondaryStorageTableEndpoint)`
`120`	`126`	`};`
`121`	`127`
`122`	`128`	`// Add all storages to the container by name.`
`@@ -165,35 +171,31 @@ private static void AddStorage(ContainerBuilder containerBuilder)`
`165`	`171`	`}`
`166`	`172`	`}`
`167`	`173`
`168`		`- private static string GetConnectionString(IComponentContext ctx, StatusStorageConnectionBuilder statusStorageConnectionBuilder)`
`169`		`- {`
`170`		`- var configuration = ctx.Resolve<StatusAggregatorConfiguration>();`
`171`		`- var connectionString = statusStorageConnectionBuilder.GetConnectionString(configuration);`
`172`		`-`
`173`		`- // workaround for https://github.com/Azure/azure-sdk-for-net/issues/44373`
`174`		`- connectionString = connectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");`
`175`		`- return connectionString;`
`176`		`- }`
`177`		`-`
`178`	`174`	`private static TableServiceClient GetTableServiceClient(IComponentContext ctx, StatusStorageConnectionBuilder statusStorageConnectionBuilder)`
`179`	`175`	`{`
`180`		`- string connectionString = GetConnectionString(ctx, statusStorageConnectionBuilder);`
`181`		`- return new TableServiceClient(connectionString);`
	`176`	`+ StorageMsiConfiguration storageMsiConfiguration = ctx.Resolve<IOptionsSnapshot<StorageMsiConfiguration>>().Value;`
	`177`	`+ StatusAggregatorConfiguration configuration = ctx.Resolve<IOptionsSnapshot<StatusAggregatorConfiguration>>().Value;`
	`178`	`+ string connectionString = statusStorageConnectionBuilder.GetTableConnectionString(configuration);`
	`179`	`+`
	`180`	`+ return StorageAccountHelper.CreateTableServiceClient(storageMsiConfiguration, connectionString);`
`182`	`181`	`}`
`183`	`182`
`184`		`- private static ITableWrapper GetTableWrapper(IComponentContext ctx, TableServiceClient tableServiceClient)`
	`183`	`+ private static TableWrapper GetTableWrapper(IComponentContext ctx, TableServiceClient tableServiceClient)`
`185`	`184`	`{`
`186`	`185`	`var configuration = ctx.Resolve<StatusAggregatorConfiguration>();`
`187`	`186`	`return new TableWrapper(tableServiceClient, configuration.TableName);`
`188`	`187`	`}`
`189`	`188`
`190`	`189`	`private static BlobServiceClient GetBlobServiceClient(IComponentContext ctx, StatusStorageConnectionBuilder statusStorageConnectionBuilder)`
`191`	`190`	`{`
`192`		`- string connectionString = GetConnectionString(ctx, statusStorageConnectionBuilder);`
`193`		`- return new BlobServiceClient(connectionString);`
	`191`	`+ StorageMsiConfiguration storageMsiConfiguration = ctx.Resolve<IOptionsSnapshot<StorageMsiConfiguration>>().Value;`
	`192`	`+ StatusAggregatorConfiguration configuration = ctx.Resolve<IOptionsSnapshot<StatusAggregatorConfiguration>>().Value;`
	`193`	`+ string connectionString = statusStorageConnectionBuilder.GetBlobConnectionString(configuration);`
	`194`	`+`
	`195`	`+ return StorageAccountHelper.CreateBlobServiceClient(storageMsiConfiguration, connectionString);`
`194`	`196`	`}`
`195`	`197`
`196`		`- private static IContainerWrapper GetContainerWrapper(IComponentContext ctx, BlobServiceClient blobServiceClient)`
	`198`	`+ private static ContainerWrapper GetContainerWrapper(IComponentContext ctx, BlobServiceClient blobServiceClient)`
`197`	`199`	`{`
`198`	`200`	`var configuration = ctx.Resolve<StatusAggregatorConfiguration>();`
`199`	`201`	`var container = blobServiceClient.GetBlobContainerClient(configuration.ContainerName);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) .NET Foundation. All rights reserved.`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -35,7 +35,7 @@ public Task CreateIfNotExistsAsync()`
`35`	`35`	`public async Task<T> RetrieveAsync<T>(string rowKey)`
`36`	`36`	`where T : class, ITableEntity`
`37`	`37`	`{`
`38`		`- return (await _table.GetEntityAsync<T>(TablePartitionKeys.Get<T>(), rowKey)) as T;`
	`38`	`+ return (await _table.GetEntityAsync<T>(TablePartitionKeys.Get<T>(), rowKey))?.Value as T;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public Task InsertAsync(ITableEntity tableEntity)`