From 0803e986702853e6170cf05943fabcf4213934a6 Mon Sep 17 00:00:00 2001 From: Jonathon Saunders Date: Wed, 3 Aug 2022 16:56:34 -0700 Subject: [PATCH 1/2] Fix GetExistingStorageAccountAsync --- src/deploy-cromwell-on-azure/Deployer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/deploy-cromwell-on-azure/Deployer.cs b/src/deploy-cromwell-on-azure/Deployer.cs index 09423d9aa..ddaf984dc 100644 --- a/src/deploy-cromwell-on-azure/Deployer.cs +++ b/src/deploy-cromwell-on-azure/Deployer.cs @@ -1024,11 +1024,11 @@ private Task CreateStorageAccountAsync() .CreateAsync(cts.Token)); private async Task GetExistingStorageAccountAsync(string storageAccountName) - => (await Task.WhenAll(subscriptionIds.Select(s => + => (await Task.WhenAll(subscriptionIds.Select(async s => { try { - return azureClient.WithSubscription(s).StorageAccounts.ListAsync(); + return await azureClient.WithSubscription(s).StorageAccounts.ListAsync(); } catch (Exception) { @@ -1036,8 +1036,8 @@ private async Task GetExistingStorageAccountAsync(string storag return null; } }))) - .SelectMany(a => a) .Where(a => a is not null) + .SelectMany(a => a) .SingleOrDefault(a => a.Name.Equals(storageAccountName, StringComparison.OrdinalIgnoreCase) && a.RegionName.Equals(configuration.RegionName, StringComparison.OrdinalIgnoreCase)); private async Task GetExistingBatchAccountAsync(string batchAccountName) From 2b653720730e3b15df04fc19013656fdce30dbaa Mon Sep 17 00:00:00 2001 From: Jonathon Saunders Date: Wed, 3 Aug 2022 16:59:14 -0700 Subject: [PATCH 2/2] Add the same logic for batch accounts --- src/deploy-cromwell-on-azure/Deployer.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/deploy-cromwell-on-azure/Deployer.cs b/src/deploy-cromwell-on-azure/Deployer.cs index ddaf984dc..a103b1d1e 100644 --- a/src/deploy-cromwell-on-azure/Deployer.cs +++ b/src/deploy-cromwell-on-azure/Deployer.cs @@ -1041,7 +1041,19 @@ private async Task GetExistingStorageAccountAsync(string storag .SingleOrDefault(a => a.Name.Equals(storageAccountName, StringComparison.OrdinalIgnoreCase) && a.RegionName.Equals(configuration.RegionName, StringComparison.OrdinalIgnoreCase)); private async Task GetExistingBatchAccountAsync(string batchAccountName) - => (await Task.WhenAll(subscriptionIds.Select(s => new BatchManagementClient(tokenCredentials) { SubscriptionId = s }.BatchAccount.ListAsync()))) + => (await Task.WhenAll(subscriptionIds.Select(async s => + { + try + { + var client = new BatchManagementClient(tokenCredentials) { SubscriptionId = s }; + return await client.BatchAccount.ListAsync(); + } + catch (Exception) + { + return null; + } + }))) + .Where(a => a is not null) .SelectMany(a => a) .SingleOrDefault(a => a.Name.Equals(batchAccountName, StringComparison.OrdinalIgnoreCase) && a.Location.Equals(configuration.RegionName, StringComparison.OrdinalIgnoreCase));