Refactor to simplify logic for 3rd party provider implementation (Azu…

…re#12754)

###### Microsoft Reviewers: [Open in
CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/Azure/bicep/pull/12754)

src/Bicep.Core.IntegrationTests/DynamicAzTypesTests.cs

@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.IO.Abstractions.TestingHelpers;
+using System.Threading.Tasks;
+using Azure.Bicep.Types.Az;
+using Bicep.Core.Diagnostics;
+using Bicep.Core.IntegrationTests.Extensibility;
+using Bicep.Core.Registry;
+using Bicep.Core.Samples;
+using Bicep.Core.Semantics.Namespaces;
+using Bicep.Core.TypeSystem.Providers;
+using Bicep.Core.TypeSystem.Providers.Az;
+using Bicep.Core.UnitTests;
+using Bicep.Core.UnitTests.Assertions;
+using Bicep.Core.UnitTests.FileSystem;
+using Bicep.Core.UnitTests.Utils;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json.Linq;
+
+namespace Bicep.Core.IntegrationTests
+{
+ [TestClass]
+ public class DynamicAzTypesTests : TestBase
+ {
+ private static readonly Lazy<IResourceTypeLoader> azTypeLoaderLazy = new(() => new AzResourceTypeLoader(new AzTypeLoader()));
+
+ private async Task<ServiceBuilder> GetServices()
+ {
+ var indexJson = FileHelper.SaveResultFile(TestContext, "types/index.json", """{"Resources": {}, "Functions": {}}""");
+ var clientFactory = await DataSetsExtensions.GetClientFactoryWithAzModulePublished(new System.IO.Abstractions.FileSystem(), indexJson);
+
+ var cacheRoot = FileHelper.GetUniqueTestOutputPath(TestContext);
+ Directory.CreateDirectory(cacheRoot);
+
+ return new ServiceBuilder()
+ .WithFeatureOverrides(new(ExtensibilityEnabled: true, DynamicTypeLoadingEnabled: true, CacheRootDirectory: cacheRoot))
+ .WithContainerRegistryClientFactory(clientFactory)
+ .WithAzResourceTypeLoader(azTypeLoaderLazy.Value);
+ }
+
+ [TestMethod]
+ public async Task Az_namespace_can_be_used_without_configuration()
+ {
+ var services = await GetServices();
+ var result = await CompilationHelper.RestoreAndCompile(services, ("main.bicep", @$"
+provider 'br/public:az@{BicepTestConstants.BuiltinAzProviderVersion}'
+"));
+
+ result.Should().GenerateATemplate();
+ result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
+ }
+
+ [TestMethod]
+ public async Task Az_namespace_errors_with_configuration()
+ {
+ var services = await GetServices();
+ var result = await CompilationHelper.RestoreAndCompile(services, @$"
+provider 'br/public:az@{BicepTestConstants.BuiltinAzProviderVersion}' with {{}}
+");
+
+ result.Should().NotGenerateATemplate();
+ result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[] {
+ ("BCP205", DiagnosticLevel.Error, "Provider namespace \"az\" does not support configuration."),
+ });
+ }
+ }
+}

src/Bicep.Core.IntegrationTests/Extensibility/TestExtensibilityNamespaceProvider.cs

@@ -20,31 +20,17 @@ public TestExtensibilityNamespaceProvider(IResourceTypeProviderFactory azResourc
  defaultNamespaceProvider = new DefaultNamespaceProvider(azResourceTypeProviderFactory);
  }
 
- public IEnumerable<string> AvailableNamespaces => defaultNamespaceProvider.AvailableNamespaces.Concat(new[] {
- FooNamespaceType.BuiltInName,
- BarNamespaceType.BuiltInName,
- });
-
  public NamespaceType? TryGetNamespace(
  ResourceTypesProviderDescriptor providerDescriptor,
  ResourceScope resourceScope,
  IFeatureProvider featureProvider,
  BicepSourceFileKind sourceFileKind)
  {
- var namespaceType = defaultNamespaceProvider.TryGetNamespace(
- providerDescriptor,
- resourceScope,
- featureProvider,
- sourceFileKind);
-
  return providerDescriptor.Name switch
  {
- FooNamespaceType.BuiltInName
- => FooNamespaceType.Create(providerDescriptor.Alias),
- BarNamespaceType.BuiltInName
- => BarNamespaceType.Create(providerDescriptor.Alias),
- _
- => namespaceType,
+ FooNamespaceType.BuiltInName => FooNamespaceType.Create(providerDescriptor.Alias),
+ BarNamespaceType.BuiltInName => BarNamespaceType.Create(providerDescriptor.Alias),
+ _ => defaultNamespaceProvider.TryGetNamespace(providerDescriptor, resourceScope, featureProvider, sourceFileKind),
  };
  }
 }

src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs

@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
+
 using Bicep.Core.Diagnostics;
 using Bicep.Core.IntegrationTests.Extensibility;
 using Bicep.Core.UnitTests;
 using Bicep.Core.UnitTests.Assertions;
-using Bicep.Core.UnitTests.FileSystem;
 using Bicep.Core.UnitTests.Utils;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -16,16 +13,11 @@
 namespace Bicep.Core.IntegrationTests
 {
  [TestClass]
- public class ExtensibilityTests
+ public class ExtensibilityTests : TestBase
  {
- [NotNull]
- public TestContext? TestContext { get; set; }
-
  private ServiceBuilder Services => new ServiceBuilder()
- //.WithAzResourceTypeLoader()
- .WithFeatureOverrides(new(ExtensibilityEnabled: true, DynamicTypeLoadingEnabled: true, CacheRootDirectory: InMemoryFileResolver.GetFileUri("/test/.bicep").LocalPath))
- .WithNamespaceProvider(new TestExtensibilityNamespaceProvider(BicepTestConstants.ResourceTypeProviderFactory)
- );
+ .WithFeatureOverrides(new(ExtensibilityEnabled: true, DynamicTypeLoadingEnabled: true))
+ .WithNamespaceProvider(new TestExtensibilityNamespaceProvider(BicepTestConstants.ResourceTypeProviderFactory));
 
  [TestMethod]
  public void Bar_import_bad_config_is_blocked()
@@ -624,29 +616,5 @@ public void Bar_import_end_to_end_test()
 }
 """));
  }
-
- [TestMethod]
- public void Az_namespace_can_be_used_without_configuration()
- {
- var result = CompilationHelper.Compile(Services, @$"
-provider 'br/public:az@{BicepTestConstants.BuiltinAzProviderVersion}'
-");
-
- result.Should().GenerateATemplate();
- result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
- }
-
- [TestMethod]
- public void Az_namespace_errors_with_configuration()
- {
- var result = CompilationHelper.Compile(Services, @$"
-provider 'br/public:az@{BicepTestConstants.BuiltinAzProviderVersion}' with {{}}
-");
-
- result.Should().NotGenerateATemplate();
- result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[] {
- ("BCP205", DiagnosticLevel.Error, "Provider namespace \"az\" does not support configuration."),
- });
- }
  }
 }