diff --git a/internal/cql/cql_test.go b/internal/cql/cql_test.go index 68f66b7..3ccab2c 100644 --- a/internal/cql/cql_test.go +++ b/internal/cql/cql_test.go @@ -11,6 +11,7 @@ import ( "github.com/freshworks/load-generator/internal/stats" "github.com/gocql/gocql" "github.com/ory/dockertest/v3" + dc "github.com/ory/dockertest/v3/docker" mysqlquery "github.com/percona/go-mysql/query" "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" @@ -123,9 +124,15 @@ func startCassandra() (*dockertest.Pool, *dockertest.Resource, error) { "--permissions-update-interval-in-ms", "100", "--permissions-validity-in-ms", "100", }, + ExposedPorts: []string{"9042/tcp"}, + PortBindings: map[dc.Port][]dc.PortBinding{ + "9042/tcp": {{HostIP: "", HostPort: ""}}, + }, } - resource, err := pool.RunWithOptions(o) + resource, err := pool.RunWithOptions(o, func(hc *dc.HostConfig) { + hc.PublishAllPorts = false + }) if err != nil { return nil, nil, err } diff --git a/internal/lua/lua_test.go b/internal/lua/lua_test.go index 078dd90..4ea06be 100644 --- a/internal/lua/lua_test.go +++ b/internal/lua/lua_test.go @@ -27,6 +27,7 @@ import ( "github.com/gocql/gocql" "github.com/google/uuid" "github.com/ory/dockertest/v3" + dc "github.com/ory/dockertest/v3/docker" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -1143,9 +1144,15 @@ func startCassandra() (*dockertest.Pool, *dockertest.Resource, error) { "--permissions-update-interval-in-ms", "100", "--permissions-validity-in-ms", "100", }, + ExposedPorts: []string{"9042/tcp"}, + PortBindings: map[dc.Port][]dc.PortBinding{ + "9042/tcp": {{HostIP: "", HostPort: ""}}, + }, } - resource, err := pool.RunWithOptions(o) + resource, err := pool.RunWithOptions(o, func(hc *dc.HostConfig) { + hc.PublishAllPorts = false + }) if err != nil { return nil, nil, err } diff --git a/internal/psql/utils.go b/internal/psql/utils.go index 1815dfd..02becf9 100644 --- a/internal/psql/utils.go +++ b/internal/psql/utils.go @@ -11,6 +11,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/stdlib" "github.com/ory/dockertest/v3" + dc "github.com/ory/dockertest/v3/docker" mysqlquery "github.com/percona/go-mysql/query" ) @@ -100,7 +101,9 @@ func runPostgresDB(version string, certData *Cert) (string /*DB Connection Strin // // fmt.Printf("\n\ncontainer logs: %v\n\n", string(bytes)) - pool.Purge(resource) + if resource != nil { + pool.Purge(resource) + } } // if function panics anywhere in further steps, // cleanup resources. @@ -155,14 +158,20 @@ func runDockerContainer(repo string, tag string, mountOptions []string, envOptio } o := &dockertest.RunOptions{ - Repository: repo, - Tag: tag, - Mounts: mountOptions, - Env: envOptions, - Cmd: cmdOptions, - Entrypoint: entrypointOverrides, - } - resource, err := pool.RunWithOptions(o) + Repository: repo, + Tag: tag, + Mounts: mountOptions, + Env: envOptions, + Cmd: cmdOptions, + Entrypoint: entrypointOverrides, + ExposedPorts: []string{postgresPort + "/tcp"}, + PortBindings: map[dc.Port][]dc.PortBinding{ + dc.Port(postgresPort + "/tcp"): {{HostIP: "", HostPort: ""}}, + }, + } + resource, err := pool.RunWithOptions(o, func(hc *dc.HostConfig) { + hc.PublishAllPorts = false + }) return resource, pool, err }