fix: avoid polluting default wait strategies in pulsar

testcontainers · Sep 11, 2023 · 1f64536 · 1f64536
1 parent c8a8a7b
commit 1f64536
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/modules/pulsar/pulsar.go b/modules/pulsar/pulsar.go
@@ -74,13 +74,13 @@ func WithFunctionsWorker() testcontainers.CustomizeRequestOption {
 	return func(req *testcontainers.GenericContainerRequest) {
 		req.Cmd = []string{"/bin/bash", "-c", defaultPulsarCmd}
 
-		// add the waiting strategy for the functions worker
-		defaultWaitStrategies.Strategies = append(
-			defaultWaitStrategies.Strategies,
+		ss := []wait.Strategy{
 			wait.ForLog("Function worker service started"),
-		)
+		}
 
-		req.WaitingFor = defaultWaitStrategies
+		ss = append(ss, defaultWaitStrategies.Strategies...)
+
+		req.WaitingFor = wait.ForAll(ss...)
 	}
 }
 
@@ -108,15 +108,16 @@ func WithTransactions() testcontainers.CustomizeRequestOption {
 	return func(req *testcontainers.GenericContainerRequest) {
 		WithPulsarEnv("transactionCoordinatorEnabled", "true")(req)
 
-		// add the waiting strategy for the transaction topic
-		defaultWaitStrategies.Strategies = append(
-			defaultWaitStrategies.Strategies,
+		// clone defaultWaitStrategies
+		ss := []wait.Strategy{
 			wait.ForHTTP(transactionTopicEndpoint).WithPort(defaultPulsarAdminPort).WithStatusCodeMatcher(func(statusCode int) bool {
 				return statusCode == 200
 			}),
-		)
+		}
+
+		ss = append(ss, defaultWaitStrategies.Strategies...)
 
-		req.WaitingFor = defaultWaitStrategies
+		req.WaitingFor = wait.ForAll(ss...)
 	}
 }