Skip to content

Commit 35f9562

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents a672735 + bedba63 commit 35f9562

6 files changed

Lines changed: 69 additions & 90 deletions

File tree

charts/batch-gateway/tests/observability_test.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,6 @@ tests:
3535
value: "30s"
3636
template: templates/apiserver-servicemonitor.yaml
3737

38-
- it: should include RHOAI monitoring label on ServiceMonitor by default
39-
set:
40-
apiserver.serviceMonitor.enabled: true
41-
asserts:
42-
- equal:
43-
path: metadata.labels["monitoring.opendatahub.io/scrape"]
44-
value: "true"
45-
template: templates/apiserver-servicemonitor.yaml
46-
4738
- it: should apply custom ServiceMonitor interval
4839
set:
4940
apiserver.serviceMonitor.enabled: true
@@ -87,15 +78,6 @@ tests:
8778
value: "30s"
8879
template: templates/processor-podmonitor.yaml
8980

90-
- it: should include RHOAI monitoring label on PodMonitor by default
91-
set:
92-
processor.podMonitor.enabled: true
93-
asserts:
94-
- equal:
95-
path: metadata.labels["monitoring.opendatahub.io/scrape"]
96-
value: "true"
97-
template: templates/processor-podmonitor.yaml
98-
9981
- it: should not render PodMonitor when processor is disabled
10082
set:
10183
processor.enabled: false

charts/batch-gateway/values.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ global:
2020
# Shared by all components; mounted read-only at /etc/.secrets/ in each container.
2121
# The secret must use these exact key names (hardcoded in the application):
2222
# redis-url — Redis/Valkey connection URL (e.g. redis://host:6379/0)
23-
# postgresql-url — PostgreSQL connection URL (e.g. postgresql://user:pass@host/db)
23+
# postgresql-url — PostgreSQL connection URL (e.g. postgresql://[user]:[pass]@[host]/[db])
2424
# inference-api-key — API key for the inference gateway (optional; omit if not required)
2525
# s3-secret-access-key — S3 secret access key (required when file_client.type is "s3")
2626
# Create with: kubectl create secret generic <name> --from-literal=redis-url=redis://...
@@ -221,9 +221,7 @@ apiserver:
221221
enabled: false
222222
interval: "30s"
223223
# Extra labels to match Prometheus Operator's serviceMonitorSelector.
224-
# The RHOAI monitoring label enables metrics scraping by the ODH observability stack.
225-
labels:
226-
monitoring.opendatahub.io/scrape: "true"
224+
labels: {}
227225

228226
# Logging configuration
229227
logging:
@@ -404,9 +402,7 @@ processor:
404402
enabled: false
405403
interval: "30s"
406404
# Extra labels to match Prometheus Operator's podMonitorSelector.
407-
# The RHOAI monitoring label enables metrics scraping by the ODH observability stack.
408-
labels:
409-
monitoring.opendatahub.io/scrape: "true"
405+
labels: {}
410406

411407
# Logging configuration
412408
logging:

go.mod

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ go 1.25.0
44

55
require (
66
github.com/alicebob/miniredis/v2 v2.38.0
7-
github.com/aws/aws-sdk-go-v2 v1.41.10
8-
github.com/aws/aws-sdk-go-v2/config v1.32.21
9-
github.com/aws/aws-sdk-go-v2/credentials v1.19.20
10-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.23
11-
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.0
7+
github.com/aws/aws-sdk-go-v2 v1.41.12
8+
github.com/aws/aws-sdk-go-v2/config v1.32.23
9+
github.com/aws/aws-sdk-go-v2/credentials v1.19.22
10+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.25
11+
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.2
1212
github.com/cenkalti/backoff/v5 v5.0.3
1313
github.com/exaring/otelpgx v0.11.1
1414
github.com/go-resty/resty/v2 v2.17.2
1515
github.com/google/uuid v1.6.0
16-
github.com/jackc/pgx/v5 v5.9.2
16+
github.com/jackc/pgx/v5 v5.10.0
1717
github.com/pashagolub/pgxmock/v4 v4.9.0
1818
github.com/prometheus/client_golang v1.23.2
1919
github.com/quasilyte/go-ruleguard/dsl v0.3.23
@@ -24,7 +24,7 @@ require (
2424
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0
2525
go.opentelemetry.io/otel/sdk v1.44.0
2626
go.opentelemetry.io/otel/trace v1.44.0
27-
golang.org/x/sync v0.20.0
27+
golang.org/x/sync v0.21.0
2828
gopkg.in/yaml.v3 v3.0.1
2929
k8s.io/klog/v2 v2.130.1
3030
)
@@ -48,20 +48,20 @@ require (
4848
)
4949

5050
require (
51-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 // indirect
52-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.26 // indirect
53-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.26 // indirect
54-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.26 // indirect
55-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.27 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.19 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.26 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.26 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/signin v1.1.2 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/sso v1.31.0 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.3 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/sts v1.43.0 // indirect
64-
github.com/aws/smithy-go v1.26.0 // indirect
51+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 // indirect
52+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.28 // indirect
53+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.28 // indirect
54+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.28 // indirect
55+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.29 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.21 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.28 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.28 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/signin v1.1.4 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/sso v1.31.2 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.5 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/sts v1.43.2 // indirect
64+
github.com/aws/smithy-go v1.27.1 // indirect
6565
github.com/beorn7/perks v1.0.1 // indirect
6666
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6767
github.com/go-logr/logr v1.4.3

go.sum

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
github.com/alicebob/miniredis/v2 v2.38.0 h1:nZAzCR+Lj+Vxk4ZXzm2NuKq2O33RXj1XxJ2e2uP9jiw=
22
github.com/alicebob/miniredis/v2 v2.38.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM=
3-
github.com/aws/aws-sdk-go-v2 v1.41.10 h1:i/Ezw+xWTo/EtO/lEq6xBYu9RXpRb3QPN5UlTsJg8Ck=
4-
github.com/aws/aws-sdk-go-v2 v1.41.10/go.mod h1:+HsoOEX80qAVUitj1A2DhCNTjmb3edVyuDypb6LNEeo=
5-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 h1:h5+3VT69KUBK24grGuuA5saDJTj2IIjLb9au668Fo5I=
6-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11/go.mod h1:dnakxebH6UwFvcvujL0LVggYQ8nEvBGjU4G/V79Nv94=
7-
github.com/aws/aws-sdk-go-v2/config v1.32.21 h1:1i1v5jWn6iNPl7zkH4VwIXQOb+OMqMRFNjdHQeZbFVo=
8-
github.com/aws/aws-sdk-go-v2/config v1.32.21/go.mod h1:7NXDJjk0e4QOMv3Y3ppwALx3ifdSQHzCACFtRX5J1hI=
9-
github.com/aws/aws-sdk-go-v2/credentials v1.19.20 h1:nIGz0+cQKwijxSsWNpggvPxjxFMtrAHNj16RYzGbu2Q=
10-
github.com/aws/aws-sdk-go-v2/credentials v1.19.20/go.mod h1:/UQHYia3DSeilGdchXJDEVzJws15XuZSdnTlwbTBg0Q=
11-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.26 h1:a1VPHz7eG7mVNHWHXUcCyC8rQDBEr4k+o4HJYbSoYZ0=
12-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.26/go.mod h1:9G8LPblMwaodeQdS+IfDBgPqABDctJLpyZ/M6jflE6s=
13-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.23 h1:2TyGN2gcptssyZ7eyWRIUJrPmE3qVJSnbpTYex18K8c=
14-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.23/go.mod h1:7wwWcRryS8VNdRp2E4D6jnzo3ehIVDsSZrn0m12cn9I=
15-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.26 h1:dx1qc6V0exl5SK5/kwSc2IdOKCxLHoNbl/zXuYRwopw=
16-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.26/go.mod h1:iDMGb+drKqPTqRjv1kWc5meMYzT6HsvPXxJV/Axq1t0=
17-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.26 h1:ZjsIjuahUd/OxnxgfeK6OZqrReRNru1BcPfFD95IoN0=
18-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.26/go.mod h1:57VbRA0K0Xxx5XUUTUrVxZ/gm4u8Bk3LBflfufwHtKQ=
19-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.27 h1:i49S7g2smFWmlconi97Nn8dxb7jSQ0TeOFD20NX3M+o=
20-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.27/go.mod h1:qiLes3uVQAK+cpb837HUEhypYKGBz2ZCDcDl5BYQtpM=
21-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 h1:d5/908OJ4bXg8lyjeMPvXetEKqoDoLi5Owy1zNue3yg=
22-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10/go.mod h1:a57l7Hwh+FWI+we50g5NPJHYUKeJKfXbc4w8SyXu8Ig=
23-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.19 h1:q/Kqqr7Jz4IKSHbFhsCwm5Q4WU7NUTY9tc4nHuBg7pg=
24-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.19/go.mod h1:kTMPExiQ8IW43fOffpm0npgLopHXzTxZ/1CnB2c8c0E=
25-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.26 h1:oIRaBVJ2CxT7T61l3JkBCW/rnyh2TFZIRL71MvJTKRI=
26-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.26/go.mod h1:1gCTZPMlqAUSFoFbkl35hKtTpE96WFl7ORvDXmSLpRc=
27-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.26 h1:eiwOPA7MW2LZzSfULHOFWdekrv59pEpDckN37IiK1EM=
28-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.26/go.mod h1:qM4B4ioTSHmkcKKhyoQMc3fcgl+d4mgqdJGzBJApYy0=
29-
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.0 h1:BmOawMUDBUiFAMgk8zTp3w5iei2Vh5j4mwIHTXOuGTc=
30-
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.0/go.mod h1:pivHPRqURZdlzSlGmULol6xBEoy7hHmWW/pIfAkc8Tw=
31-
github.com/aws/aws-sdk-go-v2/service/signin v1.1.2 h1:qwU4CNor4G2gRW3Na24FWOCZSEvr967IAV3D+MXxdE0=
32-
github.com/aws/aws-sdk-go-v2/service/signin v1.1.2/go.mod h1:vwIj2P3URYf7ZtOQkO2iVbAaR8qFhqMv05w3aPPA5XA=
33-
github.com/aws/aws-sdk-go-v2/service/sso v1.31.0 h1:cMDUWhi7vlmGFj6rldHofjnAQhLLBWwRvNRbtEoyZo4=
34-
github.com/aws/aws-sdk-go-v2/service/sso v1.31.0/go.mod h1:VfGCm6HLUGwcouY6zjQJd81PoFsb8sfSmKd5QCg9XXc=
35-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.3 h1:/pKy3mNES+ppFHf3g/XmI95+f3vdeXnkWYObByoYGAg=
36-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.3/go.mod h1:0z2rhlVAjsYeBzV8fdT4jR23Nq+fYhoJNSJN+4SBlqM=
37-
github.com/aws/aws-sdk-go-v2/service/sts v1.43.0 h1:HN43uYvF8D2NtaPTeE4L3HMvXgd+RtqEqrea4uUztkM=
38-
github.com/aws/aws-sdk-go-v2/service/sts v1.43.0/go.mod h1:qzhDlfw1BRYyoNofevemNzrlRpUXa0BJamWx7klrR8w=
39-
github.com/aws/smithy-go v1.26.0 h1:9ouqbi+NyKP7fV3Te7UElCwdAb6Y8uk7LGwPE5tVe/s=
40-
github.com/aws/smithy-go v1.26.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
3+
github.com/aws/aws-sdk-go-v2 v1.41.12 h1:DIKX2c31ekm9RA2D9FBj1EWXx++9AdAqRw+e78Tq2Ck=
4+
github.com/aws/aws-sdk-go-v2 v1.41.12/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg=
5+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 h1:p1BBrg/Hhp6uK7zpejeI8QFXHJeC/mynzi04Sl03k9g=
6+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13/go.mod h1:8cIfkE9MDhkRZGpQ22aV6/lkYeYSozpz16Smrs5x4Ls=
7+
github.com/aws/aws-sdk-go-v2/config v1.32.23 h1:PYDobtcsJXK6bQe9I8RQk6s19Bz3xa3xRU08Hy1Em3Y=
8+
github.com/aws/aws-sdk-go-v2/config v1.32.23/go.mod h1:QID4dqUQVgEOYPKsPWd1sNWCCR2c5g7o3jeEtIXPOZU=
9+
github.com/aws/aws-sdk-go-v2/credentials v1.19.22 h1:SHfH6wyPsEgG7fVsi5rQxWEt7tuIcN2PGhb1mTFv6tE=
10+
github.com/aws/aws-sdk-go-v2/credentials v1.19.22/go.mod h1:54nO8lKD4aQPOntM/VTWjnR+DYzTwx0YkSMZMhAgewQ=
11+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.28 h1:b+kcDejJrXc30zU/w8Tc9klISwaO5wh+6T0sMBdDoHM=
12+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.28/go.mod h1:LnI62O9GnSv6GcuLXxOYqlq0C8EmxMcgnF6m7LdYuOY=
13+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.25 h1:xJ3WVH3J0xESIqkavgbNfvQdMzB98bSkGwFXCyM2Tdw=
14+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.25/go.mod h1:0EOIx2v10rBBcaoTpOsRRNKDxhtRecRbN42YMrJaKZE=
15+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.28 h1:Xf2j7NdVcUKomlZ4iihOP4AZ3Fzlr8h4yKpXeP+OFPg=
16+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.28/go.mod h1:O8cDo1dW63jU7ki//kRe1z+tLGcpnD1jrouitsQddDw=
17+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.28 h1:KqIfN9kpkKkcBqBbNpNGTIrXO6ExTUvFKvXkC+YAzVo=
18+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.28/go.mod h1:uxtQiKvLtNS4iXVsH2McVD/ls8FKN/uUhe1hGxPjrw0=
19+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.29 h1:VkE9FuzTQVjBBrnj4+oCdxCLFIz7aqLYKUCjtvxVcOs=
20+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.29/go.mod h1:H32Z2Qth9b+9LqjyBsCnozMQ8H2N7YBUDVXwbs0iggg=
21+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 h1:ZD2+BSw9vFsNlKYIasSNt3uDbjqqXIBcM13UJv/Lx2k=
22+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12/go.mod h1:Ms4zlcVBbXbiP7EVLhl+lgjvA/a7YphqQ3Ih3174EmI=
23+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.21 h1:FsZxbPiVgEHYofziwfylouMki8b1Z7mI4CMU/7bhwBA=
24+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.21/go.mod h1:Mmm30OV+JLXYQUcbSd84THnv3P5JtjhVDujLwMqRG0U=
25+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.28 h1:axj4mEDletwKmTm/9jR+DkIMmCfcn5vE4jBMAAN+3Vg=
26+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.28/go.mod h1:3Aaz69M0jqfSHLKqxgolgUBFT4hpwSNc7DzC95orEi8=
27+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.28 h1:li8rTZAAb22g4UsxbjwMdaNVWbgVcDzPqI7nDTI+mF4=
28+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.28/go.mod h1:/brXioSGIMEdcBFoubpSdmighSVp6poP+mma/wB7iHA=
29+
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.2 h1:b4ikkRk22T4xYkEgaWc3Voe+3xbt5YbbFhNehOWyUiY=
30+
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.2/go.mod h1:Gp7eHZ0NZ8ZK5RXpoIUp/C8OeAmJqpCgdwEK1D/QOek=
31+
github.com/aws/aws-sdk-go-v2/service/signin v1.1.4 h1:YcpVyIPLCbiypN6KSphijN5fC7DDjX114SqA7prnnxg=
32+
github.com/aws/aws-sdk-go-v2/service/signin v1.1.4/go.mod h1:5ZICS++oFTRPfa1GsBqFDWX/8WamZ/QQOcCzIuU/zLw=
33+
github.com/aws/aws-sdk-go-v2/service/sso v1.31.2 h1:ySNWu7TPmj5fKFIa1GYvX+Ddxd5ccruqC20aMNuyWDM=
34+
github.com/aws/aws-sdk-go-v2/service/sso v1.31.2/go.mod h1:A+U9luAOwFeB1kseyWCITVg7/NntoPebCFR9pQ4ch9A=
35+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.5 h1:KSzGGqfk39O+WU3OEyYbx6F7sLDQCqxlOJ+2IksfK6U=
36+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.5/go.mod h1:ATs88lXDeQB6CZOgQ5BIl9JbYS+EsCWUSDyff6L/oVo=
37+
github.com/aws/aws-sdk-go-v2/service/sts v1.43.2 h1:RTO7mmGyedgnNmcPh3yQizNfc6GKoV5iqfdJavuf9vw=
38+
github.com/aws/aws-sdk-go-v2/service/sts v1.43.2/go.mod h1:fBhUZXDin9YYqhcpOMjIcpdik25rVwWyxLdPH1RZd9s=
39+
github.com/aws/smithy-go v1.27.1 h1:4T340VFndXtADGF52gYa1POyL7s9E4Z1OeZ1hCscIw8=
40+
github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
4141
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
4242
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
4343
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
@@ -74,8 +74,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
7474
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
7575
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
7676
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
77-
github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
78-
github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
77+
github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0=
78+
github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
7979
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
8080
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
8181
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -149,8 +149,8 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
149149
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
150150
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
151151
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
152-
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
153-
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
152+
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
153+
golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
154154
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
155155
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
156156
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=

internal/database/postgresql/db_postgresql.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type pgxPool interface {
4040

4141
// PostgreSQLConfig holds the configuration for a PostgreSQL connection.
4242
type PostgreSQLConfig struct {
43-
// Url is a PostgreSQL connection string (e.g., "postgres://user:pass@host:5432/dbname?sslmode=disable").
43+
// Url is a PostgreSQL connection string (e.g., "postgres://[user]:[pass]@[host]:5432/[dbname]?sslmode=disable").
4444
Url string `yaml:"-"`
4545
// EnableTracing enables OpenTelemetry tracing for all PostgreSQL operations.
4646
EnableTracing bool

scripts/dev-deploy.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ create_tls_secret() {
248248

249249
local tmp_dir
250250
tmp_dir="$(mktemp -d)"
251-
trap "rm -rf ${tmp_dir}" RETURN
251+
# shellcheck disable=SC2064 # Intentional: expand tmp_dir at definition time; it is local and out of scope when RETURN trap fires from caller
252+
trap "rm -rf '${tmp_dir}'" RETURN
252253

253254
openssl req -x509 -newkey rsa:2048 -nodes \
254255
-keyout "${tmp_dir}/tls.key" \

0 commit comments

Comments
 (0)