- fix tests localstack

Author: NinjaRocks

tests/SourceFlow.Cloud.AWS.Tests/TestHelpers/AwsTestEnvironment.cs

@@ -20,21 +20,24 @@ public class AwsTestEnvironment : IAwsTestEnvironment
 {
     private readonly AwsTestConfiguration _configuration;
     private readonly ILocalStackManager? _localStackManager;
-    private readonly IAwsResourceManager _resourceManager;
+    private IAwsResourceManager? _resourceManager;
     private readonly ILogger<AwsTestEnvironment> _logger;
     private bool _disposed;
-    
+
     public AwsTestEnvironment(
         AwsTestConfiguration configuration,
         ILocalStackManager? localStackManager,
-        IAwsResourceManager resourceManager,
+        IAwsResourceManager? resourceManager,
         ILogger<AwsTestEnvironment> logger)
     {
         _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
         _localStackManager = localStackManager;
-        _resourceManager = resourceManager ?? throw new ArgumentNullException(nameof(resourceManager));
+        _resourceManager = resourceManager;
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
     }
+
+    internal void SetResourceManager(IAwsResourceManager resourceManager) =>
+        _resourceManager = resourceManager ?? throw new ArgumentNullException(nameof(resourceManager));
 
     /// <inheritdoc />
     public IAmazonSQS SqsClient { get; private set; } = null!;
@@ -117,7 +120,8 @@ public IServiceCollection CreateTestServices()
         services.AddSingleton(_configuration);
 
         // Add resource manager
-        services.AddSingleton(_resourceManager);
+        if (_resourceManager != null)
+            services.AddSingleton(_resourceManager);
 
         return services;
     }

tests/SourceFlow.Cloud.AWS.Tests/TestHelpers/AwsTestEnvironmentFactory.cs

@@ -132,21 +132,20 @@ public static async Task<IAwsTestEnvironment> CreateEnvironmentAsync(AwsTestConf
             await localStackManager.StartAsync(configuration.LocalStack);
         }
 
-        // Add resource manager
-        services.AddTransient<IAwsResourceManager, AwsResourceManager>();
-        
-        // Build service provider
+        // Build service provider (for logging only - AwsResourceManager is created after AwsTestEnvironment
+        // to break the circular dependency: AwsTestEnvironment → AwsResourceManager → IAwsTestEnvironment)
         var finalServiceProvider = services.BuildServiceProvider();
-        
-        // Create resource manager
+
         var logger = finalServiceProvider.GetRequiredService<ILogger<AwsTestEnvironment>>();
-        var resourceManager = finalServiceProvider.GetRequiredService<IAwsResourceManager>();
-        
-        // Create test environment
-        var testEnvironment = new AwsTestEnvironment(configuration, localStackManager, resourceManager, logger);
-        
-        // Initialize the environment
+        var resourceManagerLogger = finalServiceProvider.GetRequiredService<ILogger<AwsResourceManager>>();
+
+        // Phase 1: create environment without resource manager, initialize AWS clients
+        var testEnvironment = new AwsTestEnvironment(configuration, localStackManager, null, logger);
         await testEnvironment.InitializeAsync();
+
+        // Phase 2: create resource manager (environment now has AWS clients), wire back
+        var resourceManager = new AwsResourceManager(testEnvironment, resourceManagerLogger);
+        testEnvironment.SetResourceManager(resourceManager);
 
         return testEnvironment;
     }