Migrate marketplace to recordings (#1396)

* simplify the client creation a bit, remove unnecessary test parts, as the newing that is being exercised in the construction of the test isn't actually used for anything. the product commands ARE though

Author: scbedd

tools/Azure.Mcp.Tools.Marketplace/src/Services/MarketplaceService.cs

@@ -223,30 +223,23 @@ CancellationToken cancellationToken
     )
     {
         // Use Azure Core pipeline approach consistently
-        var clientOptions = AddDefaultPolicies(new MarketplaceClientOptions());
+        using var httpClient = TenantService.GetClient();
+        var clientOptions = ConfigureRetryPolicy(
+            AddDefaultPolicies(new MarketplaceClientOptions()),
+            retryPolicy);
+        clientOptions.Transport = new HttpClientTransport(httpClient);
 
-        // Configure retry policy if provided
-        if (retryPolicy != null)
-        {
-            clientOptions.Retry.MaxRetries = retryPolicy.MaxRetries;
-            clientOptions.Retry.Mode = retryPolicy.Mode;
-            clientOptions.Retry.Delay = TimeSpan.FromSeconds(retryPolicy.DelaySeconds);
-            clientOptions.Retry.MaxDelay = TimeSpan.FromSeconds(retryPolicy.MaxDelaySeconds);
-            clientOptions.Retry.NetworkTimeout = TimeSpan.FromSeconds(retryPolicy.NetworkTimeoutSeconds);
-        }
-
-        // Create pipeline
         var pipeline = HttpPipelineBuilder.Build(clientOptions);
 
         string accessToken = (await GetArmAccessTokenAsync(tenantId: tenant, cancellationToken)).Token;
         ValidateRequiredParameters((nameof(accessToken), accessToken));
 
-        var request = pipeline.CreateRequest();
+        using var request = pipeline.CreateRequest();
         request.Method = RequestMethod.Get;
         request.Uri.Reset(new Uri(url));
         request.Headers.Add("Authorization", $"Bearer {accessToken}");
 
-        var response = await pipeline.SendRequestAsync(request, cancellationToken);
+        using var response = await pipeline.SendRequestAsync(request, cancellationToken);
 
         if (!response.IsError)
         {

tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductGetCommandTests.cs

@@ -2,49 +2,19 @@
 // Licensed under the MIT License.
 
 using System.Text.Json;
-using Azure.Mcp.Core.Services.Azure.Authentication;
-using Azure.Mcp.Core.Services.Azure.Tenant;
-using Azure.Mcp.Core.Services.Caching;
 using Azure.Mcp.Tests;
 using Azure.Mcp.Tests.Client;
-using Azure.Mcp.Tests.Helpers;
-using Azure.Mcp.Tools.Marketplace.Services;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging.Abstractions;
+using Azure.Mcp.Tests.Client.Helpers;
 using Xunit;
 
 namespace Azure.Mcp.Tools.Marketplace.LiveTests;
 
-public class ProductGetCommandTests : CommandTestsBase
+public sealed class ProductGetCommandTests(ITestOutputHelper output, TestProxyFixture fixture) : RecordedCommandTestsBase(output, fixture)
 {
     private const string ProductKey = "product";
     private const string ProductId = "test_test_pmc2pc1.vmsr_uat_beta";
     private const string Language = "en";
     private const string Market = "US";
-    private readonly MarketplaceService _marketplaceService;
-    private readonly ServiceProvider _httpClientProvider;
-
-    public ProductGetCommandTests(ITestOutputHelper output) : base(output)
-    {
-        var memoryCache = new MemoryCache(Microsoft.Extensions.Options.Options.Create(new MemoryCacheOptions()));
-        var cacheService = new SingleUserCliCacheService(memoryCache);
-        var tokenProvider = new SingleIdentityTokenCredentialProvider(NullLoggerFactory.Instance);
-        _httpClientProvider = TestHttpClientFactoryProvider.Create();
-        var httpClientFactory = _httpClientProvider.GetRequiredService<IHttpClientFactory>();
-        var tenantService = new TenantService(tokenProvider, cacheService, httpClientFactory);
-        _marketplaceService = new MarketplaceService(tenantService);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            _httpClientProvider.Dispose();
-        }
-
-        base.Dispose(disposing);
-    }
 
     [Fact]
     public async Task Should_get_marketplace_product()

tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductListCommandTests.cs

@@ -2,47 +2,17 @@
 // Licensed under the MIT License.
 
 using System.Text.Json;
-using Azure.Mcp.Core.Services.Azure.Authentication;
-using Azure.Mcp.Core.Services.Azure.Tenant;
-using Azure.Mcp.Core.Services.Caching;
 using Azure.Mcp.Tests;
 using Azure.Mcp.Tests.Client;
-using Azure.Mcp.Tests.Helpers;
-using Azure.Mcp.Tools.Marketplace.Services;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging.Abstractions;
+using Azure.Mcp.Tests.Client.Helpers;
 using Xunit;
 
 namespace Azure.Mcp.Tools.Marketplace.LiveTests;
 
-public class ProductListCommandTests : CommandTestsBase
+public sealed class ProductListCommandTests(ITestOutputHelper output, TestProxyFixture fixture) : RecordedCommandTestsBase(output, fixture)
 {
     private const string ProductsKey = "products";
     private const string Language = "en";
-    private readonly MarketplaceService _marketplaceService;
-    private readonly ServiceProvider _httpClientProvider;
-
-    public ProductListCommandTests(ITestOutputHelper output) : base(output)
-    {
-        var memoryCache = new MemoryCache(Microsoft.Extensions.Options.Options.Create(new MemoryCacheOptions()));
-        var cacheService = new SingleUserCliCacheService(memoryCache);
-        var tokenProvider = new SingleIdentityTokenCredentialProvider(NullLoggerFactory.Instance);
-        _httpClientProvider = TestHttpClientFactoryProvider.Create();
-        var httpClientFactory = _httpClientProvider.GetRequiredService<IHttpClientFactory>();
-        var tenantService = new TenantService(tokenProvider, cacheService, httpClientFactory);
-        _marketplaceService = new MarketplaceService(tenantService);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            _httpClientProvider.Dispose();
-        }
-
-        base.Dispose(disposing);
-    }
 
     [Fact]
     public async Task Should_list_marketplace_products()

tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/assets.json

@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "",
+  "TagPrefix": "Azure.Mcp.Tools.Marketplace.LiveTests",
+  "Tag": "Azure.Mcp.Tools.Marketplace.LiveTests_0f59abc9d6"
+}