w

Azure · Jan 24, 2025 · af65f40 · af65f40
1 parent 8d3b174
commit af65f40
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/Bicep.Core.IntegrationTests/Extensibility/RadiusCompatibilityTests.cs b/src/Bicep.Core.IntegrationTests/Extensibility/RadiusCompatibilityTests.cs
@@ -7,7 +7,7 @@
 using Bicep.Core.UnitTests.Assertions;
 using Bicep.Core.UnitTests.Utils;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using static Bicep.Core.UnitTests.Utils.RegistryTestHelper;
+using static Bicep.Core.UnitTests.Utils.RegistryHelper;
 
 namespace Bicep.Core.IntegrationTests.Extensibility;
 
@@ -16,7 +16,7 @@ public class RadiusCompatibilityTests
 {
     private static ServiceBuilder GetServiceBuilder(IFileSystem fileSystem, string registryHost, string repositoryPath)
     {
-        var clientFactory = RegistryTestHelper.CreateMockRegistryClient(new RepoDescriptor(registryHost, repositoryPath, ["tag"]));
+        var clientFactory = RegistryHelper.CreateMockRegistryClient(new RepoDescriptor(registryHost, repositoryPath, ["tag"]));
 
         return new ServiceBuilder()
             .WithFeatureOverrides(new(ExtensibilityEnabled: true))
@@ -32,7 +32,7 @@ private static async Task<ServiceBuilder> GetServicesWithPrepublishedTypes()
         var services = GetServiceBuilder(new MockFileSystem(), registry, repository);
 
         var tgzData = ThirdPartyTypeHelper.GetMockRadiusTypesTgz();
-        await RegistryTestHelper.PublishExtensionToRegistryAsync(services.Build(), $"br:{registry}/{repository}:1.0.0", tgzData);
+        await RegistryHelper.PublishExtensionToRegistryAsync(services.Build(), $"br:{registry}/{repository}:1.0.0", tgzData);
 
         return services;
     }

diff --git a/src/Bicep.Core.IntegrationTests/ExtensionRegistryTests.cs b/src/Bicep.Core.IntegrationTests/ExtensionRegistryTests.cs
@@ -57,7 +57,7 @@ public async Task Extensions_published_to_a_registry_can_be_compiled()
 
         var services = ExtensionTestHelper.GetServiceBuilder(fileSystem, registry, repository, AllFeaturesEnabled);
 
-        await RegistryTestHelper.PublishExtensionToRegistryAsync(services.Build(), "/types/index.json", $"br:{registry}/{repository}:1.2.3");
+        await RegistryHelper.PublishExtensionToRegistryAsync(services.Build(), "/types/index.json", $"br:{registry}/{repository}:1.2.3");
 
         var result = await CompilationHelper.RestoreAndCompile(services, """
 extension 'br:example.azurecr.io/test/extension/http:1.2.3'
@@ -86,7 +86,7 @@ public async Task Extensions_published_to_filesystem_can_be_compiled()
         Directory.CreateDirectory(tempDirectory);
 
         var extensionPath = Path.Combine(tempDirectory, "extension.tgz");
-        await RegistryTestHelper.PublishExtensionToRegistryAsync(services.Build(), Path.Combine(tempDirectory, extensionPath), typesTgz);
+        await RegistryHelper.PublishExtensionToRegistryAsync(services.Build(), Path.Combine(tempDirectory, extensionPath), typesTgz);
 
         var bicepPath = Path.Combine(tempDirectory, "main.bicep");
         await File.WriteAllTextAsync(bicepPath, """
@@ -256,7 +256,7 @@ public async Task Third_party_namespace_errors_with_configuration()
 
         var services = ExtensionTestHelper.GetServiceBuilder(fileSystem, registry, repository, AllFeaturesEnabled);
 
-        await RegistryTestHelper.PublishExtensionToRegistryAsync(services.Build(), "/types/index.json", $"br:{registry}/{repository}:1.2.3");
+        await RegistryHelper.PublishExtensionToRegistryAsync(services.Build(), "/types/index.json", $"br:{registry}/{repository}:1.2.3");
 
         var result = await CompilationHelper.RestoreAndCompile(services, """
 extension 'br:example.azurecr.io/test/extension/http:1.2.3' with {}
@@ -337,7 +337,7 @@ public async Task Third_party_imports_are_enabled_when_feature_is_enabled()
 
         var services = ExtensionTestHelper.GetServiceBuilder(fileSystem, registry, repository, AllFeaturesEnabled);
 
-        await RegistryTestHelper.PublishExtensionToRegistryAsync(services.Build(), "/types/index.json", $"br:{registry}/{repository}:1.2.3");
+        await RegistryHelper.PublishExtensionToRegistryAsync(services.Build(), "/types/index.json", $"br:{registry}/{repository}:1.2.3");
 
         var result = await CompilationHelper.RestoreAndCompile(services, @$"
 extension 'br:example.azurecr.io/test/extension/http:1.2.3'

diff --git a/src/Bicep.Core.IntegrationTests/ProviderImportTests.cs b/src/Bicep.Core.IntegrationTests/ProviderImportTests.cs
@@ -39,11 +39,11 @@ private async Task<ServiceBuilder> GetServices()
 
             var services = new ServiceBuilder()
                 .WithFeatureOverrides(new(ExtensibilityEnabled: true))
-                .WithContainerRegistryClientFactory(RegistryTestHelper.CreateOciClientForAzExtension())
+                .WithContainerRegistryClientFactory(RegistryHelper.CreateOciClientForAzExtension())
                 .WithMockFileSystem(fileSystem)
                 .WithAzResourceTypeLoader(azTypeLoaderLazy.Value);
 
-            await RegistryTestHelper.PublishAzExtension(services.Build(), "/types/index.json");
+            await RegistryHelper.PublishAzExtension(services.Build(), "/types/index.json");
 
             return services;
         }

diff --git a/src/Bicep.Core.UnitTests/Registry/Indexing/PrivateAcrModuleMetadataProviderTests.cs b/src/Bicep.Core.UnitTests/Registry/Indexing/PrivateAcrModuleMetadataProviderTests.cs
@@ -230,7 +230,7 @@ public class PrivateAcrModuleMetadataProviderTests //asdfg2
         public async Task TryGetModulesAsync()
         {
             FakeContainerRegistryClient containerRegistryClient = new();
-            var clientFactory = await RegistryTestHelper.CreateMockRegistryClientWithPublishedModulesAsync(
+            var clientFactory = await RegistryHelper.CreateMockRegistryClientWithPublishedModulesAsync(
                 new MockFileSystem(),
                 containerRegistryClient,
                 [
@@ -252,7 +252,7 @@ public async Task TryGetModulesAsync()
         public async Task GetCachedModules()
         {
             var containerClient = new FakeContainerRegistryClient();
-            var clientFactory = await RegistryTestHelper.CreateMockRegistryClientWithPublishedModulesAsync(
+            var clientFactory = await RegistryHelper.CreateMockRegistryClientWithPublishedModulesAsync(
                 new MockFileSystem(),
                 containerClient,
                 [
@@ -279,7 +279,7 @@ public async Task GetCachedModules()
         public async Task TryGetModulesAsync_ShouldCacheResult()
         {
             var containerClient = new FakeContainerRegistryClient();
-            var clientFactory = await RegistryTestHelper.CreateMockRegistryClientWithPublishedModulesAsync(
+            var clientFactory = await RegistryHelper.CreateMockRegistryClientWithPublishedModulesAsync(
                 new MockFileSystem(),
                 containerClient,
                 [
@@ -305,7 +305,7 @@ public async Task TryGetModulesAsync_ShouldCacheResult()
         public async Task GetDetails()
         {
             var containerClient = new FakeContainerRegistryClient();
-            var clientFactory = await RegistryTestHelper.CreateMockRegistryClientWithPublishedModulesAsync(
+            var clientFactory = await RegistryHelper.CreateMockRegistryClientWithPublishedModulesAsync(
                 new MockFileSystem(),
                 containerClient,
                 [

diff --git a/src/Bicep.Core.UnitTests/Utils/ExtensionTestHelper.cs b/src/Bicep.Core.UnitTests/Utils/ExtensionTestHelper.cs
@@ -18,7 +18,7 @@ public static ServiceBuilder GetServiceBuilder(
         string repositoryPath,
         FeatureProviderOverrides featureOverrides)
     {
-        var clientFactory = RegistryTestHelper.CreateMockRegistryClient(new(registryHost, repositoryPath, ["tag"]));
+        var clientFactory = RegistryHelper.CreateMockRegistryClient(new(registryHost, repositoryPath, ["tag"]));
 
         return new ServiceBuilder()
             .WithFeatureOverrides(featureOverrides)
@@ -36,7 +36,7 @@ public static async Task<ServiceBuilder> GetServiceBuilderWithPublishedExtension
         fileSystem ??= new MockFileSystem();
         var services = GetServiceBuilder(fileSystem, reference.Registry, reference.Repository, features);
 
-        await RegistryTestHelper.PublishExtensionToRegistryAsync(services.Build(), reference.FullyQualifiedReference, tgzData);
+        await RegistryHelper.PublishExtensionToRegistryAsync(services.Build(), reference.FullyQualifiedReference, tgzData);
 
         return services;
     }

diff --git a/...ore.UnitTests/Utils/RegistryTestHelper.cs → ...ep.Core.UnitTests/Utils/RegistryHelper.cs b/...ore.UnitTests/Utils/RegistryTestHelper.cs → ...ep.Core.UnitTests/Utils/RegistryHelper.cs
@@ -26,7 +26,7 @@
 
 namespace Bicep.Core.UnitTests.Utils;
 
-public static class RegistryTestHelper //asdfg turn into an instance class?
+public static class RegistryHelper
 {
     public record class RepoDescriptor(
         string Registry, // e.g. "registry.contoso.io"