Skip to content

Commit

Permalink
clickhouse: use distributed_foreground_insert flag
Browse files Browse the repository at this point in the history
update deps
enable back bulker integration tests
  • Loading branch information
absorbb committed Aug 26, 2024
1 parent 8bb98ef commit 5c1bb4e
Show file tree
Hide file tree
Showing 20 changed files with 74 additions and 70 deletions.
3 changes: 1 addition & 2 deletions admin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/klauspost/compress v1.17.8 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0 // indirect
github.com/testcontainers/testcontainers-go/modules/compose v0.33.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
Expand All @@ -28,7 +28,6 @@ require (
google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
google.golang.org/grpc v1.64.1 // indirect
k8s.io/api v0.30.2 // indirect
k8s.io/apimachinery v0.30.2 // indirect
k8s.io/client-go v0.30.2 // indirect
Expand Down
6 changes: 3 additions & 3 deletions admin/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ github.com/docker/buildx v0.15.1 h1:1cO6JIc0rOoC8tlxfXoh1HH1uxaNvYH1q7J7kv5enhw=
github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ=
github.com/docker/compose/v2 v2.28.1 h1:ORPfiVHrpnRQBDoC3F8JJyWAY8N5gWuo3FgwyivxFdM=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE=
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
Expand Down Expand Up @@ -131,8 +131,8 @@ github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EE
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/testcontainers/testcontainers-go v0.32.0 h1:ug1aK08L3gCHdhknlTTwWjPHPS+/alvLJU/DRxTD/ME=
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0 h1:7Ei3qamJeXZc4jurAwzV2hGGihiabZ01MxIbll1Ee3U=
github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw=
github.com/testcontainers/testcontainers-go/modules/compose v0.33.0 h1:PyrUOF+zG+xrS3p+FesyVxMI+9U+7pwhZhyFozH3jKY=
github.com/theupdateframework/notary v0.7.0 h1:QyagRZ7wlSpjT5N2qQAh/pN+DVqgekv4DzbAiAiEL3c=
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 h1:QB54BJwA6x8QU9nHY3xJSZR2kX9bgpZekRKGkLTmEXA=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
Expand Down
6 changes: 2 additions & 4 deletions bulkerapp/app/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ func initApp(t *testing.T, envVars map[string]string) (app *appbase.App[Config],
}

// Test streams in autocommit and bath mode. Both with good batches and batches with primary key violation error
// TODO: enable back after fixing testcontainers
func _TestGoodAndBadStreams(t *testing.T) {
func TestGoodAndBadStreams(t *testing.T) {
app, kafkaContainer, postgresContainer := initApp(t, map[string]string{"BULKER_MESSAGES_RETRY_COUNT": "0",
"BULKER_TOPIC_MANAGER_REFRESH_PERIOD_SEC": "1",
"BULKER_BATCH_RUNNER_DEFAULT_PERIOD_SEC": "1"})
Expand Down Expand Up @@ -181,8 +180,7 @@ func _TestGoodAndBadStreams(t *testing.T) {
}

// Test that retry consumer works
// TODO: enable back after fixing testcontainers
func _TestEventsRetry(t *testing.T) {
func TestEventsRetry(t *testing.T) {
app, kafkaContainer, postgresContainer := initApp(t, map[string]string{"BULKER_MESSAGES_RETRY_COUNT": "20",
"BULKER_BATCH_RUNNER_DEFAULT_RETRY_PERIOD_SEC": "5",
"BULKER_BATCH_RUNNER_DEFAULT_RETRY_BATCH_FRACTION": "1",
Expand Down
6 changes: 3 additions & 3 deletions bulkerapp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/prometheus/client_golang v1.19.1
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0
github.com/testcontainers/testcontainers-go/modules/compose v0.33.0
gopkg.in/yaml.v3 v3.0.1
)

Expand Down Expand Up @@ -66,7 +66,7 @@ require (
github.com/docker/cli v27.0.3+incompatible // indirect
github.com/docker/compose/v2 v2.28.1 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v27.0.3+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.0 // indirect
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
github.com/docker/go-connections v0.5.0 // indirect
Expand Down Expand Up @@ -175,7 +175,7 @@ require (
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/testcontainers/testcontainers-go v0.32.0 // indirect
github.com/testcontainers/testcontainers-go v0.33.0 // indirect
github.com/theupdateframework/notary v0.7.0 // indirect
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
Expand Down
6 changes: 3 additions & 3 deletions bulkerapp/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ github.com/docker/compose/v2 v2.28.1 h1:ORPfiVHrpnRQBDoC3F8JJyWAY8N5gWuo3Fgwyivx
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE=
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
Expand Down Expand Up @@ -359,8 +359,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/testcontainers/testcontainers-go v0.32.0 h1:ug1aK08L3gCHdhknlTTwWjPHPS+/alvLJU/DRxTD/ME=
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0 h1:7Ei3qamJeXZc4jurAwzV2hGGihiabZ01MxIbll1Ee3U=
github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw=
github.com/testcontainers/testcontainers-go/modules/compose v0.33.0 h1:PyrUOF+zG+xrS3p+FesyVxMI+9U+7pwhZhyFozH3jKY=
github.com/theupdateframework/notary v0.7.0 h1:QyagRZ7wlSpjT5N2qQAh/pN+DVqgekv4DzbAiAiEL3c=
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 h1:QB54BJwA6x8QU9nHY3xJSZR2kX9bgpZekRKGkLTmEXA=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
Expand Down
6 changes: 3 additions & 3 deletions bulkerlib/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ require (
github.com/lib/pq v1.10.9
github.com/snowflakedb/gosnowflake v1.10.1
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.32.0
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0
github.com/testcontainers/testcontainers-go v0.33.0
github.com/testcontainers/testcontainers-go/modules/compose v0.33.0
go.uber.org/atomic v1.11.0
google.golang.org/api v0.188.0

Expand Down Expand Up @@ -92,7 +92,7 @@ require (
github.com/docker/cli v27.0.3+incompatible // indirect
github.com/docker/compose/v2 v2.28.1 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v27.0.3+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.0 // indirect
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
github.com/docker/go-metrics v0.0.1 // indirect
Expand Down
9 changes: 3 additions & 6 deletions bulkerlib/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ github.com/docker/compose/v2 v2.28.1/go.mod h1:wDtGQFHe99sPLCHXeVbCkc+Wsl4Y/2Zxi
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE=
github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
Expand Down Expand Up @@ -609,10 +608,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/testcontainers/testcontainers-go v0.32.0 h1:ug1aK08L3gCHdhknlTTwWjPHPS+/alvLJU/DRxTD/ME=
github.com/testcontainers/testcontainers-go v0.32.0/go.mod h1:CRHrzHLQhlXUsa5gXjTOfqIEJcrK5+xMDmBr/WMI88E=
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0 h1:7Ei3qamJeXZc4jurAwzV2hGGihiabZ01MxIbll1Ee3U=
github.com/testcontainers/testcontainers-go/modules/compose v0.32.0/go.mod h1:A/it0TCrstoVkp0qmU5/LHiF1ZQyO7yqi8KKBD3WchY=
github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw=
github.com/testcontainers/testcontainers-go/modules/compose v0.33.0 h1:PyrUOF+zG+xrS3p+FesyVxMI+9U+7pwhZhyFozH3jKY=
github.com/theupdateframework/notary v0.7.0 h1:QyagRZ7wlSpjT5N2qQAh/pN+DVqgekv4DzbAiAiEL3c=
github.com/theupdateframework/notary v0.7.0/go.mod h1:c9DRxcmhHmVLDay4/2fUYdISnHqbFDGRSlXPO0AhYWw=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/jitsucom/bulker/jitsubase/logging"
"github.com/jitsucom/bulker/jitsubase/utils"
"github.com/testcontainers/testcontainers-go"
tcWait "github.com/testcontainers/testcontainers-go/wait"
)
Expand All @@ -34,16 +35,15 @@ func NewMinioContainer(ctx context.Context, bucketName string) (*MinioContainer,
dbSettings["MINIO_ACCESS_KEY"] = minioAccessKey
dbSettings["MINIO_SECRET_KEY"] = minioSecretKey

//exposedPort := fmt.Sprintf("%d:%d", utils.GetPort(), 9000)
exposedPort := fmt.Sprintf("%d:%d", utils.GetPort(), 9000)

container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
ContainerRequest: testcontainers.ContainerRequest{
Image: "minio/minio:latest",
Cmd: []string{"server", "/data"},
// TODO: enable back after fixing testcontainers
//ExposedPorts: []string{exposedPort},
Env: dbSettings,
WaitingFor: tcWait.ForListeningPort("9000"),
Image: "minio/minio:latest",
Cmd: []string{"server", "/data"},
ExposedPorts: []string{exposedPort},
Env: dbSettings,
WaitingFor: tcWait.ForListeningPort("9000"),
},
Started: true,
})
Expand Down
1 change: 1 addition & 0 deletions bulkerlib/implementations/sql/clickhouse.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ func NewClickHouse(bulkerConfig bulkerlib.Config) (bulkerlib.Bulker, error) {
utils.MapPutIfAbsent(config.Parameters, "dial_timeout", "60s")
utils.MapPutIfAbsent(config.Parameters, "read_timeout", "60s")
utils.MapPutIfAbsent(config.Parameters, "date_time_input_format", "best_effort")
utils.MapPutIfAbsent(config.Parameters, "distributed_foreground_insert", "1")

dbConnectFunction := func(config *ClickHouseConfig) (*sql.DB, error) {
dsn := clickhouseDriverConnectionString(config)
Expand Down
4 changes: 1 addition & 3 deletions bulkerlib/implementations/sql/reconnect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import (
"time"
)

// TODO: enable back after fixing testcontainers
func _TestReconnect(t *testing.T) {
func TestReconnect(t *testing.T) {
tests := []bulkerTestConfig{
{
name: "reconnect_test",
Expand Down Expand Up @@ -132,7 +131,6 @@ func _TestReconnect(t *testing.T) {
"create_bulker": "connection refused",
"consume_object_0": "connection refused",
"consume_object_1": "connection refused",
"create_stream": "database connection is not initialized",
"init_database_clickhouse": "database connection is not initialized",
},
postStepFunctions: map[string]StepFunction{
Expand Down
10 changes: 5 additions & 5 deletions bulkerlib/implementations/sql/testcontainers/ch_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"github.com/jitsucom/bulker/jitsubase/logging"
"github.com/jitsucom/bulker/jitsubase/utils"
"github.com/testcontainers/testcontainers-go"
tcWait "github.com/testcontainers/testcontainers-go/wait"
"time"
Expand All @@ -28,14 +29,13 @@ type ClickHouseContainer struct {
func NewClickhouseContainer(ctx context.Context) (*ClickHouseContainer, error) {
image := "clickhouse/clickhouse-server:24.6-alpine"
//exposedPortHttp := fmt.Sprintf("%d:%d", utils.GetPort(), 8123)
//exposedPortNative := fmt.Sprintf("%d:%d", utils.GetPort(), 9000)
exposedPortNative := fmt.Sprintf("%d:%d", utils.GetPort(), 9000)

container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
ContainerRequest: testcontainers.ContainerRequest{
Image: image,
// TODO: enable back after fixing testcontainers
//ExposedPorts: []string{exposedPortNative},
WaitingFor: tcWait.ForListeningPort("9000/tcp").WithStartupTimeout(1 * time.Minute),
Image: image,
ExposedPorts: []string{exposedPortNative},
WaitingFor: tcWait.ForListeningPort("9000/tcp").WithStartupTimeout(1 * time.Minute),
},
Started: true,
})
Expand Down
12 changes: 6 additions & 6 deletions bulkerlib/implementations/sql/testcontainers/mysql_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"database/sql"
"fmt"
"github.com/jitsucom/bulker/jitsubase/logging"
"github.com/jitsucom/bulker/jitsubase/utils"
"github.com/testcontainers/testcontainers-go"
tcWait "github.com/testcontainers/testcontainers-go/wait"
"os"
Expand Down Expand Up @@ -67,15 +68,14 @@ func NewMySQLContainer(ctx context.Context) (*MySQLContainer, error) {
//dbSettings["MYSQL_PASSWORD"] = mySQLPassword
dbSettings["MYSQL_DATABASE"] = mySQLDatabase

//exposedPort := fmt.Sprintf("%d:%d", utils.GetPort(), 3306)
exposedPort := fmt.Sprintf("%d:%d", utils.GetPort(), 3306)

container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
ContainerRequest: testcontainers.ContainerRequest{
Image: "mysql/mysql-server:8.0",
// TODO: enable back after fixing testcontainers
//ExposedPorts: []string{exposedPort},
Env: dbSettings,
WaitingFor: tcWait.ForLog("port: 3306 MySQL Community Server - GPL").WithStartupTimeout(time.Second * 180),
Image: "mysql/mysql-server:8.0",
ExposedPorts: []string{exposedPort},
Env: dbSettings,
WaitingFor: tcWait.ForLog("port: 3306 MySQL Community Server - GPL").WithStartupTimeout(time.Second * 180),
},
Started: true,
})
Expand Down
12 changes: 6 additions & 6 deletions bulkerlib/implementations/sql/testcontainers/pg_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"github.com/docker/go-connections/nat"
"github.com/jitsucom/bulker/jitsubase/logging"
"github.com/jitsucom/bulker/jitsubase/utils"
"github.com/testcontainers/testcontainers-go"
tcWait "github.com/testcontainers/testcontainers-go/wait"
"os"
Expand Down Expand Up @@ -75,15 +76,14 @@ func NewPostgresContainer(ctx context.Context) (*PostgresContainer, error) {
return fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable", pgUser, pgPassword, host, port.Port(), pgDatabase)
}

//exposedPort := fmt.Sprintf("%d:%d", utils.GetPort(), 5432)
exposedPort := fmt.Sprintf("%d:%d", utils.GetPort(), 5432)

container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
ContainerRequest: testcontainers.ContainerRequest{
Image: "postgres:12-alpine",
// TODO: enable back after fixing testcontainers
//ExposedPorts: []string{exposedPort},
Env: dbSettings,
WaitingFor: tcWait.ForSQL("5432", "postgres", dbURL).WithStartupTimeout(time.Second * 60),
Image: "postgres:12-alpine",
ExposedPorts: []string{exposedPort},
Env: dbSettings,
WaitingFor: tcWait.ForSQL("5432", "postgres", dbURL).WithStartupTimeout(time.Second * 60),
},
Started: true,
})
Expand Down
8 changes: 3 additions & 5 deletions eventslog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,26 @@ require (
github.com/gomodule/redigo v1.8.9
github.com/prometheus/client_golang v1.19.1
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.32.0
github.com/testcontainers/testcontainers-go v0.33.0
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/ClickHouse/ch-go v0.61.5 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.11.5 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/containerd v1.7.18 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.0.3+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand Down Expand Up @@ -78,7 +77,6 @@ require (
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 5c1bb4e

Please sign in to comment.