Skip to content

Commit 132f562

Browse files
JoshVanLJoshVanL
authored
Updates dapr/kit to main (#3816)
Signed-off-by: joshvanl <[email protected]>
1 parent 294dd75 commit 132f562

File tree

20 files changed

+50
-48
lines changed

20 files changed

+50
-48
lines changed

‎.build-tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
)
1313

1414
require (
15-
github.com/dapr/kit v0.13.1-0.20240909215017-3823663aa4bb // indirect
15+
github.com/dapr/kit v0.15.3-0.20250516121556-bc7dc566c45d // indirect
1616
github.com/gogo/protobuf v1.3.2 // indirect
1717
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
1818
github.com/inconshreveable/mousetrap v1.0.1 // indirect

‎.build-tools/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
2-
github.com/dapr/kit v0.13.1-0.20240909215017-3823663aa4bb h1:ahLO7pMmX6HAuT6/RxYWBY4AN2fXQJcYlU1msY6Kt7U=
3-
github.com/dapr/kit v0.13.1-0.20240909215017-3823663aa4bb/go.mod h1:Hz1W2LmWfA4UX/12MdA+brsf+np6f/1dJt6C6F63cjI=
2+
github.com/dapr/kit v0.15.3-0.20250516121556-bc7dc566c45d h1:v+kZn9ami23xBsruyZmKErIOSlCdW9pR8wfHUg5+jys=
3+
github.com/dapr/kit v0.15.3-0.20250516121556-bc7dc566c45d/go.mod h1:6w2Pr38zOAtBn+ld/jknwI4kgMfwanCIcFVnPykdPZQ=
44
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎bindings/aws/s3/s3.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"github.com/dapr/kit/logger"
4141
kitmd "github.com/dapr/kit/metadata"
4242
"github.com/dapr/kit/ptr"
43-
"github.com/dapr/kit/utils"
43+
kitstrings "github.com/dapr/kit/strings"
4444
)
4545

4646
const (
@@ -455,11 +455,11 @@ func (metadata s3Metadata) mergeWithRequestMetadata(req *bindings.InvokeRequest)
455455
merged := metadata
456456

457457
if val, ok := req.Metadata[metadataDecodeBase64]; ok && val != "" {
458-
merged.DecodeBase64 = utils.IsTruthy(val)
458+
merged.DecodeBase64 = kitstrings.IsTruthy(val)
459459
}
460460

461461
if val, ok := req.Metadata[metadataEncodeBase64]; ok && val != "" {
462-
merged.EncodeBase64 = utils.IsTruthy(val)
462+
merged.EncodeBase64 = kitstrings.IsTruthy(val)
463463
}
464464

465465
if val, ok := req.Metadata[metadataFilePath]; ok && val != "" {

‎bindings/gcp/bucket/bucket.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"github.com/dapr/components-contrib/metadata"
3838
"github.com/dapr/kit/logger"
3939
kitmd "github.com/dapr/kit/metadata"
40-
"github.com/dapr/kit/utils"
40+
"github.com/dapr/kit/strings"
4141
)
4242

4343
const (
@@ -325,11 +325,11 @@ func (metadata gcpMetadata) mergeWithRequestMetadata(req *bindings.InvokeRequest
325325
merged := metadata
326326

327327
if val, ok := req.Metadata[metadataDecodeBase64]; ok && val != "" {
328-
merged.DecodeBase64 = utils.IsTruthy(val)
328+
merged.DecodeBase64 = strings.IsTruthy(val)
329329
}
330330

331331
if val, ok := req.Metadata[metadataEncodeBase64]; ok && val != "" {
332-
merged.EncodeBase64 = utils.IsTruthy(val)
332+
merged.EncodeBase64 = strings.IsTruthy(val)
333333
}
334334
if val, ok := req.Metadata[metadataSignTTL]; ok && val != "" {
335335
merged.SignTTL = val

‎bindings/http/http.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/dapr/components-contrib/metadata"
3535
"github.com/dapr/kit/logger"
3636
kitmd "github.com/dapr/kit/metadata"
37-
"github.com/dapr/kit/utils"
37+
kitstrings "github.com/dapr/kit/strings"
3838
)
3939

4040
const (
@@ -137,7 +137,7 @@ func (h *HTTPSource) Init(_ context.Context, meta bindings.Metadata) error {
137137
}
138138

139139
if val := meta.Properties["errorIfNot2XX"]; val != "" {
140-
h.errorIfNot2XX = utils.IsTruthy(val)
140+
h.errorIfNot2XX = kitstrings.IsTruthy(val)
141141
} else {
142142
// Default behavior
143143
h.errorIfNot2XX = true
@@ -252,7 +252,7 @@ func (h *HTTPSource) Invoke(parentCtx context.Context, req *bindings.InvokeReque
252252
u = strings.TrimRight(u, "/") + "/" + strings.TrimLeft(req.Metadata["path"], "/")
253253
}
254254
if req.Metadata["errorIfNot2XX"] != "" {
255-
errorIfNot2XX = utils.IsTruthy(req.Metadata["errorIfNot2XX"])
255+
errorIfNot2XX = kitstrings.IsTruthy(req.Metadata["errorIfNot2XX"])
256256
}
257257

258258
var body io.Reader

‎bindings/rabbitmq/rabbitmq.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/dapr/components-contrib/metadata"
3535
"github.com/dapr/kit/logger"
3636
kitmd "github.com/dapr/kit/metadata"
37-
"github.com/dapr/kit/utils"
37+
"github.com/dapr/kit/strings"
3838
)
3939

4040
const (
@@ -313,7 +313,7 @@ func (r *RabbitMQ) parseMetadata(meta bindings.Metadata) error {
313313
}
314314

315315
if val, ok := meta.Properties[externalSasl]; ok && val != "" {
316-
m.ExternalSasl = utils.IsTruthy(val)
316+
m.ExternalSasl = strings.IsTruthy(val)
317317
}
318318

319319
if val, ok := meta.Properties[caCert]; ok && val != "" {
@@ -336,7 +336,7 @@ func (r *RabbitMQ) parseMetadata(meta bindings.Metadata) error {
336336
}
337337

338338
if val, ok := meta.Properties[externalSasl]; ok && val != "" {
339-
m.ExternalSasl = utils.IsTruthy(val)
339+
m.ExternalSasl = strings.IsTruthy(val)
340340
}
341341

342342
ttl, ok, err := metadata.TryGetTTL(meta.Properties)

‎common/authentication/aws/x509_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ func TestGetX509Client(t *testing.T) {
9292
var fetches atomic.Int32
9393
s := spiffe.New(spiffe.Options{
9494
Log: logger.NewLogger("test"),
95-
RequestSVIDFn: func(context.Context, []byte) ([]*cryptoX509.Certificate, error) {
95+
RequestSVIDFn: func(context.Context, []byte) (*spiffe.SVIDResponse, error) {
9696
fetches.Add(1)
97-
return respCert, respErr
97+
return &spiffe.SVIDResponse{
98+
X509Certificates: respCert,
99+
}, respErr
98100
},
99101
})
100102

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/cohesion-org/deepseek-go v1.2.0
6161
github.com/cyphar/filepath-securejoin v0.2.4
6262
github.com/dancannon/gorethink v4.0.0+incompatible
63-
github.com/dapr/kit v0.13.1-0.20240909215017-3823663aa4bb
63+
github.com/dapr/kit v0.15.3-0.20250516121556-bc7dc566c45d
6464
github.com/didip/tollbooth/v7 v7.0.1
6565
github.com/eclipse/paho.mqtt.golang v1.4.3
6666
github.com/fasthttp-contrib/sessions v0.0.0-20160905201309-74f6ac73d5d5

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible h1:KFV7Gha3AuqT+gr0B/eKvGhbjm
509509
github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz3WnybhRZtgF1K929FD8z1avU=
510510
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
511511
github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
512-
github.com/dapr/kit v0.13.1-0.20240909215017-3823663aa4bb h1:ahLO7pMmX6HAuT6/RxYWBY4AN2fXQJcYlU1msY6Kt7U=
513-
github.com/dapr/kit v0.13.1-0.20240909215017-3823663aa4bb/go.mod h1:Hz1W2LmWfA4UX/12MdA+brsf+np6f/1dJt6C6F63cjI=
512+
github.com/dapr/kit v0.15.3-0.20250516121556-bc7dc566c45d h1:v+kZn9ami23xBsruyZmKErIOSlCdW9pR8wfHUg5+jys=
513+
github.com/dapr/kit v0.15.3-0.20250516121556-bc7dc566c45d/go.mod h1:6w2Pr38zOAtBn+ld/jknwI4kgMfwanCIcFVnPykdPZQ=
514514
github.com/dave/jennifer v1.4.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
515515
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
516516
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎metadata/utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"time"
2323

2424
kitmd "github.com/dapr/kit/metadata"
25-
"github.com/dapr/kit/utils"
25+
kitstrings "github.com/dapr/kit/strings"
2626
)
2727

2828
const (
@@ -253,10 +253,10 @@ func GetMetadataInfoFromStructType(t reflect.Type, metadataMap *MetadataMap, com
253253
}
254254

255255
// If there's a mdignore tag and that's truthy, the field should be ignored by the metadata analyzer
256-
mdField.Ignored = utils.IsTruthy(currentField.Tag.Get("mdignore"))
256+
mdField.Ignored = kitstrings.IsTruthy(currentField.Tag.Get("mdignore"))
257257

258258
// If there's a "mddeprecated" tag, the field may be deprecated
259-
mdField.Deprecated = utils.IsTruthy(currentField.Tag.Get("mddeprecated"))
259+
mdField.Deprecated = kitstrings.IsTruthy(currentField.Tag.Get("mddeprecated"))
260260

261261
// If there's a "mdaliases" tag, the field contains aliases
262262
// The value is a comma-separated string

0 commit comments

Comments
 (0)