Add reuse hash label via CreateParameterModifier

testcontainers · Nov 24, 2023 · 7994956 · 7994956
1 parent 7c194b3
commit 7994956
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/src/Testcontainers/Builders/AbstractBuilder`4.cs b/src/Testcontainers/Builders/AbstractBuilder`4.cs
@@ -60,7 +60,15 @@ public TBuilderEntity WithCleanUp(bool cleanUp)
     /// <inheritdoc />
     public TBuilderEntity WithReuse(bool reuse)
     {
-      return Clone(new ResourceConfiguration<TCreateResourceEntity>(reuse: reuse, labels: new Dictionary<string, string> { { TestcontainersClient.TestcontainersReuseHashLabel, DockerResourceConfiguration.GetHash() } }));
+      return Clone(new ResourceConfiguration<TCreateResourceEntity>(reuse: reuse, parameterModifiers: new List<Action<TCreateResourceEntity>>()
+        {
+          parameter => {
+            var labelsProperty = parameter.GetType().GetProperty("Labels");
+            var labels = (IDictionary<string, string>)labelsProperty.GetValue(parameter);
+            labels[TestcontainersClient.TestcontainersReuseHashLabel] = DockerResourceConfiguration.GetHash();
+          }
+        })
+      );
     }
 
     /// <inheritdoc />
@@ -137,8 +145,6 @@ protected virtual void Validate()
         .ThrowIf(argument => argument.Value == null, argument => new ArgumentException(message, argument.Name));
 
       // TODO: Validate WithReuse(), WithAutoRemove() and WithCleanUp() combinations.
-      Guard.Argument(DockerResourceConfiguration.Reuse, nameof(IResourceConfiguration<TCreateResourceEntity>.Reuse))
-        .ThrowIf(argument => DockerResourceConfiguration.Labels.ContainsKey(TestcontainersClient.TestcontainersReuseHashLabel) && DockerResourceConfiguration.Labels[TestcontainersClient.TestcontainersReuseHashLabel] != DockerResourceConfiguration.GetHash(), argument => new ArgumentException("ResoureConfiguration hash mismatch, WithReuse(true) must be the last called builder method", argument.Name));
     }
 
     /// <summary>

diff --git a/tests/Testcontainers.Platform.Linux.Tests/WithReuseTest.cs b/tests/Testcontainers.Platform.Linux.Tests/WithReuseTest.cs