Refactor tests. Remove direct environment check for Idempotency Disabled.

Author: hjgraca

libraries/src/AWS.Lambda.Powertools.Idempotency/IdempotentAttribute.cs

@@ -83,8 +83,7 @@ protected internal sealed override T WrapSync<T>(Func<object[], T> target, objec
     protected internal sealed override async Task<T> WrapAsync<T>(
         Func<object[], Task<T>> target, object[] args, AspectEventArgs eventArgs)
     {
-        var idempotencyDisabledEnv = Environment.GetEnvironmentVariable(Constants.IdempotencyDisabledEnv);
-        if (idempotencyDisabledEnv is "true")
+        if (PowertoolsConfigurations.Instance.IdempotencyDisabled)
         {
             return await base.WrapAsync(target, args, eventArgs);
         }

libraries/src/AWS.Lambda.Powertools.Idempotency/Output/ConsoleLog.cs

@@ -65,9 +65,7 @@ internal DynamoDBPersistenceStore(string tableName,
         } 
         else
         {
-            var isIdempotencyDisabled = bool.TryParse(Environment.GetEnvironmentVariable(Constants.IdempotencyDisabledEnv), out var result) && result;
-            
-            if (isIdempotencyDisabled) 
+            if (PowertoolsConfigurations.Instance.IdempotencyDisabled) 
             {                
                 // we do not want to create a DynamoDbClient if idempotency is disabled
                 // null is ok as idempotency won't be called

libraries/src/AWS.Lambda.Powertools.Idempotency/Persistence/DynamoDBPersistenceStore.cs

@@ -6,33 +6,5 @@ namespace AWS.Lambda.Powertools.Idempotency.Tests.Internal;
 
 public class IdempotencyTests
 {
-    [Fact]
-    public void Idempotency_Set_Execution_Environment_Context()
-    {
-        // Arrange
-        var assemblyName = "AWS.Lambda.Powertools.Idempotency";
-        var assemblyVersion = "1.0.0";
-        
-        var env = new Mock<IPowertoolsEnvironment>();
-        env.Setup(x => x.GetAssemblyName(It.IsAny<Idempotency>())).Returns(assemblyName);
-        env.Setup(x => x.GetAssemblyVersion(It.IsAny<Idempotency>())).Returns(assemblyVersion);
-
-        var conf = new PowertoolsConfigurations(new SystemWrapper(env.Object));
-        
-        // Act
-        var xRayRecorder = new Idempotency(conf);
-
-        // Assert
-        env.Verify(v =>
-            v.SetEnvironmentVariable(
-                "AWS_EXECUTION_ENV", $"{Constants.FeatureContextIdentifier}/Idempotency/{assemblyVersion}"
-            ), Times.Once);
-            
-        env.Verify(v =>
-            v.GetEnvironmentVariable(
-                "AWS_EXECUTION_ENV"
-            ), Times.Once);
-        
-        Assert.NotNull(xRayRecorder);
-    }
+    
 }

libraries/tests/AWS.Lambda.Powertools.Idempotency.Tests/Internal/IdempotencyTests.cs

@@ -31,7 +31,7 @@
 namespace AWS.Lambda.Powertools.Idempotency.Tests.Internal;
 
 [Collection("Sequential")]
-public class IdempotentAspectTests
+public class IdempotentAspectTests : IDisposable
 {
     [Fact]
     public async Task Handle_WhenFirstCall_ShouldPutInStore()
@@ -157,33 +157,62 @@ public async Task Handle_WhenThrowException_ShouldDeleteRecord_AndThrowFunctionE
     [Fact]
     public async Task Handle_WhenIdempotencyDisabled_ShouldJustRunTheFunction()
     {
-        try
-        {
-            // Arrange
-            var store = new Mock<BasePersistenceStore>();
-            
-            Environment.SetEnvironmentVariable(Constants.IdempotencyDisabledEnv, "true");
-            
-            Idempotency.Configure(builder =>
-                builder
-                    .WithPersistenceStore(store.Object)
-                    .WithOptions(optionsBuilder => optionsBuilder.WithEventKeyJmesPath("Id"))
-                );
-            
-            var function = new IdempotencyEnabledFunction();
-            var product = new Product(42, "fake product", 12);
-            
-            // Act
-            var basket = await function.Handle(product, new TestLambdaContext());
+        
+        // Arrange
+        var store = new Mock<BasePersistenceStore>();
+        
+        Environment.SetEnvironmentVariable(Constants.IdempotencyDisabledEnv, "true");
+        
+        Idempotency.Configure(builder =>
+            builder
+                .WithPersistenceStore(store.Object)
+                .WithOptions(optionsBuilder => optionsBuilder.WithEventKeyJmesPath("Id"))
+            );
+        
+        var function = new IdempotencyEnabledFunction();
+        var product = new Product(42, "fake product", 12);
+        
+        // Act
+        var basket = await function.Handle(product, new TestLambdaContext());
+
+        // Assert
+        store.Invocations.Count.Should().Be(0);
+        basket.Products.Count.Should().Be(1);
+        function.HandlerExecuted.Should().BeTrue();
+    }
 
-            // Assert
-            store.Invocations.Count.Should().Be(0);
-            basket.Products.Count.Should().Be(1);
-            function.HandlerExecuted.Should().BeTrue();
-        }
-        finally
-        {
-            Environment.SetEnvironmentVariable(Constants.IdempotencyDisabledEnv, "false");
-        }
+    [Fact]
+    public void Idempotency_Set_Execution_Environment_Context()
+    {
+        // Arrange
+        var assemblyName = "AWS.Lambda.Powertools.Idempotency";
+        var assemblyVersion = "1.0.0";
+        
+        var env = new Mock<IPowertoolsEnvironment>();
+        env.Setup(x => x.GetAssemblyName(It.IsAny<Idempotency>())).Returns(assemblyName);
+        env.Setup(x => x.GetAssemblyVersion(It.IsAny<Idempotency>())).Returns(assemblyVersion);
+
+        var conf = new PowertoolsConfigurations(new SystemWrapper(env.Object));
+        
+        // Act
+        var xRayRecorder = new Idempotency(conf);
+
+        // Assert
+        env.Verify(v =>
+            v.SetEnvironmentVariable(
+                "AWS_EXECUTION_ENV", $"{Constants.FeatureContextIdentifier}/Idempotency/{assemblyVersion}"
+            ), Times.Once);
+            
+        env.Verify(v =>
+            v.GetEnvironmentVariable(
+                "AWS_EXECUTION_ENV"
+            ), Times.Once);
+        
+        Assert.NotNull(xRayRecorder);
+    }
+
+    public void Dispose()
+    {
+        Environment.SetEnvironmentVariable(Constants.IdempotencyDisabledEnv, "false");
     }
 }