diff --git a/pkg/test/bookkeeper/cluster.go b/pkg/test/bookkeeper/cluster.go index 9888d85a..48c576dd 100644 --- a/pkg/test/bookkeeper/cluster.go +++ b/pkg/test/bookkeeper/cluster.go @@ -36,10 +36,9 @@ var ( type ClusterDef struct { test.Cluster - clusterSpec *ClusterSpec - networkName string - //nolint:staticcheck - network testcontainers.Network + clusterSpec *ClusterSpec + networkName string + network *testcontainers.DockerNetwork zkContainer *test.BaseContainer bookieContainers map[string]*test.BaseContainer } diff --git a/pkg/test/pulsar/cluster.go b/pkg/test/pulsar/cluster.go index 66d77c97..a0a84a27 100644 --- a/pkg/test/pulsar/cluster.go +++ b/pkg/test/pulsar/cluster.go @@ -40,10 +40,9 @@ var ( ) type ClusterDef struct { - clusterSpec *ClusterSpec - networkName string - //nolint:staticcheck - network testcontainers.Network + clusterSpec *ClusterSpec + networkName string + network *testcontainers.DockerNetwork zkContainer *test.BaseContainer proxyContainer *test.BaseContainer bookieContainers map[string]*test.BaseContainer diff --git a/pkg/test/utils.go b/pkg/test/utils.go index 35fcfcea..1b1b2b60 100644 --- a/pkg/test/utils.go +++ b/pkg/test/utils.go @@ -24,23 +24,14 @@ import ( "time" "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/network" ) // NewNetwork creates a network. -// -//nolint:staticcheck -func NewNetwork(name string) (testcontainers.Network, error) { +func NewNetwork(name string) (*testcontainers.DockerNetwork, error) { ctx := context.Background() - dp, err := testcontainers.NewDockerProvider() - if err != nil { - return nil, err - } - //nolint:staticcheck - net, err := dp.CreateNetwork(ctx, testcontainers.NetworkRequest{ - Name: name, - CheckDuplicate: true, - }) + net, err := network.New(ctx, network.WithCheckDuplicate(), network.WithDriver(name)) return net, err }