bump nuget packages (#2321)

Co-authored-by: stas <statis@microsoft.com>
2025-06-22 14:19:03 +00:00 · 2022-08-30 13:58:07 -07:00
parent ea4d589abf
commit 8d23df328d
14 changed files with 168 additions and 156 deletions
--- a/src/ApiService/ApiService/ApiService.csproj
+++ b/src/ApiService/ApiService/ApiService.csproj
@ -24,13 +24,13 @@
    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" OutputItemType="Analyzer" />
    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.6.0" />
    <PackageReference Include="Azure.Data.Tables" Version="12.5.0" />
-    <PackageReference Include="Azure.ResourceManager.Compute" Version="1.0.0-beta.8" />
+    <PackageReference Include="Azure.ResourceManager.Compute" Version="1.0.0" />
    <PackageReference Include="Azure.Core" Version="1.25.0" />
    <PackageReference Include="Azure.Identity" Version="1.6.0" />
    <PackageReference Include="Azure.Messaging.EventGrid" Version="4.10.0" />
-    <PackageReference Include="Azure.ResourceManager" Version="1.2.1" />
+    <PackageReference Include="Azure.ResourceManager" Version="1.3.1" />
    <PackageReference Include="Azure.ResourceManager.Network" Version="1.0.0" />
-    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.0.0" />
+    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.3.0" />
    <PackageReference Include="Azure.ResourceManager.Storage" Version="1.0.0-beta.11" />
    <PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
    <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
--- a/src/ApiService/ApiService/onefuzzlib/Creds.cs
+++ b/src/ApiService/ApiService/onefuzzlib/Creds.cs
@ -33,6 +33,7 @@ public interface ICreds {
    public Async.Task<T> QueryMicrosoftGraph<T>(HttpMethod method, string resource);

    public GenericResource ParseResourceId(string resourceId);
+    public GenericResource ParseResourceId(ResourceIdentifier resourceId);

    public Async.Task<GenericResource> GetData(GenericResource resource);
    Async.Task<IReadOnlyList<string>> GetRegions();
@ -168,6 +169,10 @@ public sealed class Creds : ICreds, IDisposable {
        }
    }

+    public GenericResource ParseResourceId(ResourceIdentifier resourceId) {
+        return ArmClient.GetGenericResource(resourceId);
+    }
+
    public GenericResource ParseResourceId(string resourceId) {
        return ArmClient.GetGenericResource(new ResourceIdentifier(resourceId));
    }
--- a/src/ApiService/ApiService/onefuzzlib/DiskOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/DiskOperations.cs
@ -5,7 +5,7 @@ using Azure.ResourceManager.Compute;
 namespace Microsoft.OneFuzz.Service;

 public interface IDiskOperations {
-    DiskCollection ListDisks(string resourceGroup);
+    DiskImageCollection ListDisks(string resourceGroup);

    Async.Task<bool> DeleteDisk(string resourceGroup, string name);
 }
@ -23,7 +23,7 @@ public class DiskOperations : IDiskOperations {
    public async Task<bool> DeleteDisk(string resourceGroup, string name) {
        try {
            _logTracer.Info($"deleting disks {resourceGroup} : {name}");
-            var disk = await _creds.GetResourceGroupResource().GetDiskAsync(name);
+            var disk = await _creds.GetResourceGroupResource().GetDiskImageAsync(name);
            if (disk != null) {
                await disk.Value.DeleteAsync(WaitUntil.Started);
                return true;
@ -35,8 +35,8 @@ public class DiskOperations : IDiskOperations {
        return false;
    }

-    public DiskCollection ListDisks(string resourceGroup) {
+    public DiskImageCollection ListDisks(string resourceGroup) {
        _logTracer.Info($"listing disks {resourceGroup}");
-        return _creds.GetResourceGroupResource().GetDisks();
+        return _creds.GetResourceGroupResource().GetDiskImages();
    }
 }
--- a/src/ApiService/ApiService/onefuzzlib/ImageOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/ImageOperations.cs
@ -65,7 +65,7 @@ public class ImageOperations : IImageOperations {
                }
            } else {
                try {
-                    name = (await _context.Creds.GetResourceGroupResource().GetImages().GetAsync(
+                    name = (await _context.Creds.GetResourceGroupResource().GetDiskImages().GetAsync(
                        parsed.Data.Name
                    )).Value.Data.StorageProfile.OSDisk.OSType.ToString().ToLowerInvariant();
                } catch (Exception ex) when (
@ -96,13 +96,15 @@ public class ImageOperations : IImageOperations {
                    version = imageInfo.Version;
                }

-                name = (await subscription.GetVirtualMachineImageAsync(
-                    region,
-                    imageInfo.Publisher,
-                    imageInfo.Offer,
-                    imageInfo.Sku
-                    , version
-                )).Value.OSDiskImageOperatingSystem.ToString().ToLower();
+                var vmImage = await subscription.GetVirtualMachineImageAsync(
+                            region,
+                            imageInfo.Publisher,
+                            imageInfo.Offer,
+                            imageInfo.Sku
+                            , version
+                        );
+
+                name = vmImage.Value.OSDiskImageOperatingSystem!.Value.ToString().ToLower();
            } catch (RequestFailedException ex) {
                return OneFuzzResult<Os>.Error(
                    ErrorCode.INVALID_IMAGE,
--- a/src/ApiService/ApiService/onefuzzlib/IpOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/IpOperations.cs
@ -14,7 +14,7 @@ public interface IIpOperations {

    public Async.Task<OneFuzzResultVoid> CreatePublicNic(string resourceGroup, string name, string region, Nsg? nsg);

-    public Async.Task<string?> GetPublicIp(string resourceId);
+    public Async.Task<string?> GetPublicIp(ResourceIdentifier resourceId);

    public Async.Task<PublicIPAddressResource?> GetIp(string resourceGroup, string name);

@ -87,7 +87,7 @@ public class IpOperations : IIpOperations {
        return ips.FirstOrDefault();
    }

-    public async Task<string?> GetPublicIp(string resourceId) {
+    public async Task<string?> GetPublicIp(ResourceIdentifier resourceId) {
        // TODO: Parts of this function seem redundant, but I'm mirroring
        // the python code exactly. We should revisit this.
        _logTracer.Info($"getting ip for {resourceId}");
--- a/src/ApiService/ApiService/onefuzzlib/ProxyOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/ProxyOperations.cs
@ -217,7 +217,7 @@ public class ProxyOperations : StatefulOrm<Proxy, VmState, ProxyOperations>, IPr
        }

        foreach (var status in instanceView.Statuses) {
-            if (status.Level == StatusLevelTypes.Error) {
+            if (status.Level == ComputeStatusLevelType.Error) {
                yield return $"code:{status.Code} status:{status.DisplayStatus} message:{status.Message}";
            }
        }
--- a/src/ApiService/ApiService/onefuzzlib/VmExtensionWrapper.cs
+++ b/src/ApiService/ApiService/onefuzzlib/VmExtensionWrapper.cs
@ -27,7 +27,7 @@ namespace Microsoft.OneFuzz.Service {
            var protectedSettings = ProtectedSettings ?? new BinaryData(new Dictionary<string, string>());

            return (Name!, new VirtualMachineExtensionData(Location.Value) {
-                TypePropertiesType = TypePropertiesType,
+                ExtensionType = TypePropertiesType,
                Publisher = Publisher,
                TypeHandlerVersion = TypeHandlerVersion,
                AutoUpgradeMinorVersion = AutoUpgradeMinorVersion,
@ -49,8 +49,7 @@ namespace Microsoft.OneFuzz.Service {
            var protectedSettings = ProtectedSettings ?? new BinaryData(new Dictionary<string, string>());

            return new VirtualMachineScaleSetExtensionData() {
-                Name = Name,
-                TypePropertiesType = TypePropertiesType,
+                ExtensionType = TypePropertiesType,
                Publisher = Publisher,
                TypeHandlerVersion = TypeHandlerVersion,
                AutoUpgradeMinorVersion = AutoUpgradeMinorVersion,
--- a/src/ApiService/ApiService/onefuzzlib/VmOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/VmOperations.cs
@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Azure;
+using Azure.Core;
 using Azure.ResourceManager.Compute;
 using Azure.ResourceManager.Compute.Models;
 using Newtonsoft.Json;
@ -67,7 +68,7 @@ public class VmOperations : IVmOperations {
    public async Task<VirtualMachineData?> GetVm(string name) {
        // _logTracer.Debug($"getting vm: {name}");
        try {
-            var result = await _context.Creds.GetResourceGroupResource().GetVirtualMachineAsync(name, InstanceViewTypes.InstanceView);
+            var result = await _context.Creds.GetResourceGroupResource().GetVirtualMachineAsync(name, InstanceViewType.InstanceView);
            if (result == null) {
                return null;
            }
@ -255,20 +256,20 @@ public class VmOperations : IVmOperations {
        }

        var vmParams = new VirtualMachineData(location) {
-            OSProfile = new OSProfile {
+            OSProfile = new VirtualMachineOSProfile {
                ComputerName = "node",
                AdminUsername = "onefuzz",
            },
-            HardwareProfile = new HardwareProfile {
+            HardwareProfile = new VirtualMachineHardwareProfile {
                VmSize = vmSku,
            },
-            StorageProfile = new StorageProfile {
+            StorageProfile = new VirtualMachineStorageProfile {
                ImageReference = GenerateImageReference(image),
            },
-            NetworkProfile = new NetworkProfile(),
+            NetworkProfile = new VirtualMachineNetworkProfile(),
        };

-        vmParams.NetworkProfile.NetworkInterfaces.Add(new NetworkInterfaceReference { Id = nic.Id });
+        vmParams.NetworkProfile.NetworkInterfaces.Add(new VirtualMachineNetworkInterfaceReference { Id = nic.Id });

        var imageOs = await _context.ImageOperations.GetOs(location, image);
        if (!imageOs.IsOk) {
@ -285,7 +286,7 @@ public class VmOperations : IVmOperations {
                        DisablePasswordAuthentication = true,
                    };
                    vmParams.OSProfile.LinuxConfiguration.SshPublicKeys.Add(
-                        new SshPublicKeyInfo {
+                        new SshPublicKeyConfiguration {
                            Path = "/home/onefuzz/.ssh/authorized_keys",
                            KeyData = sshPublicKey
                        }
@ -332,7 +333,7 @@ public class VmOperations : IVmOperations {
        var imageRef = new ImageReference();

        if (image.StartsWith("/", StringComparison.Ordinal)) {
-            imageRef.Id = image;
+            imageRef.Id = new ResourceIdentifier(image);
        } else {
            var imageVal = image.Split(":", 4);
            imageRef.Publisher = imageVal[0];
--- a/src/ApiService/ApiService/onefuzzlib/VmssOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/VmssOperations.cs
@ -262,15 +262,15 @@ public class VmssOperations : IVmssOperations {
            Sku = new ComputeSku() { Name = vmSku, Capacity = vmCount },
            Overprovision = false,
            SinglePlacementGroup = false,
-            UpgradePolicy = new UpgradePolicy() { Mode = UpgradeMode.Manual },
+            UpgradePolicy = new VirtualMachineScaleSetUpgradePolicy() { Mode = VirtualMachineScaleSetUpgradeMode.Manual },
            Identity = new ManagedServiceIdentity(managedServiceIdentityType: ManagedServiceIdentityType.UserAssigned),
        };
        vmssData.Identity.UserAssignedIdentities.Add(_creds.GetScalesetIdentityResourcePath(), new UserAssignedIdentity());
-        vmssData.VirtualMachineProfile = new VirtualMachineScaleSetVmProfile() { Priority = VirtualMachinePriorityTypes.Regular };
+        vmssData.VirtualMachineProfile = new VirtualMachineScaleSetVmProfile() { Priority = VirtualMachinePriorityType.Regular };
        var imageRef = new ImageReference();

        if (image.StartsWith('/')) {
-            imageRef.Id = image;
+            imageRef.Id = new ResourceIdentifier(image);
        } else {
            var info = IImageOperations.GetImageInfo(image);
            imageRef.Publisher = info.Publisher;
@ -303,7 +303,7 @@ public class VmssOperations : IVmssOperations {
            case Os.Linux:
                vmssData.VirtualMachineProfile.OSProfile.LinuxConfiguration = new LinuxConfiguration();
                vmssData.VirtualMachineProfile.OSProfile.LinuxConfiguration.DisablePasswordAuthentication = true;
-                var i = new SshPublicKeyInfo() { KeyData = sshPublicKey, Path = "/home/onefuzz/.ssh/authorized_keys" };
+                var i = new SshPublicKeyConfiguration() { KeyData = sshPublicKey, Path = "/home/onefuzz/.ssh/authorized_keys" };
                vmssData.VirtualMachineProfile.OSProfile.LinuxConfiguration.SshPublicKeys.Add(i);
                break;
            default:
@ -311,10 +311,10 @@ public class VmssOperations : IVmssOperations {
        }

        if (ephemeralOsDisks) {
-            vmssData.VirtualMachineProfile.StorageProfile.OSDisk = new VirtualMachineScaleSetOSDisk(DiskCreateOptionTypes.FromImage);
+            vmssData.VirtualMachineProfile.StorageProfile.OSDisk = new VirtualMachineScaleSetOSDisk(DiskCreateOptionType.FromImage);
            vmssData.VirtualMachineProfile.StorageProfile.OSDisk.DiffDiskSettings = new DiffDiskSettings();
-            vmssData.VirtualMachineProfile.StorageProfile.OSDisk.DiffDiskSettings.Option = DiffDiskOptions.Local;
-            vmssData.VirtualMachineProfile.StorageProfile.OSDisk.Caching = CachingTypes.ReadOnly;
+            vmssData.VirtualMachineProfile.StorageProfile.OSDisk.DiffDiskSettings.Option = DiffDiskOption.Local;
+            vmssData.VirtualMachineProfile.StorageProfile.OSDisk.Caching = CachingType.ReadOnly;
        }

        if (spotInstance.HasValue && spotInstance.Value) {
@ -323,8 +323,8 @@ public class VmssOperations : IVmssOperations {
            //
            // https://docs.microsoft.com/en-us/azure/
            //   virtual-machine-scale-sets/use-spot#resource-manager-templates
-            vmssData.VirtualMachineProfile.EvictionPolicy = VirtualMachineEvictionPolicyTypes.Deallocate;
-            vmssData.VirtualMachineProfile.Priority = VirtualMachinePriorityTypes.Spot;
+            vmssData.VirtualMachineProfile.EvictionPolicy = VirtualMachineEvictionPolicyType.Deallocate;
+            vmssData.VirtualMachineProfile.Priority = VirtualMachinePriorityType.Spot;
            vmssData.VirtualMachineProfile.BillingMaxPrice = 1.0;
        }

@ -370,14 +370,14 @@ public class VmssOperations : IVmssOperations {
            entry.SetAbsoluteExpiration(TimeSpan.FromMinutes(10));

            var sub = _creds.GetSubscriptionResource();
-            var skus = sub.GetResourceSkusAsync(filter: TableClient.CreateQueryFilter($"location eq '{region}'"));
+            var skus = sub.GetComputeResourceSkusAsync(filter: TableClient.CreateQueryFilter($"location eq '{region}'"));

            var skuNames = new List<string>();
            await foreach (var sku in skus) {
                var available = true;
                if (sku.Restrictions is not null) {
                    foreach (var restriction in sku.Restrictions) {
-                        if (restriction.RestrictionsType == ResourceSkuRestrictionsType.Location &&
+                        if (restriction.RestrictionsType == ComputeResourceSkuRestrictionsType.Location &&
                            restriction.Values.Contains(region, StringComparer.OrdinalIgnoreCase)) {
                            available = false;
                            break;
--- a/src/ApiService/ApiService/packages.lock.json
+++ b/src/ApiService/ApiService/packages.lock.json
@ -55,9 +55,9 @@
      },
      "Azure.ResourceManager": {
        "type": "Direct",
-        "requested": "[1.2.1, )",
-        "resolved": "1.2.1",
-        "contentHash": "Ac7sSSLVbeJJGtw5JouMxZMHTKSokHu5NgCqlIpZM84SwpDpBK7j8sugUcDEryMPGO+BPeK42bTPJBEEs0DRQA==",
+        "requested": "[1.3.1, )",
+        "resolved": "1.3.1",
+        "contentHash": "oEeqW/oMie1ZOnkGdNJrxFbIpgobEKBLTVjE/Lu6EoyKqLSAgr07jdTL8eSK8Y+Ak1ecdN7cpRGPAJGWrGblZQ==",
        "dependencies": {
          "Azure.Core": "1.25.0",
          "System.Text.Json": "4.7.2"
@ -65,12 +65,12 @@
      },
      "Azure.ResourceManager.Compute": {
        "type": "Direct",
-        "requested": "[1.0.0-beta.8, )",
-        "resolved": "1.0.0-beta.8",
-        "contentHash": "rYYjjmEdmcOa8O4UgO/bdJ/qQclNZjuHdalxRJ0AhUHCORcM1f1BbIKR9CoN83IpfuEE+X+n5XY9QZcKvfrGVA==",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "dmDhokNFcyreIYZMkha8OsLmch0hW/sdOA2nxN4MPVd8KJgGWB8DxCZWwG7qhh59RInKtmWOP8BnBS5mN+W5wQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.2.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -98,12 +98,12 @@
      },
      "Azure.ResourceManager.Resources": {
        "type": "Direct",
-        "requested": "[1.0.0, )",
-        "resolved": "1.0.0",
-        "contentHash": "oNQRWfh05v9BiY8DMQjV+++kVafR+3ry2FGfMKObovKNfAb4i5J6DQpv0CUIx4jeIZe0fnhxyXRRCe293YtMqw==",
+        "requested": "[1.3.0, )",
+        "resolved": "1.3.0",
+        "contentHash": "a0MOZqfEsMjHTxYP0RmQSTvZooT67alArNmeUlc0DyeQLgJng/HTKGcdIfY4tS7Y1RO8sVf3bFp1gHTqpkZKwQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.3.0",
          "System.Text.Json": "4.7.2"
        }
      },
--- a/src/ApiService/FunctionalTests/packages.lock.json
+++ b/src/ApiService/FunctionalTests/packages.lock.json
@ -93,8 +93,8 @@
      },
      "Azure.ResourceManager": {
        "type": "Transitive",
-        "resolved": "1.2.1",
-        "contentHash": "Ac7sSSLVbeJJGtw5JouMxZMHTKSokHu5NgCqlIpZM84SwpDpBK7j8sugUcDEryMPGO+BPeK42bTPJBEEs0DRQA==",
+        "resolved": "1.3.1",
+        "contentHash": "oEeqW/oMie1ZOnkGdNJrxFbIpgobEKBLTVjE/Lu6EoyKqLSAgr07jdTL8eSK8Y+Ak1ecdN7cpRGPAJGWrGblZQ==",
        "dependencies": {
          "Azure.Core": "1.25.0",
          "System.Text.Json": "4.7.2"
@ -102,11 +102,11 @@
      },
      "Azure.ResourceManager.Compute": {
        "type": "Transitive",
-        "resolved": "1.0.0-beta.8",
-        "contentHash": "rYYjjmEdmcOa8O4UgO/bdJ/qQclNZjuHdalxRJ0AhUHCORcM1f1BbIKR9CoN83IpfuEE+X+n5XY9QZcKvfrGVA==",
+        "resolved": "1.0.0",
+        "contentHash": "dmDhokNFcyreIYZMkha8OsLmch0hW/sdOA2nxN4MPVd8KJgGWB8DxCZWwG7qhh59RInKtmWOP8BnBS5mN+W5wQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.2.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -132,11 +132,11 @@
      },
      "Azure.ResourceManager.Resources": {
        "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "oNQRWfh05v9BiY8DMQjV+++kVafR+3ry2FGfMKObovKNfAb4i5J6DQpv0CUIx4jeIZe0fnhxyXRRCe293YtMqw==",
+        "resolved": "1.3.0",
+        "contentHash": "a0MOZqfEsMjHTxYP0RmQSTvZooT67alArNmeUlc0DyeQLgJng/HTKGcdIfY4tS7Y1RO8sVf3bFp1gHTqpkZKwQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.3.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -239,8 +239,8 @@
      },
      "Microsoft.ApplicationInsights": {
        "type": "Transitive",
-        "resolved": "2.20.0",
-        "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==",
+        "resolved": "2.21.0",
+        "contentHash": "btZEDWAFNo9CoYliMCriSMTX3ruRGZTtYw4mo2XyyfLlowFicYVM2Xszi5evDG95QRYV7MbbH3D2RqVwfZlJHw==",
        "dependencies": {
          "System.Diagnostics.DiagnosticSource": "5.0.0"
        }
@ -619,10 +619,10 @@
      },
      "Microsoft.Extensions.Logging.ApplicationInsights": {
        "type": "Transitive",
-        "resolved": "2.20.0",
-        "contentHash": "phuNUDeTlffkJi6zAsMQNOpijNOQ4Olda1WL2L+F33u4fqXmY+EGQnPg81rHW6dOXIYCQvrQUr2gVN5NNMvwKA==",
+        "resolved": "2.21.0",
+        "contentHash": "tjzErt5oaLs1caaThu6AbtJuHH0oIGDG/rYCXDruHVGig3m8MyCDuwDsGQwzimY7g4aFyLOKfHc3unBN2G96gw==",
        "dependencies": {
-          "Microsoft.ApplicationInsights": "2.20.0",
+          "Microsoft.ApplicationInsights": "2.21.0",
          "Microsoft.Extensions.Logging": "2.1.1"
        }
      },
@ -2083,11 +2083,11 @@
          "Azure.Data.Tables": "[12.5.0, )",
          "Azure.Identity": "[1.6.0, )",
          "Azure.Messaging.EventGrid": "[4.10.0, )",
-          "Azure.ResourceManager": "[1.2.1, )",
-          "Azure.ResourceManager.Compute": "[1.0.0-beta.8, )",
+          "Azure.ResourceManager": "[1.3.1, )",
+          "Azure.ResourceManager.Compute": "[1.0.0, )",
          "Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )",
          "Azure.ResourceManager.Network": "[1.0.0, )",
-          "Azure.ResourceManager.Resources": "[1.0.0, )",
+          "Azure.ResourceManager.Resources": "[1.3.0, )",
          "Azure.ResourceManager.Storage": "[1.0.0-beta.11, )",
          "Azure.Security.KeyVault.Secrets": "[4.3.0, )",
          "Azure.Storage.Blobs": "[12.13.0, )",
@ -2102,7 +2102,7 @@
          "Microsoft.Azure.Functions.Worker.Sdk": "[1.3.0, )",
          "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
          "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
-          "Microsoft.Extensions.Logging.ApplicationInsights": "[2.20.0, )",
+          "Microsoft.Extensions.Logging.ApplicationInsights": "[2.21.0, )",
          "Microsoft.Graph": "[4.24.0, )",
          "Microsoft.Identity.Client": "[4.43.0, )",
          "Microsoft.Identity.Web.TokenCache": "[1.23.1, )",
--- a/src/ApiService/IntegrationTests/Fakes/TestCreds.cs
+++ b/src/ApiService/IntegrationTests/Fakes/TestCreds.cs
@ -67,6 +67,11 @@ class TestCreds : ICreds {
        throw new NotImplementedException();
    }

+    public GenericResource ParseResourceId(ResourceIdentifier resourceId) {
+        throw new NotImplementedException();
+    }
+
+
    public Task<GenericResource> GetData(GenericResource resource) {
        throw new NotImplementedException();
    }
--- a/src/ApiService/IntegrationTests/packages.lock.json
+++ b/src/ApiService/IntegrationTests/packages.lock.json
@ -94,8 +94,8 @@
      },
      "Azure.ResourceManager": {
        "type": "Transitive",
-        "resolved": "1.2.1",
-        "contentHash": "Ac7sSSLVbeJJGtw5JouMxZMHTKSokHu5NgCqlIpZM84SwpDpBK7j8sugUcDEryMPGO+BPeK42bTPJBEEs0DRQA==",
+        "resolved": "1.3.1",
+        "contentHash": "oEeqW/oMie1ZOnkGdNJrxFbIpgobEKBLTVjE/Lu6EoyKqLSAgr07jdTL8eSK8Y+Ak1ecdN7cpRGPAJGWrGblZQ==",
        "dependencies": {
          "Azure.Core": "1.25.0",
          "System.Text.Json": "4.7.2"
@ -103,11 +103,11 @@
      },
      "Azure.ResourceManager.Compute": {
        "type": "Transitive",
-        "resolved": "1.0.0-beta.8",
-        "contentHash": "rYYjjmEdmcOa8O4UgO/bdJ/qQclNZjuHdalxRJ0AhUHCORcM1f1BbIKR9CoN83IpfuEE+X+n5XY9QZcKvfrGVA==",
+        "resolved": "1.0.0",
+        "contentHash": "dmDhokNFcyreIYZMkha8OsLmch0hW/sdOA2nxN4MPVd8KJgGWB8DxCZWwG7qhh59RInKtmWOP8BnBS5mN+W5wQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.2.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -133,11 +133,11 @@
      },
      "Azure.ResourceManager.Resources": {
        "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "oNQRWfh05v9BiY8DMQjV+++kVafR+3ry2FGfMKObovKNfAb4i5J6DQpv0CUIx4jeIZe0fnhxyXRRCe293YtMqw==",
+        "resolved": "1.3.0",
+        "contentHash": "a0MOZqfEsMjHTxYP0RmQSTvZooT67alArNmeUlc0DyeQLgJng/HTKGcdIfY4tS7Y1RO8sVf3bFp1gHTqpkZKwQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.3.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -2143,38 +2143,38 @@
      "apiservice": {
        "type": "Project",
        "dependencies": {
-          "Azure.Core": "1.25.0",
-          "Azure.Data.Tables": "12.5.0",
-          "Azure.Identity": "1.6.0",
-          "Azure.Messaging.EventGrid": "4.10.0",
-          "Azure.ResourceManager": "1.2.1",
-          "Azure.ResourceManager.Compute": "1.0.0-beta.8",
-          "Azure.ResourceManager.Monitor": "1.0.0-beta.2",
-          "Azure.ResourceManager.Network": "1.0.0",
-          "Azure.ResourceManager.Resources": "1.0.0",
-          "Azure.ResourceManager.Storage": "1.0.0-beta.11",
-          "Azure.Security.KeyVault.Secrets": "4.3.0",
-          "Azure.Storage.Blobs": "12.13.0",
-          "Azure.Storage.Queues": "12.11.0",
-          "Faithlife.Utility": "0.12.2",
-          "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0",
-          "Microsoft.Azure.Functions.Worker": "1.6.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13",
-          "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0",
-          "Microsoft.Azure.Functions.Worker.Sdk": "1.3.0",
-          "Microsoft.Azure.Management.Monitor": "0.28.0-preview",
-          "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview",
-          "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0",
-          "Microsoft.Graph": "4.24.0",
-          "Microsoft.Identity.Client": "4.43.0",
-          "Microsoft.Identity.Web.TokenCache": "1.23.1",
-          "Semver": "2.1.0",
-          "System.IdentityModel.Tokens.Jwt": "6.17.0",
-          "System.Linq.Async": "6.0.1",
-          "TaskTupleAwaiter": "2.0.0"
+          "Azure.Core": "[1.25.0, )",
+          "Azure.Data.Tables": "[12.5.0, )",
+          "Azure.Identity": "[1.6.0, )",
+          "Azure.Messaging.EventGrid": "[4.10.0, )",
+          "Azure.ResourceManager": "[1.3.1, )",
+          "Azure.ResourceManager.Compute": "[1.0.0, )",
+          "Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )",
+          "Azure.ResourceManager.Network": "[1.0.0, )",
+          "Azure.ResourceManager.Resources": "[1.3.0, )",
+          "Azure.ResourceManager.Storage": "[1.0.0-beta.11, )",
+          "Azure.Security.KeyVault.Secrets": "[4.3.0, )",
+          "Azure.Storage.Blobs": "[12.13.0, )",
+          "Azure.Storage.Queues": "[12.11.0, )",
+          "Faithlife.Utility": "[0.12.2, )",
+          "Microsoft.ApplicationInsights.DependencyCollector": "[2.21.0, )",
+          "Microsoft.Azure.Functions.Worker": "[1.6.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "[2.1.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.Http": "[3.0.13, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "[1.7.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.Storage": "[5.0.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.1.0, )",
+          "Microsoft.Azure.Functions.Worker.Sdk": "[1.3.0, )",
+          "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
+          "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
+          "Microsoft.Extensions.Logging.ApplicationInsights": "[2.21.0, )",
+          "Microsoft.Graph": "[4.24.0, )",
+          "Microsoft.Identity.Client": "[4.43.0, )",
+          "Microsoft.Identity.Web.TokenCache": "[1.23.1, )",
+          "Semver": "[2.1.0, )",
+          "System.IdentityModel.Tokens.Jwt": "[6.17.0, )",
+          "System.Linq.Async": "[6.0.1, )",
+          "TaskTupleAwaiter": "[2.0.0, )"
        }
      }
    }
--- a/src/ApiService/Tests/packages.lock.json
+++ b/src/ApiService/Tests/packages.lock.json
@ -113,8 +113,8 @@
      },
      "Azure.ResourceManager": {
        "type": "Transitive",
-        "resolved": "1.2.1",
-        "contentHash": "Ac7sSSLVbeJJGtw5JouMxZMHTKSokHu5NgCqlIpZM84SwpDpBK7j8sugUcDEryMPGO+BPeK42bTPJBEEs0DRQA==",
+        "resolved": "1.3.1",
+        "contentHash": "oEeqW/oMie1ZOnkGdNJrxFbIpgobEKBLTVjE/Lu6EoyKqLSAgr07jdTL8eSK8Y+Ak1ecdN7cpRGPAJGWrGblZQ==",
        "dependencies": {
          "Azure.Core": "1.25.0",
          "System.Text.Json": "4.7.2"
@ -122,11 +122,11 @@
      },
      "Azure.ResourceManager.Compute": {
        "type": "Transitive",
-        "resolved": "1.0.0-beta.8",
-        "contentHash": "rYYjjmEdmcOa8O4UgO/bdJ/qQclNZjuHdalxRJ0AhUHCORcM1f1BbIKR9CoN83IpfuEE+X+n5XY9QZcKvfrGVA==",
+        "resolved": "1.0.0",
+        "contentHash": "dmDhokNFcyreIYZMkha8OsLmch0hW/sdOA2nxN4MPVd8KJgGWB8DxCZWwG7qhh59RInKtmWOP8BnBS5mN+W5wQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.2.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -152,11 +152,11 @@
      },
      "Azure.ResourceManager.Resources": {
        "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "oNQRWfh05v9BiY8DMQjV+++kVafR+3ry2FGfMKObovKNfAb4i5J6DQpv0CUIx4jeIZe0fnhxyXRRCe293YtMqw==",
+        "resolved": "1.3.0",
+        "contentHash": "a0MOZqfEsMjHTxYP0RmQSTvZooT67alArNmeUlc0DyeQLgJng/HTKGcdIfY4tS7Y1RO8sVf3bFp1gHTqpkZKwQ==",
        "dependencies": {
-          "Azure.Core": "1.24.0",
-          "Azure.ResourceManager": "1.0.0",
+          "Azure.Core": "1.25.0",
+          "Azure.ResourceManager": "1.3.0",
          "System.Text.Json": "4.7.2"
        }
      },
@ -2270,38 +2270,38 @@
      "apiservice": {
        "type": "Project",
        "dependencies": {
-          "Azure.Core": "1.25.0",
-          "Azure.Data.Tables": "12.5.0",
-          "Azure.Identity": "1.6.0",
-          "Azure.Messaging.EventGrid": "4.10.0",
-          "Azure.ResourceManager": "1.2.1",
-          "Azure.ResourceManager.Compute": "1.0.0-beta.8",
-          "Azure.ResourceManager.Monitor": "1.0.0-beta.2",
-          "Azure.ResourceManager.Network": "1.0.0",
-          "Azure.ResourceManager.Resources": "1.0.0",
-          "Azure.ResourceManager.Storage": "1.0.0-beta.11",
-          "Azure.Security.KeyVault.Secrets": "4.3.0",
-          "Azure.Storage.Blobs": "12.13.0",
-          "Azure.Storage.Queues": "12.11.0",
-          "Faithlife.Utility": "0.12.2",
-          "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0",
-          "Microsoft.Azure.Functions.Worker": "1.6.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13",
-          "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0",
-          "Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0",
-          "Microsoft.Azure.Functions.Worker.Sdk": "1.3.0",
-          "Microsoft.Azure.Management.Monitor": "0.28.0-preview",
-          "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview",
-          "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0",
-          "Microsoft.Graph": "4.24.0",
-          "Microsoft.Identity.Client": "4.43.0",
-          "Microsoft.Identity.Web.TokenCache": "1.23.1",
-          "Semver": "2.1.0",
-          "System.IdentityModel.Tokens.Jwt": "6.17.0",
-          "System.Linq.Async": "6.0.1",
-          "TaskTupleAwaiter": "2.0.0"
+          "Azure.Core": "[1.25.0, )",
+          "Azure.Data.Tables": "[12.5.0, )",
+          "Azure.Identity": "[1.6.0, )",
+          "Azure.Messaging.EventGrid": "[4.10.0, )",
+          "Azure.ResourceManager": "[1.3.1, )",
+          "Azure.ResourceManager.Compute": "[1.0.0, )",
+          "Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )",
+          "Azure.ResourceManager.Network": "[1.0.0, )",
+          "Azure.ResourceManager.Resources": "[1.3.0, )",
+          "Azure.ResourceManager.Storage": "[1.0.0-beta.11, )",
+          "Azure.Security.KeyVault.Secrets": "[4.3.0, )",
+          "Azure.Storage.Blobs": "[12.13.0, )",
+          "Azure.Storage.Queues": "[12.11.0, )",
+          "Faithlife.Utility": "[0.12.2, )",
+          "Microsoft.ApplicationInsights.DependencyCollector": "[2.21.0, )",
+          "Microsoft.Azure.Functions.Worker": "[1.6.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "[2.1.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.Http": "[3.0.13, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "[1.7.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.Storage": "[5.0.0, )",
+          "Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.1.0, )",
+          "Microsoft.Azure.Functions.Worker.Sdk": "[1.3.0, )",
+          "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
+          "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
+          "Microsoft.Extensions.Logging.ApplicationInsights": "[2.21.0, )",
+          "Microsoft.Graph": "[4.24.0, )",
+          "Microsoft.Identity.Client": "[4.43.0, )",
+          "Microsoft.Identity.Web.TokenCache": "[1.23.1, )",
+          "Semver": "[2.1.0, )",
+          "System.IdentityModel.Tokens.Jwt": "[6.17.0, )",
+          "System.Linq.Async": "[6.0.1, )",
+          "TaskTupleAwaiter": "[2.0.0, )"
        }
      }
    }