Try disable lint

streamnative · May 22, 2024 · e157e12 · e157e12
1 parent fb5a1b8
commit e157e12
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/pkg/test/bookkeeper/cluster.go b/pkg/test/bookkeeper/cluster.go
@@ -36,9 +36,10 @@ var (
 
 type ClusterDef struct {
 	test.Cluster
-	clusterSpec      *ClusterSpec
-	networkName      string
-	network          *testcontainers.DockerNetwork
+	clusterSpec *ClusterSpec
+	networkName string
+	//nolint:staticcheck
+	network          testcontainers.Network
 	zkContainer      *test.BaseContainer
 	bookieContainers map[string]*test.BaseContainer
 }

diff --git a/pkg/test/pulsar/cluster.go b/pkg/test/pulsar/cluster.go
@@ -40,9 +40,10 @@ var (
 )
 
 type ClusterDef struct {
-	clusterSpec      *ClusterSpec
-	networkName      string
-	network          *testcontainers.DockerNetwork
+	clusterSpec *ClusterSpec
+	networkName string
+	//nolint:staticcheck
+	network          testcontainers.Network
 	zkContainer      *test.BaseContainer
 	proxyContainer   *test.BaseContainer
 	bookieContainers map[string]*test.BaseContainer

diff --git a/pkg/test/utils.go b/pkg/test/utils.go
@@ -24,14 +24,23 @@ import (
 	"time"
 
 	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/network"
 )
 
 // NewNetwork creates a network.
-func NewNetwork(name string) (*testcontainers.DockerNetwork, error) {
+//
+//nolint:staticcheck
+func NewNetwork(name string) (testcontainers.Network, error) {
 	ctx := context.Background()
+	dp, err := testcontainers.NewDockerProvider()
+	if err != nil {
+		return nil, err
+	}
 
-	net, err := network.New(ctx, network.WithCheckDuplicate(), network.WithDriver(name))
+	//nolint:staticcheck
+	net, err := dp.CreateNetwork(ctx, testcontainers.NetworkRequest{
+		Name:           name,
+		CheckDuplicate: true,
+	})
 	return net, err
 }