From 7b4de208b0fe3dfe383eff16a78886862cfc6555 Mon Sep 17 00:00:00 2001 From: Piotr Grabowski Date: Fri, 20 Dec 2024 13:24:10 +0100 Subject: [PATCH] A couple small fixes to ITs (#1133) - Bump go to 1.23.2 in `ci/it` to be in line with go version in other modules in the repo - Update `golang.org/x/net` to v0.33.0 to get rid of the "Security advisory" warning (https://github.com/QuesmaOrg/quesma/security/dependabot/6) - Turn on SQL tracing in ITs - Use `testing.T.Cleanup()` instead of `defer` - `testing.T.Cleanup()` will run even if a test panics/fails/timeouts --- ci/it/configs/quesma-ab.yml.template | 6 +++++- ci/it/configs/quesma-as-transparent-proxy.yml.template | 5 +++++ ci/it/configs/quesma-ingest.yml.template | 6 +++++- .../configs/quesma-now-reads-clickhouse-tables.yml.template | 6 +++++- ci/it/configs/quesma-wildcard-clickhouse.yml.template | 6 +++++- ci/it/configs/quesma-wildcard-disabled.yml.template | 6 +++++- .../quesma-with-dual-writes-and-common-table.yml.template | 6 +++++- ci/it/configs/quesma-with-two-pipelines.yml.template | 6 +++++- ci/it/go.mod | 4 ++-- ci/it/go.sum | 4 ++-- ci/it/integration_test.go | 4 +++- 11 files changed, 47 insertions(+), 12 deletions(-) diff --git a/ci/it/configs/quesma-ab.yml.template b/ci/it/configs/quesma-ab.yml.template index 7604d3681..aad4fac4c 100644 --- a/ci/it/configs/quesma-ab.yml.template +++ b/ci/it/configs/quesma-ab.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: QP type: quesma-v1-processor-query diff --git a/ci/it/configs/quesma-as-transparent-proxy.yml.template b/ci/it/configs/quesma-as-transparent-proxy.yml.template index affcf9a2a..4e1ceee98 100644 --- a/ci/it/configs/quesma-as-transparent-proxy.yml.template +++ b/ci/it/configs/quesma-as-transparent-proxy.yml.template @@ -14,6 +14,11 @@ backendConnectors: url: "http://{{ .elasticsearch_host }}:{{ .elasticsearch_port }}" user: elastic password: quesmaquesma +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: noop-query-processor type: quesma-v1-processor-noop diff --git a/ci/it/configs/quesma-ingest.yml.template b/ci/it/configs/quesma-ingest.yml.template index 4b7eb60c6..700897d6c 100644 --- a/ci/it/configs/quesma-ingest.yml.template +++ b/ci/it/configs/quesma-ingest.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: my-query-processor type: quesma-v1-processor-query diff --git a/ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template b/ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template index 2c15823e4..1e1e512b1 100644 --- a/ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template +++ b/ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: my-query-processor type: quesma-v1-processor-query diff --git a/ci/it/configs/quesma-wildcard-clickhouse.yml.template b/ci/it/configs/quesma-wildcard-clickhouse.yml.template index e650db443..2a9155a64 100644 --- a/ci/it/configs/quesma-wildcard-clickhouse.yml.template +++ b/ci/it/configs/quesma-wildcard-clickhouse.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: my-query-processor type: quesma-v1-processor-query diff --git a/ci/it/configs/quesma-wildcard-disabled.yml.template b/ci/it/configs/quesma-wildcard-disabled.yml.template index 7589396c4..bce5713c9 100644 --- a/ci/it/configs/quesma-wildcard-disabled.yml.template +++ b/ci/it/configs/quesma-wildcard-disabled.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: my-query-processor type: quesma-v1-processor-query diff --git a/ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template b/ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template index d880750a4..47820db38 100644 --- a/ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template +++ b/ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: QP type: quesma-v1-processor-query diff --git a/ci/it/configs/quesma-with-two-pipelines.yml.template b/ci/it/configs/quesma-with-two-pipelines.yml.template index b9fec1cee..a138f8a75 100644 --- a/ci/it/configs/quesma-with-two-pipelines.yml.template +++ b/ci/it/configs/quesma-with-two-pipelines.yml.template @@ -18,7 +18,11 @@ backendConnectors: type: clickhouse-os config: url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }} -ingestStatistics: true +logging: + path: "logs" + level: "info" + disableFileLogging: false + enableSQLTracing: true processors: - name: my-query-processor type: quesma-v1-processor-query diff --git a/ci/it/go.mod b/ci/it/go.mod index ebaf2fb42..296a82ed8 100644 --- a/ci/it/go.mod +++ b/ci/it/go.mod @@ -1,6 +1,6 @@ module quesma.com/its -go 1.21.6 +go 1.23.2 require ( github.com/ClickHouse/clickhouse-go/v2 v2.20.0 @@ -61,7 +61,7 @@ require ( go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect golang.org/x/crypto v0.31.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sys v0.28.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/ci/it/go.sum b/ci/it/go.sum index 937578f39..22b706b63 100644 --- a/ci/it/go.sum +++ b/ci/it/go.sum @@ -174,8 +174,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/ci/it/integration_test.go b/ci/it/integration_test.go index e3087bf56..2b9323c3b 100644 --- a/ci/it/integration_test.go +++ b/ci/it/integration_test.go @@ -11,7 +11,9 @@ import ( func runIntegrationTest(t *testing.T, testCase testcases.TestCase) { ctx := context.Background() - defer testCase.Cleanup(ctx, t) + t.Cleanup(func() { + testCase.Cleanup(ctx, t) + }) if err := testCase.SetupContainers(ctx); err != nil { t.Fatalf("Failed to setup containers: %s", err) }