Skip to content

Commit 87499e0

Browse files
cisse21cisse21
authored
chore: bump go-kit (#6321)
1 parent 84687fb commit 87499e0

File tree

27 files changed

+58
-263
lines changed

27 files changed

+58
-263
lines changed

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ linters:
2929
desc: use "jsonrs" instead
3030
- pkg: github.com/rudderlabs/sonnet
3131
desc: use "jsonrs" instead
32+
- pkg: github.com/aws/aws-sdk-go$
33+
desc: use "aws-sdk-go-v2" instead
34+
- pkg: github.com/aws/aws-sdk-go/
35+
desc: use "aws-sdk-go-v2" instead
3236
forbidigo:
3337
forbid:
3438
- pattern: ^json\.Marshal.*$

‎enterprise/reporting/error_index/error_index_reporting_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package error_index
22

33
import (
44
"context"
5+
"fmt"
56
"testing"
67
"time"
78

@@ -536,7 +537,7 @@ func TestErrorIndexReporter(t *testing.T) {
536537

537538
c := config.New()
538539
c.Set("ErrorIndex.storage.Bucket", minioResource.BucketName)
539-
c.Set("ErrorIndex.storage.Endpoint", minioResource.Endpoint)
540+
c.Set("ErrorIndex.storage.Endpoint", fmt.Sprintf("http://%s", minioResource.Endpoint))
540541
c.Set("ErrorIndex.storage.AccessKey", minioResource.AccessKeyID)
541542
c.Set("ErrorIndex.storage.SecretAccessKey", minioResource.AccessKeySecret)
542543
c.Set("ErrorIndex.storage.S3ForcePathStyle", true)

‎gateway/gateway_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2691,7 +2691,7 @@ func TestLeakyUploader(t *testing.T) {
26912691
require.NoError(t, err)
26922692

26932693
// create a test gateway with leaky uploader enabled
2694-
gw, cleanupFn := createTestGatewayWithLeakyUploader(t, minioContainer.Endpoint, minioContainer.AccessKeyID, minioContainer.AccessKeySecret)
2694+
gw, cleanupFn := createTestGatewayWithLeakyUploader(t, fmt.Sprintf("http://%s", minioContainer.Endpoint), minioContainer.AccessKeyID, minioContainer.AccessKeySecret)
26952695
t.Cleanup(cleanupFn)
26962696

26972697
// Prepare invalid JSON payload

‎go.mod‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ require (
8787
github.com/rudderlabs/bing-ads-go-sdk v0.2.3
8888
github.com/rudderlabs/compose-test v0.1.3
8989
github.com/rudderlabs/keydb v0.4.2-alpha
90-
github.com/rudderlabs/rudder-go-kit v0.61.1
90+
github.com/rudderlabs/rudder-go-kit v0.62.0
9191
github.com/rudderlabs/rudder-observability-kit v0.0.4
9292
github.com/rudderlabs/rudder-schemas v0.7.0
9393
github.com/rudderlabs/rudder-transformer/go v0.0.0-20250707171833-9cd525669b1b
@@ -125,15 +125,6 @@ require (
125125
google.golang.org/protobuf v1.36.7
126126
)
127127

128-
require (
129-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
130-
github.com/aws/aws-sdk-go v1.55.7 // indirect
131-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
132-
github.com/moby/sys/capability v0.4.0 // indirect
133-
github.com/moby/sys/mountinfo v0.7.2 // indirect
134-
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
135-
)
136-
137128
require (
138129
cel.dev/expr v0.24.0 // indirect
139130
cloud.google.com/go v0.121.4 // indirect
@@ -158,6 +149,7 @@ require (
158149
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
159150
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
160151
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
152+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
161153
github.com/Microsoft/go-winio v0.6.2 // indirect
162154
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
163155
github.com/actgardner/gogen-avro/v10 v10.2.1 // indirect
@@ -169,6 +161,7 @@ require (
169161
github.com/apache/thrift v0.21.0 // indirect
170162
github.com/ardielle/ardielle-go v1.5.2 // indirect
171163
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
164+
github.com/aws/aws-sdk-go v1.55.7 // indirect
172165
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
173166
github.com/aws/aws-sdk-go-v2/config v1.30.1 // indirect
174167
github.com/aws/aws-sdk-go-v2/credentials v1.18.1 // indirect
@@ -194,6 +187,7 @@ require (
194187
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
195188
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
196189
github.com/containerd/continuity v0.4.5 // indirect
190+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
197191
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
198192
github.com/coreos/go-semver v0.3.1 // indirect
199193
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -226,7 +220,7 @@ require (
226220
github.com/go-playground/validator/v10 v10.23.0 // indirect
227221
github.com/go-sql-driver/mysql v1.8.1 // indirect
228222
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
229-
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
223+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
230224
github.com/goccy/go-json v0.10.5 // indirect
231225
github.com/goccy/go-reflect v1.2.0 // indirect
232226
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
@@ -259,7 +253,6 @@ require (
259253
github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
260254
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
261255
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
262-
github.com/jmespath/go-jmespath v0.4.0 // indirect
263256
github.com/json-iterator/go v1.1.12 // indirect
264257
github.com/klauspost/asmfmt v1.3.2 // indirect
265258
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
@@ -275,6 +268,8 @@ require (
275268
github.com/minio/crc64nvme v1.0.2 // indirect
276269
github.com/minio/md5-simd v1.1.2 // indirect
277270
github.com/moby/docker-image-spec v1.3.1 // indirect
271+
github.com/moby/sys/capability v0.4.0 // indirect
272+
github.com/moby/sys/mountinfo v0.7.2 // indirect
278273
github.com/moby/sys/sequential v0.6.0 // indirect
279274
github.com/moby/term v0.5.2 // indirect
280275
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -287,6 +282,7 @@ require (
287282
github.com/openzipkin/zipkin-go v0.4.3 // indirect
288283
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
289284
github.com/philhofer/fwd v1.2.0 // indirect
285+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
290286
github.com/pierrec/lz4/v4 v4.1.22 // indirect
291287
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
292288
github.com/pkg/errors v0.9.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
621621
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
622622
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
623623
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
624-
github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
625-
github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
624+
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
625+
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
626626
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
627627
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
628628
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
@@ -910,7 +910,6 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
910910
github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
911911
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
912912
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
913-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
914913
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
915914
github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
916915
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
@@ -1201,8 +1200,8 @@ github.com/rudderlabs/keydb v0.4.2-alpha h1:T6f1AAsznjuNtrhKNRGSLjWSL3+K56BbBexZ
12011200
github.com/rudderlabs/keydb v0.4.2-alpha/go.mod h1:LV0zuwxLbt/Byrcg7KROJfnHTBokU/ZUUpotT2+IdfQ=
12021201
github.com/rudderlabs/parquet-go v0.0.3 h1:/zgRj929pGKHsthc0kw8stVEcFu1JUcpxDRlhxjSLic=
12031202
github.com/rudderlabs/parquet-go v0.0.3/go.mod h1:WmwBOdvwpXl2aZGRk3NxxgzC/DaWGfax3jrCRhKhtSo=
1204-
github.com/rudderlabs/rudder-go-kit v0.61.1 h1:/yokabp3jWFlz/HCTdakTA3YjN4d831Nv0MCIV3uGuM=
1205-
github.com/rudderlabs/rudder-go-kit v0.61.1/go.mod h1:59K/p/XKy5n9f6CXiFdCOypE1tHV7fV3HnH7V33SDjM=
1203+
github.com/rudderlabs/rudder-go-kit v0.62.0 h1:7wieb60KcKTmsMW0Ag7UwYeAEaG4pzPP6/21VhY5/es=
1204+
github.com/rudderlabs/rudder-go-kit v0.62.0/go.mod h1:0xCvAIJfeA5ghD8hXyXb7s2mwsI8Tmi5XTKJhFkNb1A=
12061205
github.com/rudderlabs/rudder-observability-kit v0.0.4 h1:h9nLoWqiv/nqGOu1dhuVFAHNRkyodR6R3v36bqmavRs=
12071206
github.com/rudderlabs/rudder-observability-kit v0.0.4/go.mod h1:YTsvJmpvh8OLk7c4C+wXiV8NRdcrrdLa8UvIdLoXTho=
12081207
github.com/rudderlabs/rudder-schemas v0.7.0 h1:hKShHYpbIldE1Q591vodI6iaAZ/IUOyC1DqUUJZysNU=
@@ -2020,7 +2019,6 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
20202019
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
20212020
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
20222021
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
2023-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
20242022
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
20252023
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
20262024
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎integration_test/reporting_error_index/reporting_error_index_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ func runRudderServer(
759759
config.Set("Gateway.enableSuppressUserFeature", false)
760760

761761
config.Set("ErrorIndex.storage.Bucket", minioResource.BucketName)
762-
config.Set("ErrorIndex.storage.Endpoint", minioResource.Endpoint)
762+
config.Set("ErrorIndex.storage.Endpoint", fmt.Sprintf("http://%s", minioResource.Endpoint))
763763
config.Set("ErrorIndex.storage.AccessKey", minioResource.AccessKeyID)
764764
config.Set("ErrorIndex.storage.SecretAccessKey", minioResource.AccessKeySecret)
765765
config.Set("ErrorIndex.storage.S3ForcePathStyle", true)

‎internal/enricher/geolocation_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func TestDownloadMaxmindDB_success(t *testing.T) {
477477
conf := config.New()
478478
conf.Set("Geolocation.db.key", uploaded.ObjectName)
479479
conf.Set("Geolocation.db.storage.bucket", minio.BucketName)
480-
conf.Set("Geolocation.db.storage.endpoint", minio.Endpoint)
480+
conf.Set("Geolocation.db.storage.endpoint", fmt.Sprintf("http://%s", minio.Endpoint))
481481
conf.Set("Geolocation.db.storage.accessKey", minio.AccessKeyID)
482482
conf.Set("Geolocation.db.storage.secretAccessKey", minio.AccessKeySecret)
483483
conf.Set("Geolocation.db.storage.s3ForcePathStyle", true)

‎processor/internal/transformer/destination_transformer/destination_transformer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ type Client struct {
137137
}
138138

139139
loggedEvents atomic.Int64
140-
samplingFileManager filemanager.S3Manager
140+
samplingFileManager *filemanager.S3Manager
141141
}
142142

143143
func (d *Client) transform(ctx context.Context, clientEvents []types.TransformerEvent) types.Response {
@@ -466,7 +466,7 @@ func (d *Client) getRequestPayload(data []types.TransformerEvent, compactRequest
466466
return jsonrs.Marshal(data)
467467
}
468468

469-
func getSamplingUploader(conf *config.Config, log logger.Logger) (filemanager.S3Manager, error) {
469+
func getSamplingUploader(conf *config.Config, log logger.Logger) (*filemanager.S3Manager, error) {
470470
var (
471471
bucket = conf.GetString("DTSampling.Bucket", "processor-dt-sampling")
472472
endpoint = conf.GetString("DTSampling.Endpoint", "")

‎processor/internal/transformer/destination_transformer/embedded/warehouse/uploader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (t *Transformer) compareResponsesAndUpload(ctx context.Context, events []ty
6969
)
7070
}
7171

72-
func getSamplingUploader(conf *config.Config, log logger.Logger) (filemanager.S3Manager, error) {
72+
func getSamplingUploader(conf *config.Config, log logger.Logger) (*filemanager.S3Manager, error) {
7373
var (
7474
bucket = conf.GetStringVar("rudder-customer-sample-payloads", "Warehouse.Transformer.Sampling.Bucket")
7575
regionHint = conf.GetStringVar("us-east-1", "Warehouse.Transformer.Sampling.RegionHint", "AWS_S3_REGION_HINT")

‎processor/internal/transformer/destination_transformer/embedded/warehouse/uploader_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package warehouse
22

33
import (
44
"context"
5+
"fmt"
56
"strconv"
67
"strings"
78
"testing"
@@ -31,7 +32,7 @@ func TestTransformer_CompareResponsesAndUpload(t *testing.T) {
3132
c := config.New()
3233
c.Set("Warehouse.Transformer.Sampling.maxLoggedEvents", maxLoggedEvents)
3334
c.Set("Warehouse.Transformer.Sampling.Bucket", minioResource.BucketName)
34-
c.Set("Warehouse.Transformer.Sampling.Endpoint", minioResource.Endpoint)
35+
c.Set("Warehouse.Transformer.Sampling.Endpoint", fmt.Sprintf("http://%s", minioResource.Endpoint))
3536
c.Set("Warehouse.Transformer.Sampling.AccessKey", minioResource.AccessKeyID)
3637
c.Set("Warehouse.Transformer.Sampling.SecretAccessKey", minioResource.AccessKeySecret)
3738
c.Set("Warehouse.Transformer.Sampling.S3ForcePathStyle", true)

0 commit comments

Comments
 (0)