Skip to content

Commit a4ddcb5

Browse files
authored
Merge branch 'main' into feat/opensearch-connector
2 parents 628ba76 + 52d22fd commit a4ddcb5

File tree

92 files changed

+2685
-1201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2685
-1201
lines changed

.github/workflows/flow.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions:
1313
jobs:
1414
flow_test:
1515
strategy:
16+
fail-fast: false
1617
matrix:
1718
runner: [ubuntu-latest-16-cores]
1819
db-version: [{pg: 15, mysql: 'mysql-gtid', mongo: '6.0'}, {pg: 16, mysql: 'mysql-pos', mongo: '7.0'}, {pg: 17, mysql: 'maria', mongo: '8.0'}]
@@ -40,12 +41,12 @@ jobs:
4041
env:
4142
MYSQL_ROOT_PASSWORD: cipass
4243
redpanda:
43-
image: redpandadata/redpanda@sha256:95182a95a80f187a99cfe9fa03aaf18da0a3809a6741a229572f7ec33e795c13
44+
image: redpandadata/redpanda@sha256:b22ff89f4384e72f773aca495ade051c789f41976a78699644ba3039b9e43f84
4445
ports:
4546
- 9092:9092
4647
- 9644:9644
4748
elasticsearch:
48-
image: elasticsearch:9.0.2@sha256:bfa9d2126a5c3381ac272ee67264083ca04318def1d7b4ea9194ad0b0a8959bf
49+
image: elasticsearch:9.0.2@sha256:12829bb0fa8b3c6b65928868d2af0fbe67bf74aa6b92b14eca87957e9f554136
4950
ports:
5051
- 9200:9200
5152
env:
@@ -81,7 +82,7 @@ jobs:
8182
--health-timeout 10s
8283
--health-retries 20
8384
otelcol:
84-
image: otel/opentelemetry-collector-contrib:0.128.0@sha256:1ab0baba0ee3695d823c46653d8a6e8894896e668ce8bd7ebe002e948d827bc7
85+
image: otel/opentelemetry-collector-contrib:0.129.1@sha256:4798e3095561ac8ae13a81965088d68b943b1991bbeede91b1564e12c95372cc
8586
ports:
8687
- 4317:4317
8788

@@ -346,10 +347,18 @@ jobs:
346347
</keeper_server>
347348
</clickhouse>
348349
EOF
349-
mkdir ch1 ch2 chkeep
350+
mkdir chkeep ch1 ch2
351+
(cd chkeep && ../clickhouse keeper -C ../config-keeper.xml) &
352+
while true; do
353+
if echo "ruok" | nc -w 3 127.0.0.1 2181 2>/dev/null | grep -q "imok"; then
354+
break
355+
fi
356+
echo "Waiting for keeper..."
357+
sleep 1
358+
done
359+
sleep 5
350360
(cd ch1 && ../clickhouse server -C ../config1.xml) &
351361
(cd ch2 && ../clickhouse server -C ../config2.xml) &
352-
(cd chkeep && ../clickhouse keeper -C ../config-keeper.xml) &
353362
354363
- name: Install Temporal CLI
355364
uses: temporalio/setup-temporal@1059a504f87e7fa2f385e3fa40d1aa7e62f1c6ca # v0
@@ -414,8 +423,12 @@ jobs:
414423
OPENSEARCH_TEST_PASSWORD: S3curepa55!
415424
CI_PG_VERSION: ${{ matrix.db-version.pg }}
416425
CI_MYSQL_VERSION: ${{ matrix.db-version.mysql }}
417-
CI_MONGO_ADMIN_URI: mongodb://admin:admin@localhost:27017/?replicaSet=rs0&authSource=admin
418-
CI_MONGO_URI: mongodb://csuser:cspass@localhost:27017/?replicaSet=rs0&authSource=admin
426+
CI_MONGO_ADMIN_URI: mongodb://localhost:27017/?replicaSet=rs0&authSource=admin
427+
CI_MONGO_ADMIN_USERNAME: "admin"
428+
CI_MONGO_ADMIN_PASSWORD: "admin"
429+
CI_MONGO_URI: mongodb://localhost:27017/?replicaSet=rs0&authSource=admin
430+
CI_MONGO_USERNAME: "csuser"
431+
CI_MONGO_PASSWORD: "cspass"
419432
ENABLE_OTEL_METRICS: ${{ (matrix.db-version.pg == '16' || matrix.db-version.mysql == 'mysql-pos') && 'true' || 'false' }}
420433
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: http://localhost:4317
421434
OTEL_EXPORTER_OTLP_METRICS_PROTOCOL: grpc

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
pull-requests: write
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: release-drafter/release-drafter@v6
23+
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docker-compose-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
- TEMPORAL_ADDRESS=temporal:7233
111111
- TEMPORAL_CORS_ORIGINS=http://localhost:3000
112112
- TEMPORAL_CSRF_COOKIE_INSECURE=true
113-
image: temporalio/ui:v2.38.3@sha256:0e9c3bd6a79c4d8ffac9aed098f22862a1c0f4a73f7fc47e3a1031a413d7d967
113+
image: temporalio/ui:2.39.0@sha256:b768f87f18b59663a6749e98a2f7782c266e8e4e4749f92248e2ba41d6330d3f
114114
ports:
115115
- 8085:8080
116116

docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ services:
106106
- TEMPORAL_ADDRESS=temporal:7233
107107
- TEMPORAL_CORS_ORIGINS=http://localhost:3000
108108
- TEMPORAL_CSRF_COOKIE_INSECURE=true
109-
image: temporalio/ui:v2.38.3@sha256:0e9c3bd6a79c4d8ffac9aed098f22862a1c0f4a73f7fc47e3a1031a413d7d967
109+
image: temporalio/ui:2.39.0@sha256:b768f87f18b59663a6749e98a2f7782c266e8e4e4749f92248e2ba41d6330d3f
110110
ports:
111111
- 8085:8080
112112

113113
flow-api:
114114
container_name: flow_api
115-
image: ghcr.io/peerdb-io/flow-api:stable-v0.30.5
115+
image: ghcr.io/peerdb-io/flow-api:stable-v0.30.6
116116
restart: unless-stopped
117117
ports:
118118
- 8112:8112
@@ -128,7 +128,7 @@ services:
128128

129129
flow-snapshot-worker:
130130
container_name: flow-snapshot-worker
131-
image: ghcr.io/peerdb-io/flow-snapshot-worker:stable-v0.30.5
131+
image: ghcr.io/peerdb-io/flow-snapshot-worker:stable-v0.30.6
132132
restart: unless-stopped
133133
environment:
134134
<<: [*catalog-config, *flow-worker-env, *minio-config]
@@ -138,7 +138,7 @@ services:
138138

139139
flow-worker:
140140
container_name: flow-worker
141-
image: ghcr.io/peerdb-io/flow-worker:stable-v0.30.5
141+
image: ghcr.io/peerdb-io/flow-worker:stable-v0.30.6
142142
restart: unless-stopped
143143
environment:
144144
<<: [*catalog-config, *flow-worker-env, *minio-config]
@@ -151,7 +151,7 @@ services:
151151
peerdb:
152152
container_name: peerdb-server
153153
stop_signal: SIGINT
154-
image: ghcr.io/peerdb-io/peerdb-server:stable-v0.30.5
154+
image: ghcr.io/peerdb-io/peerdb-server:stable-v0.30.6
155155
restart: unless-stopped
156156
environment:
157157
<<: *catalog-config
@@ -167,7 +167,7 @@ services:
167167

168168
peerdb-ui:
169169
container_name: peerdb-ui
170-
image: ghcr.io/peerdb-io/peerdb-ui:stable-v0.30.5
170+
image: ghcr.io/peerdb-io/peerdb-ui:stable-v0.30.6
171171
restart: unless-stopped
172172
ports:
173173
- 3000:3000

e2e_cleanup/go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ go 1.24.0
55
require (
66
cloud.google.com/go/bigquery v1.69.0
77
cloud.google.com/go/pubsub v1.49.0
8-
github.com/snowflakedb/gosnowflake v1.14.1
8+
github.com/snowflakedb/gosnowflake v1.15.0
99
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
10-
google.golang.org/api v0.238.0
10+
google.golang.org/api v0.240.0
1111
)
1212

1313
require (
14-
cloud.google.com/go v0.121.2 // indirect
14+
cloud.google.com/go v0.121.3 // indirect
1515
cloud.google.com/go/auth v0.16.2 // indirect
1616
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
1717
cloud.google.com/go/compute/metadata v0.7.0 // indirect
@@ -22,7 +22,7 @@ require (
2222
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
2323
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1 // indirect
2424
github.com/BurntSushi/toml v1.5.0 // indirect
25-
github.com/andybalholm/brotli v1.1.1 // indirect
25+
github.com/andybalholm/brotli v1.2.0 // indirect
2626
github.com/apache/arrow-go/v18 v18.3.1 // indirect
2727
github.com/apache/arrow/go/v15 v15.0.2 // indirect
2828
github.com/apache/thrift v0.22.0 // indirect
@@ -31,7 +31,7 @@ require (
3131
github.com/aws/aws-sdk-go-v2/config v1.29.17 // indirect
3232
github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
3333
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
34-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.81 // indirect
34+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83 // indirect
3535
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
3636
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
3737
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
@@ -40,7 +40,7 @@ require (
4040
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
4141
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
4242
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/s3 v1.81.0 // indirect
43+
github.com/aws/aws-sdk-go-v2/service/s3 v1.83.0 // indirect
4444
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
4545
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
4646
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
@@ -64,7 +64,7 @@ require (
6464
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
6565
github.com/klauspost/asmfmt v1.3.2 // indirect
6666
github.com/klauspost/compress v1.18.0 // indirect
67-
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
67+
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
6868
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
6969
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
7070
github.com/mtibben/percent v0.2.1 // indirect
@@ -74,11 +74,11 @@ require (
7474
github.com/zeebo/xxh3 v1.0.2 // indirect
7575
go.opencensus.io v0.24.0 // indirect
7676
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
77-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
78-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
79-
go.opentelemetry.io/otel v1.36.0 // indirect
80-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
77+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
78+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
79+
go.opentelemetry.io/otel v1.37.0 // indirect
80+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
81+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
8282
golang.org/x/crypto v0.39.0 // indirect
8383
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
8484
golang.org/x/mod v0.25.0 // indirect

0 commit comments

Comments
 (0)