Skip to content

Commit

Permalink
Revert "Try disable lint"
Browse files Browse the repository at this point in the history
This reverts commit e157e12.
  • Loading branch information
RobertIndie committed May 22, 2024
1 parent 5b1975a commit 194bc06
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
7 changes: 3 additions & 4 deletions pkg/test/bookkeeper/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
7 changes: 3 additions & 4 deletions pkg/test/pulsar/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 3 additions & 12 deletions pkg/test/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 194bc06

Please sign in to comment.