Skip to content

Commit 27d5114

Browse files
committed
chore(pulsar): simplify defaultWaitStrategies global variable
1 parent 1137ad1 commit 27d5114

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

modules/pulsar/pulsar.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ const (
2121
transactionTopicEndpoint = "/admin/v2/persistent/pulsar/system/transaction_coordinator_assign/partitions"
2222
)
2323

24-
var defaultWaitStrategies = wait.ForAll(
24+
var defaultWaitStrategies = []wait.Strategy {
2525
wait.ForHTTP("/admin/v2/clusters").WithPort(defaultPulsarAdminPort).WithResponseMatcher(func(r io.Reader) bool {
2626
respBytes, _ := io.ReadAll(r)
2727
resp := string(respBytes)
2828
return resp == `["standalone"]`
2929
}),
3030
wait.ForLog("Successfully updated the policies on namespace public/default"),
31-
)
31+
}
3232

3333
type Container struct {
3434
testcontainers.Container
@@ -80,7 +80,7 @@ func WithFunctionsWorker() testcontainers.CustomizeRequestOption {
8080
wait.ForLog("Function worker service started"),
8181
}
8282

83-
ss = append(ss, defaultWaitStrategies.Strategies...)
83+
ss = append(ss, defaultWaitStrategies...)
8484

8585
return testcontainers.WithWaitStrategy(ss...)(req)
8686
}
@@ -120,7 +120,7 @@ func WithTransactions() testcontainers.CustomizeRequestOption {
120120
}),
121121
}
122122

123-
ss = append(ss, defaultWaitStrategies.Strategies...)
123+
ss = append(ss, defaultWaitStrategies...)
124124

125125
return testcontainers.WithWaitStrategy(ss...)(req)
126126
}
@@ -144,7 +144,7 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize
144144
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
145145
moduleOpts := []testcontainers.ContainerCustomizer{
146146
testcontainers.WithExposedPorts(defaultPulsarPort, defaultPulsarAdminPort),
147-
testcontainers.WithWaitStrategy(defaultWaitStrategies),
147+
testcontainers.WithWaitStrategy(defaultWaitStrategies...),
148148
testcontainers.WithCmd("/bin/bash", "-c", strings.Join([]string{defaultPulsarCmd, defaultPulsarCmdWithoutFunctionsWorker}, " ")),
149149
}
150150

0 commit comments

Comments
 (0)