Skip to content

Commit 1832f96

Browse files
hgiasachgiasac
authored
chore: upgrade go v1.25 and dependencies
2 parents e4a53e3 + dd2654c commit 1832f96

File tree

6 files changed

+160
-145
lines changed

6 files changed

+160
-145
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.9.9]
11+
12+
- Fix reported vulnerabilities.
13+
1014
## [1.9.8]
1115

1216
- Fix reported vulnerabilities.

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Build the Go binary
2-
FROM golang:1.24 AS builder
2+
FROM golang:1.25 AS builder
33

44
WORKDIR /app
55
COPY go.mod go.sum ./

‎docker-compose.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
version: '3.8'
21
services:
32
ndc-elasticsearch:
43
image: ghcr.io/hasura/ndc-elasticsearch:latest
4+
build:
5+
context: .
56
volumes:
67
- ./resources/configuration.json:/etc/connector/configuration.json
78
- certs:/usr/share/elasticsearch/config/certs
9+
user: "0"
810
ports:
911
- 8080:8080
1012
environment:
@@ -16,6 +18,7 @@ services:
1618
ELASTICSEARCH_USERNAME: elastic
1719
ELASTICSEARCH_PASSWORD: ${ELASTIC_PASSWORD:-default}
1820
ELASTICSEARCH_CA_CERT_PATH: /usr/share/elasticsearch/config/certs/es01/es01.crt
21+
HASURA_LOG_LEVEL: debug
1922
command: serve
2023
depends_on:
2124
jaeger:
@@ -58,22 +61,18 @@ services:
5861
chown -R root:root config/certs;
5962
find . -type d -exec chmod 750 \{\} \;;
6063
find . -type f -exec chmod 640 \{\} \;;
61-
echo "Waiting for Elasticsearch availability";
62-
until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
63-
echo "Setting kibana_system password";
64-
until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD:-default}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD:-default}\"}" | grep -q "^{}"; do sleep 10; done;
6564
echo "All done!";
6665
'
6766
healthcheck:
6867
test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"]
6968
interval: 1s
7069
timeout: 5s
7170
retries: 120
72-
71+
7372
es01:
7473
depends_on:
7574
setup:
76-
condition: service_healthy
75+
condition: service_completed_successfully
7776
image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-8.13.4}
7877
volumes:
7978
- certs:/usr/share/elasticsearch/config/certs

‎go.mod‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
11
module github.com/hasura/ndc-elasticsearch
22

3-
go 1.24.9
3+
go 1.25.6
44

55
require (
6-
github.com/elastic/go-elasticsearch/v8 v8.17.1
7-
github.com/hasura/ndc-sdk-go v1.9.1
8-
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/otel v1.35.0
10-
go.opentelemetry.io/otel/trace v1.35.0
6+
github.com/elastic/go-elasticsearch/v8 v8.19.1
7+
github.com/hasura/ndc-sdk-go v1.10.0
8+
github.com/stretchr/testify v1.11.1
9+
go.opentelemetry.io/otel v1.39.0
10+
go.opentelemetry.io/otel/trace v1.39.0
1111
)
1212

1313
require (
14-
github.com/alecthomas/kong v1.9.0 // indirect
14+
github.com/alecthomas/kong v1.13.0 // indirect
1515
github.com/beorn7/perks v1.0.1 // indirect
16-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
16+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
1717
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1818
github.com/davecgh/go-spew v1.1.1 // indirect
19-
github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect
20-
github.com/go-logr/logr v1.4.2 // indirect
19+
github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect
20+
github.com/go-logr/logr v1.4.3 // indirect
2121
github.com/go-logr/stdr v1.2.2 // indirect
22-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
22+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
2323
github.com/google/uuid v1.6.0 // indirect
24-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
25-
github.com/klauspost/compress v1.18.0 // indirect
24+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.5 // indirect
25+
github.com/klauspost/compress v1.18.3 // indirect
2626
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2727
github.com/pmezard/go-difflib v1.0.0 // indirect
28-
github.com/prometheus/client_golang v1.21.1 // indirect
29-
github.com/prometheus/client_model v0.6.1 // indirect
30-
github.com/prometheus/common v0.63.0 // indirect
31-
github.com/prometheus/procfs v0.16.0 // indirect
32-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
33-
go.opentelemetry.io/contrib/bridges/otelslog v0.10.0 // indirect
34-
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
35-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.11.0 // indirect
36-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.11.0 // indirect
37-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
38-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0 // indirect
39-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
40-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
41-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
42-
go.opentelemetry.io/otel/exporters/prometheus v0.57.0 // indirect
43-
go.opentelemetry.io/otel/log v0.11.0 // indirect
44-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
45-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
46-
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
47-
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
48-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
49-
golang.org/x/net v0.37.0 // indirect
50-
golang.org/x/sys v0.31.0 // indirect
51-
golang.org/x/text v0.23.0 // indirect
52-
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
53-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
54-
google.golang.org/grpc v1.71.0 // indirect
55-
google.golang.org/protobuf v1.36.5 // indirect
28+
github.com/prometheus/client_golang v1.23.2 // indirect
29+
github.com/prometheus/client_model v0.6.2 // indirect
30+
github.com/prometheus/common v0.67.5 // indirect
31+
github.com/prometheus/otlptranslator v1.0.0 // indirect
32+
github.com/prometheus/procfs v0.19.2 // indirect
33+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
34+
go.opentelemetry.io/contrib/bridges/otelslog v0.14.0 // indirect
35+
go.opentelemetry.io/contrib/propagators/b3 v1.39.0 // indirect
36+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0 // indirect
37+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0 // indirect
38+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0 // indirect
39+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0 // indirect
40+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
41+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
42+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
43+
go.opentelemetry.io/otel/exporters/prometheus v0.61.0 // indirect
44+
go.opentelemetry.io/otel/log v0.15.0 // indirect
45+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
46+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
47+
go.opentelemetry.io/otel/sdk/log v0.15.0 // indirect
48+
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
49+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
50+
go.yaml.in/yaml/v2 v2.4.3 // indirect
51+
golang.org/x/net v0.49.0 // indirect
52+
golang.org/x/sys v0.40.0 // indirect
53+
golang.org/x/text v0.33.0 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20260122232226-8e98ce8d340d // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect
56+
google.golang.org/grpc v1.78.0 // indirect
57+
google.golang.org/protobuf v1.36.11 // indirect
5658
gopkg.in/yaml.v3 v3.0.1 // indirect
5759
)

0 commit comments

Comments
 (0)