Skip to content

Commit b7246c3

Browse files
authored
Merge pull request #304 from dbarbashov/master
Overhaul datastore with query fixes, logging, and tests
2 parents d9c50ef + 1f6884c commit b7246c3

File tree

5 files changed

+621
-220
lines changed

5 files changed

+621
-220
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
kubo/
2-
go-ds-s3-plugin/go-ds-s3-plugin
2+
go-ds-s3-plugin/go-ds-s3-plugin
3+
.idea
4+
.aider*
5+
.DS_Store

go.mod

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
module github.com/ipfs/go-ds-s3
22

3-
go 1.24
3+
go 1.25
44

55
require (
66
github.com/aws/aws-sdk-go v1.55.6
7-
github.com/ipfs/go-datastore v0.8.2
8-
github.com/ipfs/kubo v0.36.0
7+
github.com/ipfs/go-datastore v0.8.3
8+
github.com/ipfs/go-log/v2 v2.8.1
9+
github.com/ipfs/kubo v0.37.0
910
)
1011

1112
require (
@@ -16,7 +17,7 @@ require (
1617
github.com/benbjohnson/clock v1.3.5 // indirect
1718
github.com/beorn7/perks v1.0.1 // indirect
1819
github.com/blang/semver/v4 v4.0.0 // indirect
19-
github.com/caddyserver/certmagic v0.21.6 // indirect
20+
github.com/caddyserver/certmagic v0.23.0 // indirect
2021
github.com/caddyserver/zerossl v0.1.3 // indirect
2122
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2223
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -38,24 +39,22 @@ require (
3839
github.com/filecoin-project/go-clock v0.1.0 // indirect
3940
github.com/flynn/noise v1.1.0 // indirect
4041
github.com/francoispqt/gojay v1.2.13 // indirect
41-
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
42-
github.com/gammazero/chanqueue v1.1.0 // indirect
43-
github.com/gammazero/deque v1.0.0 // indirect
42+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
43+
github.com/gammazero/chanqueue v1.1.1 // indirect
44+
github.com/gammazero/deque v1.1.0 // indirect
4445
github.com/getsentry/sentry-go v0.27.0 // indirect
45-
github.com/go-logr/logr v1.4.2 // indirect
46+
github.com/go-logr/logr v1.4.3 // indirect
4647
github.com/go-logr/stdr v1.2.2 // indirect
47-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4848
github.com/gogo/protobuf v1.3.2 // indirect
4949
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
5050
github.com/google/gopacket v1.1.19 // indirect
51-
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
5251
github.com/google/uuid v1.6.0 // indirect
5352
github.com/gorilla/websocket v1.5.3 // indirect
5453
github.com/hashicorp/golang-lru v1.0.2 // indirect
5554
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
5655
github.com/huin/goupnp v1.3.0 // indirect
5756
github.com/ipfs/bbloom v0.0.4 // indirect
58-
github.com/ipfs/boxo v0.33.0 // indirect
57+
github.com/ipfs/boxo v0.34.0 // indirect
5958
github.com/ipfs/go-bitfield v1.1.0 // indirect
6059
github.com/ipfs/go-block-format v0.2.2 // indirect
6160
github.com/ipfs/go-cid v0.5.0 // indirect
@@ -67,36 +66,34 @@ require (
6766
github.com/ipfs/go-ipfs-ds-help v1.1.1 // indirect
6867
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
6968
github.com/ipfs/go-ipfs-redirects-file v0.1.2 // indirect
70-
github.com/ipfs/go-ipld-cbor v0.2.0 // indirect
69+
github.com/ipfs/go-ipld-cbor v0.2.1 // indirect
7170
github.com/ipfs/go-ipld-format v0.6.2 // indirect
7271
github.com/ipfs/go-ipld-legacy v0.2.2 // indirect
73-
github.com/ipfs/go-log/v2 v2.6.0 // indirect
7472
github.com/ipfs/go-metrics-interface v0.3.0 // indirect
7573
github.com/ipfs/go-peertaskqueue v0.8.2 // indirect
7674
github.com/ipfs/go-unixfsnode v1.10.1 // indirect
7775
github.com/ipld/go-car/v2 v2.14.3 // indirect
7876
github.com/ipld/go-codec-dagpb v1.7.0 // indirect
7977
github.com/ipld/go-ipld-prime v0.21.0 // indirect
80-
github.com/ipshipyard/p2p-forge v0.6.0 // indirect
78+
github.com/ipshipyard/p2p-forge v0.6.1 // indirect
8179
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
8280
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
83-
github.com/jbenet/goprocess v0.1.4 // indirect
8481
github.com/jmespath/go-jmespath v0.4.0 // indirect
8582
github.com/klauspost/compress v1.18.0 // indirect
86-
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
83+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
8784
github.com/koron/go-ssdp v0.0.6 // indirect
8885
github.com/kr/pretty v0.3.1 // indirect
8986
github.com/kr/text v0.2.0 // indirect
90-
github.com/libdns/libdns v0.2.2 // indirect
87+
github.com/libdns/libdns v1.0.0-beta.1 // indirect
9188
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
9289
github.com/libp2p/go-cidranger v1.1.0 // indirect
9390
github.com/libp2p/go-doh-resolver v0.5.0 // indirect
9491
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
95-
github.com/libp2p/go-libp2p v0.42.0 // indirect
92+
github.com/libp2p/go-libp2p v0.43.0 // indirect
9693
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
97-
github.com/libp2p/go-libp2p-kad-dht v0.33.1 // indirect
94+
github.com/libp2p/go-libp2p-kad-dht v0.34.0 // indirect
9895
github.com/libp2p/go-libp2p-kbucket v0.7.0 // indirect
99-
github.com/libp2p/go-libp2p-pubsub v0.13.1 // indirect
96+
github.com/libp2p/go-libp2p-pubsub v0.14.2 // indirect
10097
github.com/libp2p/go-libp2p-pubsub-router v0.6.0 // indirect
10198
github.com/libp2p/go-libp2p-record v0.3.1 // indirect
10299
github.com/libp2p/go-libp2p-routing-helpers v0.7.5 // indirect
@@ -108,15 +105,15 @@ require (
108105
github.com/libp2p/zeroconf/v2 v2.2.0 // indirect
109106
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
110107
github.com/mattn/go-isatty v0.0.20 // indirect
111-
github.com/mholt/acmez/v3 v3.0.0 // indirect
112-
github.com/miekg/dns v1.1.66 // indirect
108+
github.com/mholt/acmez/v3 v3.1.2 // indirect
109+
github.com/miekg/dns v1.1.68 // indirect
113110
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
114111
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
115112
github.com/minio/sha256-simd v1.0.1 // indirect
116113
github.com/mr-tron/base58 v1.2.0 // indirect
117114
github.com/multiformats/go-base32 v0.1.0 // indirect
118115
github.com/multiformats/go-base36 v0.2.0 // indirect
119-
github.com/multiformats/go-multiaddr v0.16.0 // indirect
116+
github.com/multiformats/go-multiaddr v0.16.1 // indirect
120117
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
121118
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
122119
github.com/multiformats/go-multibase v0.2.0 // indirect
@@ -125,7 +122,6 @@ require (
125122
github.com/multiformats/go-multistream v0.6.1 // indirect
126123
github.com/multiformats/go-varint v0.0.7 // indirect
127124
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
128-
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
129125
github.com/opentracing/opentracing-go v1.2.0 // indirect
130126
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
131127
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect
@@ -150,52 +146,50 @@ require (
150146
github.com/pion/webrtc/v4 v4.1.2 // indirect
151147
github.com/pkg/errors v0.9.1 // indirect
152148
github.com/polydawn/refmt v0.89.0 // indirect
153-
github.com/prometheus/client_golang v1.22.0 // indirect
149+
github.com/prometheus/client_golang v1.23.0 // indirect
154150
github.com/prometheus/client_model v0.6.2 // indirect
155-
github.com/prometheus/common v0.64.0 // indirect
156-
github.com/prometheus/procfs v0.16.1 // indirect
151+
github.com/prometheus/common v0.65.0 // indirect
152+
github.com/prometheus/procfs v0.17.0 // indirect
157153
github.com/quic-go/qpack v0.5.1 // indirect
158-
github.com/quic-go/quic-go v0.52.0 // indirect
159-
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
154+
github.com/quic-go/quic-go v0.54.0 // indirect
155+
github.com/quic-go/webtransport-go v0.9.0 // indirect
160156
github.com/rogpeppe/go-internal v1.13.1 // indirect
161-
github.com/samber/lo v1.47.0 // indirect
162157
github.com/spaolacci/murmur3 v1.1.0 // indirect
163158
github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb // indirect
164159
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc // indirect
165160
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 // indirect
166-
github.com/whyrusleeping/cbor-gen v0.1.2 // indirect
161+
github.com/whyrusleeping/cbor-gen v0.3.1 // indirect
167162
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
168163
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
169164
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
170165
github.com/wlynxg/anet v0.0.5 // indirect
171166
github.com/zeebo/blake3 v0.2.4 // indirect
172167
go.opencensus.io v0.24.0 // indirect
173168
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
174-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
175-
go.opentelemetry.io/otel v1.35.0 // indirect
176-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
177-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
178-
go.uber.org/automaxprocs v1.6.0 // indirect
169+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
170+
go.opentelemetry.io/otel v1.37.0 // indirect
171+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
172+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
179173
go.uber.org/dig v1.19.0 // indirect
180174
go.uber.org/fx v1.24.0 // indirect
181175
go.uber.org/mock v0.5.2 // indirect
182176
go.uber.org/multierr v1.11.0 // indirect
183177
go.uber.org/zap v1.27.0 // indirect
184178
go.uber.org/zap/exp v0.3.0 // indirect
185179
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
186-
golang.org/x/crypto v0.39.0 // indirect
187-
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
188-
golang.org/x/mod v0.25.0 // indirect
189-
golang.org/x/net v0.41.0 // indirect
190-
golang.org/x/sync v0.15.0 // indirect
191-
golang.org/x/sys v0.33.0 // indirect
192-
golang.org/x/text v0.26.0 // indirect
180+
golang.org/x/crypto v0.41.0 // indirect
181+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
182+
golang.org/x/mod v0.27.0 // indirect
183+
golang.org/x/net v0.43.0 // indirect
184+
golang.org/x/sync v0.16.0 // indirect
185+
golang.org/x/sys v0.35.0 // indirect
186+
golang.org/x/text v0.28.0 // indirect
193187
golang.org/x/time v0.12.0 // indirect
194-
golang.org/x/tools v0.34.0 // indirect
188+
golang.org/x/tools v0.36.0 // indirect
195189
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
196190
gonum.org/v1/gonum v0.16.0 // indirect
197-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
198-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
199-
google.golang.org/protobuf v1.36.6 // indirect
191+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
192+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
193+
google.golang.org/protobuf v1.36.7 // indirect
200194
lukechampine.com/blake3 v1.4.1 // indirect
201195
)

0 commit comments

Comments
 (0)