Skip to content

Commit f668523

Browse files
committed
Update dapr/kit to main, and update utils signatures
Signed-off-by: joshvanl <[email protected]>
1 parent 96346c9 commit f668523

File tree

28 files changed

+231
-229
lines changed

28 files changed

+231
-229
lines changed

cmd/placement/options/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/dapr/dapr/pkg/security"
2828
securityConsts "github.com/dapr/dapr/pkg/security/consts"
2929
"github.com/dapr/kit/logger"
30-
"github.com/dapr/kit/utils"
30+
kitstrings "github.com/dapr/kit/strings"
3131
)
3232

3333
const (
@@ -102,7 +102,7 @@ func New(origArgs []string) (*Options, error) {
102102
}
103103

104104
opts := Options{
105-
MetadataEnabled: utils.IsTruthy(os.Getenv(envMetadataEnabled)),
105+
MetadataEnabled: kitstrings.IsTruthy(os.Getenv(envMetadataEnabled)),
106106
}
107107

108108
// Create a flag set

go.mod

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
github.com/cloudevents/sdk-go/v2 v2.15.2
1414
github.com/dapr/components-contrib v1.15.1-0.20250423123324-b2c31ceba20b
1515
github.com/dapr/durabletask-go v0.6.5
16-
github.com/dapr/kit v0.15.2
17-
github.com/diagridio/go-etcd-cron v0.6.2
16+
github.com/dapr/kit v0.15.3-0.20250423142915-e3d4a8f1b4ae
17+
github.com/diagridio/go-etcd-cron v0.6.1
1818
github.com/evanphx/json-patch/v5 v5.9.0
1919
github.com/go-chi/chi/v5 v5.0.11
2020
github.com/go-chi/cors v1.2.1
@@ -41,13 +41,13 @@ require (
4141
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4
4242
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
4343
github.com/prometheus/client_golang v1.22.0
44-
github.com/prometheus/client_model v0.6.1
44+
github.com/prometheus/client_model v0.6.2
4545
github.com/prometheus/common v0.63.0
4646
github.com/redis/go-redis/v9 v9.6.3
4747
github.com/sony/gobreaker v0.5.0
48-
github.com/spf13/cast v1.6.0
48+
github.com/spf13/cast v1.8.0
4949
github.com/spf13/pflag v1.0.6
50-
github.com/spiffe/go-spiffe/v2 v2.1.7
50+
github.com/spiffe/go-spiffe/v2 v2.5.0
5151
github.com/stretchr/testify v1.10.0
5252
go.etcd.io/etcd/api/v3 v3.5.21
5353
go.etcd.io/etcd/client/pkg/v3 v3.5.21
@@ -58,18 +58,18 @@ require (
5858
go.opentelemetry.io/otel v1.35.0
5959
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0
6060
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
61-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0
61+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0
6262
go.opentelemetry.io/otel/exporters/zipkin v1.34.0
6363
go.opentelemetry.io/otel/sdk v1.35.0
6464
go.opentelemetry.io/otel/trace v1.35.0
65-
go.uber.org/automaxprocs v1.5.3
65+
go.uber.org/automaxprocs v1.6.0
6666
go.uber.org/ratelimit v0.3.0
67-
golang.org/x/crypto v0.37.0
68-
golang.org/x/net v0.39.0
69-
golang.org/x/sync v0.13.0
70-
google.golang.org/genproto/googleapis/api v0.0.0-20250409194420-de1ac958c67a
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250409194420-de1ac958c67a
72-
google.golang.org/grpc v1.71.1
67+
golang.org/x/crypto v0.38.0
68+
golang.org/x/net v0.40.0
69+
golang.org/x/sync v0.14.0
70+
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2
71+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2
72+
google.golang.org/grpc v1.72.0
7373
google.golang.org/protobuf v1.36.6
7474
gopkg.in/yaml.v3 v3.0.1
7575
k8s.io/api v0.31.0
@@ -87,7 +87,7 @@ require (
8787
)
8888

8989
require (
90-
cel.dev/expr v0.19.2 // indirect
90+
cel.dev/expr v0.20.0 // indirect
9191
cloud.google.com/go v0.120.0 // indirect
9292
cloud.google.com/go/ai v0.6.0 // indirect
9393
cloud.google.com/go/aiplatform v1.81.0 // indirect
@@ -128,17 +128,16 @@ require (
128128
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
129129
github.com/Code-Hex/go-generics-cache v1.3.1 // indirect
130130
github.com/DataDog/zstd v1.5.2 // indirect
131-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
131+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
132132
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
133133
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
134134
github.com/IBM/sarama v1.43.3 // indirect
135-
github.com/OneOfOne/xxhash v1.2.8 // indirect
136135
github.com/PaesslerAG/gval v1.0.0 // indirect
137136
github.com/RoaringBitmap/roaring v1.1.0 // indirect
138137
github.com/Workiva/go-datastructures v1.0.53 // indirect
139138
github.com/aerospike/aerospike-client-go/v6 v6.12.0 // indirect
140139
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 // indirect
141-
github.com/agnivade/levenshtein v1.1.1 // indirect
140+
github.com/agnivade/levenshtein v1.2.1 // indirect
142141
github.com/alibaba/sentinel-golang v1.0.4 // indirect
143142
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
144143
github.com/alibabacloud-go/darabonba-openapi v0.2.1 // indirect
@@ -235,11 +234,12 @@ require (
235234
github.com/fasthttp-contrib/sessions v0.0.0-20160905201309-74f6ac73d5d5 // indirect
236235
github.com/fatih/color v1.17.0 // indirect
237236
github.com/felixge/httpsnoop v1.0.4 // indirect
238-
github.com/fsnotify/fsnotify v1.7.0 // indirect
237+
github.com/fsnotify/fsnotify v1.9.0 // indirect
239238
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
240239
github.com/gage-technologies/mistral-go v1.0.0 // indirect
241240
github.com/go-errors/errors v1.4.2 // indirect
242241
github.com/go-ini/ini v1.67.0 // indirect
242+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
243243
github.com/go-kit/kit v0.10.0 // indirect
244244
github.com/go-kit/log v0.2.1 // indirect
245245
github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -271,7 +271,7 @@ require (
271271
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
272272
github.com/golang/snappy v0.0.4 // indirect
273273
github.com/google/btree v1.1.3 // indirect
274-
github.com/google/flatbuffers v23.5.26+incompatible // indirect
274+
github.com/google/flatbuffers v25.2.10+incompatible // indirect
275275
github.com/google/generative-ai-go v0.14.0 // indirect
276276
github.com/google/gnostic-models v0.6.8 // indirect
277277
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
@@ -365,7 +365,7 @@ require (
365365
github.com/nats-io/nkeys v0.4.6 // indirect
366366
github.com/nats-io/nuid v1.0.1 // indirect
367367
github.com/ncruces/go-strftime v0.1.9 // indirect
368-
github.com/open-policy-agent/opa v0.68.0 // indirect
368+
github.com/open-policy-agent/opa v1.4.2 // indirect
369369
github.com/opentracing/opentracing-go v1.2.0 // indirect
370370
github.com/openzipkin/zipkin-go v0.4.3 // indirect
371371
github.com/oracle/oci-go-sdk/v54 v54.0.0 // indirect
@@ -377,20 +377,20 @@ require (
377377
github.com/pierrec/lz4/v4 v4.1.21 // indirect
378378
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
379379
github.com/pkg/errors v0.9.1 // indirect
380-
github.com/pkg/sftp v1.13.6 // indirect
380+
github.com/pkg/sftp v1.13.7 // indirect
381381
github.com/pkoukk/tiktoken-go v0.1.6 // indirect
382382
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
383383
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
384384
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
385-
github.com/prometheus/procfs v0.16.0 // indirect
385+
github.com/prometheus/procfs v0.16.1 // indirect
386386
github.com/prometheus/statsd_exporter v0.22.7 // indirect
387387
github.com/puzpuzpuz/xsync/v3 v3.0.0 // indirect
388388
github.com/rabbitmq/amqp091-go v1.9.0 // indirect
389-
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
389+
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
390390
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
391391
github.com/riferrei/srclient v0.6.0 // indirect
392392
github.com/rs/zerolog v1.31.0 // indirect
393-
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
393+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
394394
github.com/segmentio/asm v1.2.0 // indirect
395395
github.com/sendgrid/rest v2.6.9+incompatible // indirect
396396
github.com/sendgrid/sendgrid-go v3.13.0+incompatible // indirect
@@ -401,12 +401,12 @@ require (
401401
github.com/soheilhy/cmux v0.1.5 // indirect
402402
github.com/sourcegraph/conc v0.3.0 // indirect
403403
github.com/spaolacci/murmur3 v1.1.0 // indirect
404-
github.com/spf13/cobra v1.8.1 // indirect
404+
github.com/spf13/cobra v1.9.1 // indirect
405405
github.com/stealthrocket/wasi-go v0.8.1-0.20230912180546-8efbab50fb58 // indirect
406406
github.com/stoewer/go-strcase v1.2.0 // indirect
407407
github.com/stretchr/objx v0.5.2 // indirect
408408
github.com/supplyon/gremcos v0.1.40 // indirect
409-
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
409+
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
410410
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.732 // indirect
411411
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssm v1.0.732 // indirect
412412
github.com/tetratelabs/wazero v1.7.0 // indirect
@@ -435,18 +435,18 @@ require (
435435
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
436436
github.com/yuin/gopher-lua v1.1.0 // indirect
437437
github.com/yusufpapurcu/wmi v1.2.3 // indirect
438-
github.com/zeebo/errs v1.3.0 // indirect
438+
github.com/zeebo/errs v1.4.0 // indirect
439439
go.etcd.io/bbolt v1.4.0 // indirect
440440
go.etcd.io/etcd/client/v2 v2.305.21 // indirect
441441
go.etcd.io/etcd/pkg/v3 v3.5.21 // indirect
442442
go.etcd.io/etcd/raft/v3 v3.5.21 // indirect
443443
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
444444
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
445445
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
446-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
446+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
447447
go.opentelemetry.io/otel/metric v1.35.0 // indirect
448-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
449-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
448+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
449+
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
450450
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
451451
go.uber.org/atomic v1.10.0 // indirect
452452
go.uber.org/multierr v1.11.0 // indirect
@@ -455,9 +455,9 @@ require (
455455
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
456456
golang.org/x/mod v0.24.0 // indirect
457457
golang.org/x/oauth2 v0.28.0 // indirect
458-
golang.org/x/sys v0.32.0 // indirect
459-
golang.org/x/term v0.31.0 // indirect
460-
golang.org/x/text v0.24.0 // indirect
458+
golang.org/x/sys v0.33.0 // indirect
459+
golang.org/x/term v0.32.0 // indirect
460+
golang.org/x/text v0.25.0 // indirect
461461
golang.org/x/time v0.11.0 // indirect
462462
golang.org/x/tools v0.32.0 // indirect
463463
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -517,3 +517,9 @@ replace (
517517
//
518518
// Then, run `make modtidy-all` in this repository.
519519
// This ensures that go.mod and go.sum are up-to-date for each go.mod file.
520+
521+
replace github.com/diagridio/go-etcd-cron => ../../diagridio/go-etcd-cron
522+
523+
replace github.com/dapr/kit => github.com/joshvanl/kit v0.0.0-20250511180808-f7108188fa4e
524+
525+
replace github.com/dapr/components-contrib => github.com/joshvanl/components-contrib v0.0.0-20250511180552-a2987a5fd60c

0 commit comments

Comments
 (0)