Skip to content

Commit 2868947

Browse files
mklos-kwmklos-kw
committed
chore: bump reva, go 1.24
1 parent 1c9fb16 commit 2868947

File tree

93 files changed

+4946
-1240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+4946
-1240
lines changed

‎go.mod

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/owncloud/ocis/v2
22

3-
go 1.23.0
3+
go 1.24
44

55
toolchain go1.24.1
66

@@ -39,7 +39,7 @@ require (
3939
github.com/gofrs/uuid v4.4.0+incompatible
4040
github.com/golang-jwt/jwt/v5 v5.2.2
4141
github.com/golang/protobuf v1.5.4
42-
github.com/google/go-cmp v0.6.0
42+
github.com/google/go-cmp v0.7.0
4343
github.com/google/go-tika v0.3.1
4444
github.com/google/uuid v1.6.0
4545
github.com/gookit/config/v2 v2.2.5
@@ -51,7 +51,7 @@ require (
5151
github.com/jinzhu/now v1.1.5
5252
github.com/justinas/alice v1.2.0
5353
github.com/kovidgoyal/imaging v1.6.3
54-
github.com/leonelquinteros/gotext v1.7.0
54+
github.com/leonelquinteros/gotext v1.7.1
5555
github.com/libregraph/idm v0.5.0
5656
github.com/libregraph/lico v0.65.0
5757
github.com/mitchellh/mapstructure v1.5.0
@@ -67,7 +67,7 @@ require (
6767
github.com/open-policy-agent/opa v0.70.0
6868
github.com/orcaman/concurrent-map v1.0.0
6969
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27
70-
github.com/owncloud/reva/v2 v2.0.0-20250415081347-32419403823e
70+
github.com/owncloud/reva/v2 v2.0.0-20250423093209-c1d09dc1edd9
7171
github.com/pkg/errors v0.9.1
7272
github.com/pkg/xattr v0.4.10
7373
github.com/prometheus/client_golang v1.20.5
@@ -98,14 +98,14 @@ require (
9898
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
9999
go.opentelemetry.io/otel/sdk v1.32.0
100100
go.opentelemetry.io/otel/trace v1.32.0
101-
golang.org/x/crypto v0.36.0
101+
golang.org/x/crypto v0.37.0
102102
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
103103
golang.org/x/image v0.22.0
104104
golang.org/x/net v0.38.0
105105
golang.org/x/oauth2 v0.24.0
106-
golang.org/x/sync v0.12.0
107-
golang.org/x/term v0.30.0
108-
golang.org/x/text v0.23.0
106+
golang.org/x/sync v0.13.0
107+
golang.org/x/term v0.31.0
108+
golang.org/x/text v0.24.0
109109
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697
110110
google.golang.org/grpc v1.68.0
111111
google.golang.org/protobuf v1.35.2
@@ -269,8 +269,8 @@ require (
269269
github.com/modern-go/reflect2 v1.0.2 // indirect
270270
github.com/mschoch/smat v0.2.0 // indirect
271271
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
272-
github.com/nats-io/jwt/v2 v2.7.3 // indirect
273-
github.com/nats-io/nkeys v0.4.10 // indirect
272+
github.com/nats-io/jwt/v2 v2.7.4 // indirect
273+
github.com/nats-io/nkeys v0.4.11 // indirect
274274
github.com/nats-io/nuid v1.0.1 // indirect
275275
github.com/nxadm/tail v1.4.8 // indirect
276276
github.com/opencontainers/runtime-spec v1.1.0 // indirect
@@ -327,10 +327,10 @@ require (
327327
go.uber.org/atomic v1.11.0 // indirect
328328
go.uber.org/multierr v1.9.0 // indirect
329329
go.uber.org/zap v1.23.0 // indirect
330-
golang.org/x/mod v0.21.0 // indirect
331-
golang.org/x/sys v0.31.0 // indirect
330+
golang.org/x/mod v0.23.0 // indirect
331+
golang.org/x/sys v0.32.0 // indirect
332332
golang.org/x/time v0.11.0 // indirect
333-
golang.org/x/tools v0.26.0 // indirect
333+
golang.org/x/tools v0.30.0 // indirect
334334
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
335335
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
336336
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect

‎go.sum

+24-23
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
528528
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
529529
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
530530
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
531-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
532531
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
532+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
533+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
533534
github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
534535
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
535536
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -733,8 +734,8 @@ github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvf
733734
github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
734735
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
735736
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
736-
github.com/leonelquinteros/gotext v1.7.0 h1:jcJmF4AXqyamP7vuw2MMIKs+O3jAEmvrc5JQiI8Ht/8=
737-
github.com/leonelquinteros/gotext v1.7.0/go.mod h1:qJdoQuERPpccw7L70uoU+K/BvTfRBHYsisCQyFLXyvw=
737+
github.com/leonelquinteros/gotext v1.7.1 h1:/JNPeE3lY5JeVYv2+KBpz39994W3W9fmZCGq3eO9Ri8=
738+
github.com/leonelquinteros/gotext v1.7.1/go.mod h1:I0WoFDn9u2D3VbPnnDPT8mzZu0iSXG8iih+AH2fHHqg=
738739
github.com/libregraph/idm v0.5.0 h1:tDMwKbAOZzdeDYMxVlY5PbSqRKO7dbAW9KT42A51WSk=
739740
github.com/libregraph/idm v0.5.0/go.mod h1:BGMwIQ/6orJSPVzJ1x6kgG2JyG9GY05YFmbsnaD80k0=
740741
github.com/libregraph/lico v0.65.0 h1:h8GYJhTOBuNvxQzdViHdWkNSUp+YbPB1H18Bfn/zdlY=
@@ -834,14 +835,14 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
834835
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
835836
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
836837
github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8=
837-
github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE=
838-
github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4=
838+
github.com/nats-io/jwt/v2 v2.7.4 h1:jXFuDDxs/GQjGDZGhNgH4tXzSUK6WQi2rsj4xmsNOtI=
839+
github.com/nats-io/jwt/v2 v2.7.4/go.mod h1:me11pOkwObtcBNR8AiMrUbtVOUGkqYjMQZ6jnSdVUIA=
839840
github.com/nats-io/nats-server/v2 v2.11.1 h1:LwdauqMqMNhTxTN3+WFTX6wGDOKntHljgZ+7gL5HCnk=
840841
github.com/nats-io/nats-server/v2 v2.11.1/go.mod h1:leXySghbdtXSUmWem8K9McnJ6xbJOb0t9+NQ5HTRZjI=
841842
github.com/nats-io/nats.go v1.39.1 h1:oTkfKBmz7W047vRxV762M67ZdXeOtUgvbBaNoQ+3PPk=
842843
github.com/nats-io/nats.go v1.39.1/go.mod h1:MgRb8oOdigA6cYpEPhXJuRVH6UE/V4jblJ2jQ27IXYM=
843-
github.com/nats-io/nkeys v0.4.10 h1:glmRrpCmYLHByYcePvnTBEAwawwapjCPMjy2huw20wc=
844-
github.com/nats-io/nkeys v0.4.10/go.mod h1:OjRrnIKnWBFl+s4YK5ChQfvHP2fxqZexrKJoVVyWB3U=
844+
github.com/nats-io/nkeys v0.4.11 h1:q44qGV008kYd9W1b1nEBkNzvnWxtRSQ7A8BoqRrcfa0=
845+
github.com/nats-io/nkeys v0.4.11/go.mod h1:szDimtgmfOi9n25JpfIdGw12tZFYXqhGxjhVxsatHVE=
845846
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
846847
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
847848
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
@@ -886,8 +887,8 @@ github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CF
886887
github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
887888
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27 h1:ID8s5lGBntmrlI6TbDAjTzRyHucn3bVM2wlW+HBplv4=
888889
github.com/owncloud/libre-graph-api-go v1.0.5-0.20250217093259-fa3804be6c27/go.mod h1:+gT+x62AS9u2Farh9wE2uYmgdvTg0MQgsSI62D+xoRg=
889-
github.com/owncloud/reva/v2 v2.0.0-20250415081347-32419403823e h1:ukea680IP8n6y8uhuICLbb3hjc8SFp8kDlCUZmsSoAU=
890-
github.com/owncloud/reva/v2 v2.0.0-20250415081347-32419403823e/go.mod h1:1QUFTq8Q2tjzwY3g+Y1dHIO4tPYqTovV6ScacW3sTPs=
890+
github.com/owncloud/reva/v2 v2.0.0-20250423093209-c1d09dc1edd9 h1:nCYBP+iE/RhRYmEhiOQFXXCHxvdd/EAAtb7og6MqxIc=
891+
github.com/owncloud/reva/v2 v2.0.0-20250423093209-c1d09dc1edd9/go.mod h1:vynpm6URhGypkIv9EVC7C+MHu3LwsqaINkMCSUnyZ0o=
891892
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
892893
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
893894
github.com/pablodz/inotifywaitgo v0.0.7 h1:1ii49dGBnRn0t1Sz7RGZS6/NberPEDQprwKHN49Bv6U=
@@ -1232,8 +1233,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
12321233
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
12331234
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
12341235
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
1235-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
1236-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
1236+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
1237+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
12371238
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
12381239
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
12391240
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1275,8 +1276,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12751276
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12761277
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
12771278
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1278-
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
1279-
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
1279+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
1280+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
12801281
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
12811282
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
12821283
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1361,8 +1362,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
13611362
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
13621363
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
13631364
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1364-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
1365-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
1365+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
1366+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
13661367
golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
13671368
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
13681369
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1443,8 +1444,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14431444
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14441445
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14451446
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1446-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
1447-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1447+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
1448+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
14481449
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
14491450
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
14501451
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1456,8 +1457,8 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
14561457
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
14571458
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
14581459
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
1459-
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
1460-
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
1460+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
1461+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
14611462
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
14621463
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
14631464
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1473,8 +1474,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
14731474
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
14741475
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
14751476
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
1476-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
1477-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
1477+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
1478+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
14781479
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
14791480
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
14801481
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1537,8 +1538,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
15371538
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
15381539
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
15391540
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
1540-
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
1541-
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
1541+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
1542+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
15421543
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
15431544
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
15441545
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎ocis-pkg/crypto/gencert.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,17 @@ func GenTempCertForAddr(addr string) (tls.Certificate, error) {
6565
// persistCertificate generates a certificate using pk as private key and proceeds to store it into a file named certName.
6666
func persistCertificate(certName string, l log.Logger, pk interface{}) error {
6767
if err := ensureExistsDir(certName); err != nil {
68-
return fmt.Errorf("creating certificate destination: " + certName)
68+
return fmt.Errorf("creating certificate destination: %s", certName)
6969
}
7070

7171
certificate, err := generateCertificate(pk)
7272
if err != nil {
73-
return fmt.Errorf("creating certificate: " + filepath.Dir(certName))
73+
return fmt.Errorf("creating certificate: %s", filepath.Dir(certName))
7474
}
7575

7676
certOut, err := os.Create(certName)
7777
if err != nil {
78-
return fmt.Errorf("failed to open `%v` for writing", certName)
78+
return fmt.Errorf("failed to open %s for writing", certName)
7979
}
8080

8181
err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: certificate})
@@ -87,7 +87,7 @@ func persistCertificate(certName string, l log.Logger, pk interface{}) error {
8787
if err != nil {
8888
return fmt.Errorf("failed to write cert")
8989
}
90-
l.Info().Msg(fmt.Sprintf("written certificate to %v", certName))
90+
l.Info().Msg("written certificate to " + certName)
9191

9292
return nil
9393
}
@@ -108,12 +108,12 @@ func generateCertificate(pk interface{}) ([]byte, error) {
108108
// persistKey persists the private key used to generate the certificate at the configured location.
109109
func persistKey(destination string, l log.Logger, pk interface{}) error {
110110
if err := ensureExistsDir(destination); err != nil {
111-
return fmt.Errorf("creating key destination: " + destination)
111+
return fmt.Errorf("creating key destination: %s", destination)
112112
}
113113

114114
keyOut, err := os.OpenFile(destination, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
115115
if err != nil {
116-
return fmt.Errorf("failed to open %v for writing", destination)
116+
return fmt.Errorf("failed to open %s for writing", destination)
117117
}
118118
err = pem.Encode(keyOut, pemBlockForKey(pk, l))
119119
if err != nil {
@@ -124,7 +124,7 @@ func persistKey(destination string, l log.Logger, pk interface{}) error {
124124
if err != nil {
125125
return fmt.Errorf("failed to write key")
126126
}
127-
l.Info().Msg(fmt.Sprintf("written key to %v", destination))
127+
l.Info().Msg("written key to " + destination)
128128

129129
return nil
130130
}

‎ocis-pkg/l10n/l10n.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ var (
2222
ErrUnsupportedType = errors.New("unsupported type")
2323
)
2424

25+
// OcisLocale based on gotext.Locale, helps to pass go 1.24 vet on non-constant strings
26+
// Without the interface, go 1.24 vet will complain about non-constant strings used in gotext printf
27+
// Alternatives would be to use a different workaround or a different library
28+
type OcisLocale interface {
29+
Get(str string, vars ...interface{}) string
30+
GetN(str, plural string, n int, vars ...interface{}) string
31+
GetC(str, ctx string, vars ...interface{}) string
32+
GetNC(str, plural string, n int, ctx string, vars ...interface{}) string
33+
}
34+
2535
// Template marks a string as translatable
2636
func Template(s string) string { return s }
2737

@@ -58,7 +68,7 @@ func (t Translator) Translate(str, locale string) string {
5868
}
5969

6070
// Locale returns the gotext.Locale, use `.Get` method to translate strings
61-
func (t Translator) Locale(locale string) *gotext.Locale {
71+
func (t Translator) Locale(locale string) OcisLocale {
6272
l := gotext.NewLocaleFS(locale, t.fs)
6373
l.AddDomain(t.domain) // make domain configurable only if needed
6474
if locale != "en" && len(l.GetTranslations()) == 0 {

‎ocis-pkg/tracing/tracing.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"google.golang.org/grpc/credentials/insecure"
2222
)
2323

24+
const ERR_INVALID_AGENT_ENDPOINT = "invalid agent endpoint %s. expected format: hostname:port"
25+
2426
// Propagator ensures the importer module uses the same trace propagation strategy.
2527
var Propagator = propagation.NewCompositeTextMapPropagator(
2628
propagation.Baggage{},
@@ -159,14 +161,14 @@ func parseAgentConfig(ae string) (string, string, error) {
159161

160162
p := strings.Split(ae, ":")
161163
if len(p) != 2 {
162-
return "", "", fmt.Errorf(fmt.Sprintf("invalid agent endpoint `%s`. expected format: `hostname:port`", ae))
164+
return "", "", fmt.Errorf(ERR_INVALID_AGENT_ENDPOINT, ae)
163165
}
164166

165167
switch {
166168
case p[0] == "" && p[1] == "": // case ae = ":"
167-
return "", "", fmt.Errorf(fmt.Sprintf("invalid agent endpoint `%s`. expected format: `hostname:port`", ae))
169+
return "", "", fmt.Errorf(ERR_INVALID_AGENT_ENDPOINT, ae)
168170
case p[0] == "":
169-
return "", "", fmt.Errorf(fmt.Sprintf("invalid agent endpoint `%s`. expected format: `hostname:port`", ae))
171+
return "", "", fmt.Errorf(ERR_INVALID_AGENT_ENDPOINT, ae)
170172
}
171173
return p[0], p[1], nil
172174
}

‎services/search/pkg/service/grpc/v0/service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ func (s Service) Search(ctx context.Context, in *searchsvc.SearchRequest, out *s
165165
if err != nil {
166166
switch err.(type) {
167167
case errtypes.BadRequest:
168-
return merrors.BadRequest(s.id, err.Error())
168+
return merrors.BadRequest(s.id, "%s", err.Error())
169169
default:
170-
return merrors.InternalServerError(s.id, err.Error())
170+
return merrors.InternalServerError(s.id, "%s", err.Error())
171171
}
172172
}
173173

0 commit comments

Comments
 (0)