Skip to content

Commit 28f9178

Browse files
frezbofrezbo
committed
feat: update go-vex
Update go-vex to bring in version ranges supported vex documents. Also drop the go-containerregistry replace, see siderolabs/talos#13433 Signed-off-by: Noel Georgi <git@frezbo.dev>
1 parent 9920386 commit 28f9178

2 files changed

Lines changed: 11 additions & 25 deletions

File tree

‎go.mod‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ module github.com/siderolabs/image-factory
22

33
go 1.26.3
44

5-
// downgrade the go-containerregistry to workaround the security changes in
6-
// https://github.com/google/go-containerregistry/pull/2227/changes: it breaks
7-
// our extensions
8-
replace github.com/google/go-containerregistry => github.com/google/go-containerregistry v0.21.2
9-
105
require (
116
cloud.google.com/go/auth v0.20.0
127
github.com/CalebQ42/squashfs v1.4.1
@@ -40,7 +35,7 @@ require (
4035
github.com/siderolabs/go-blockdevice/v2 v2.0.29
4136
github.com/siderolabs/go-debug v0.6.2
4237
github.com/siderolabs/go-pointer v1.0.1
43-
github.com/siderolabs/go-vex v0.0.0-20260511103453-59abb9af79f6
38+
github.com/siderolabs/go-vex v0.1.1
4439
github.com/siderolabs/talos v1.14.0-alpha.1
4540
github.com/siderolabs/talos/pkg/machinery v1.14.0-alpha.1
4641
github.com/sigstore/cosign/v3 v3.0.6
@@ -179,7 +174,6 @@ require (
179174
github.com/containerd/log v0.1.0 // indirect
180175
github.com/containerd/platforms v1.0.0-rc.4 // indirect
181176
github.com/containerd/plugin v1.1.0 // indirect
182-
github.com/containerd/stargz-snapshotter/estargz v0.18.2 // indirect
183177
github.com/containerd/ttrpc v1.2.8 // indirect
184178
github.com/containerd/typeurl/v2 v2.2.3 // indirect
185179
github.com/containernetworking/cni v1.3.0 // indirect
@@ -194,7 +188,6 @@ require (
194188
github.com/diskfs/go-diskfs v1.7.0 // indirect
195189
github.com/distribution/reference v0.6.0 // indirect
196190
github.com/docker/cli v29.4.3+incompatible // indirect
197-
github.com/docker/distribution v2.8.3+incompatible // indirect
198191
github.com/docker/docker-credential-helpers v0.9.5 // indirect
199192
github.com/docker/go-connections v0.7.0 // indirect
200193
github.com/docker/go-units v0.5.0 // indirect
@@ -433,7 +426,6 @@ require (
433426
github.com/transparency-dev/merkle v0.0.2 // indirect
434427
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
435428
github.com/vbatts/go-mtree v0.7.0 // indirect
436-
github.com/vbatts/tar-split v0.12.2 // indirect
437429
github.com/vifraa/gopom v1.0.0 // indirect
438430
github.com/vultr/metadata v1.1.0 // indirect
439431
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
@@ -463,12 +455,12 @@ require (
463455
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
464456
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
465457
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
466-
golang.org/x/mod v0.35.0 // indirect
458+
golang.org/x/mod v0.36.0 // indirect
467459
golang.org/x/net v0.55.0 // indirect
468460
golang.org/x/oauth2 v0.36.0 // indirect
469461
golang.org/x/term v0.43.0 // indirect
470462
golang.org/x/time v0.15.0 // indirect
471-
golang.org/x/tools v0.44.0 // indirect
463+
golang.org/x/tools v0.45.0 // indirect
472464
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
473465
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 // indirect
474466
gonum.org/v1/gonum v0.17.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,6 @@ github.com/containerd/platforms v1.0.0-rc.4 h1:M42JrUT4zfZTqtkUwkr0GzmUWbfyO5VO0
378378
github.com/containerd/platforms v1.0.0-rc.4/go.mod h1:lKlMXyLybmBedS/JJm11uDofzI8L2v0J2ZbYvNsbq1A=
379379
github.com/containerd/plugin v1.1.0 h1:O+7lczNJVMy8rz0YNx3xGB8tTf5qY4i5abF041Ew19U=
380380
github.com/containerd/plugin v1.1.0/go.mod h1:qBTum+A8lJ6lO44A19Eo7y1OlcLj4OWFH1DA/vnHmcc=
381-
github.com/containerd/stargz-snapshotter/estargz v0.18.2 h1:yXkZFYIzz3eoLwlTUZKz2iQ4MrckBxJjkmD16ynUTrw=
382-
github.com/containerd/stargz-snapshotter/estargz v0.18.2/go.mod h1:XyVU5tcJ3PRpkA9XS2T5us6Eg35yM0214Y+wvrZTBrY=
383381
github.com/containerd/ttrpc v1.2.8 h1:xbVu6D4qF2jihdh9rDVOKqUMiFBQk6YctTdo1zk087Y=
384382
github.com/containerd/ttrpc v1.2.8/go.mod h1:wyZW2K79t4Hfcxl+GUvkZqRBzJlqFFvgEeeWXa42tyE=
385383
github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
@@ -424,8 +422,6 @@ github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz
424422
github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
425423
github.com/docker/cli v29.4.3+incompatible h1:u+UliYm2J/rYrIh2FqHQg32neRG8GjbvNuwQRTzGspU=
426424
github.com/docker/cli v29.4.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
427-
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
428-
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
429425
github.com/docker/docker-credential-helpers v0.9.5 h1:EFNN8DHvaiK8zVqFA2DT6BjXE0GzfLOZ38ggPTKePkY=
430426
github.com/docker/docker-credential-helpers v0.9.5/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=
431427
github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=
@@ -694,8 +690,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
694690
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
695691
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
696692
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
697-
github.com/google/go-containerregistry v0.21.2 h1:vYaMU4nU55JJGFC9JR/s8NZcTjbE9DBBbvusTW9NeS0=
698-
github.com/google/go-containerregistry v0.21.2/go.mod h1:ctO5aCaewH4AK1AumSF5DPW+0+R+d2FmylMJdp5G7p0=
693+
github.com/google/go-containerregistry v0.21.6 h1:T+yqQIlJXKrM98Om4DlW3GoWQAmhZuLMwoDOvVrtiUM=
694+
github.com/google/go-containerregistry v0.21.6/go.mod h1:U7MMSBIJynke2MVQrQk19NP9k/uQsGz/h0amIFSHMbo=
699695
github.com/google/go-github/v73 v73.0.0 h1:aR+Utnh+Y4mMkS+2qLQwcQ/cF9mOTpdwnzlaw//rG24=
700696
github.com/google/go-github/v73 v73.0.0/go.mod h1:fa6w8+/V+edSU0muqdhCVY7Beh1M8F1IlQPZIANKIYw=
701697
github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0=
@@ -1275,8 +1271,8 @@ github.com/siderolabs/go-retry v0.3.3 h1:zKV+S1vumtO72E6sYsLlmIdV/G/GcYSBLiEx/c9
12751271
github.com/siderolabs/go-retry v0.3.3/go.mod h1:Ff/VGc7v7un4uQg3DybgrmOWHEmJ8BzZds/XNn/BqMI=
12761272
github.com/siderolabs/go-smbios v0.3.4 h1:3HvW8lf+kw+HnC67XzdCH8WhkDeX+K9W4VmV54EeHv8=
12771273
github.com/siderolabs/go-smbios v0.3.4/go.mod h1:lNA6mNOsqhDQcE7HnAtATOa8F9CU8Q69M5wyNUSU0Co=
1278-
github.com/siderolabs/go-vex v0.0.0-20260511103453-59abb9af79f6 h1:Y6vlVApZdMiihrgSwHosLtNOmX0DdjuQd7qFyHGkuf8=
1279-
github.com/siderolabs/go-vex v0.0.0-20260511103453-59abb9af79f6/go.mod h1:WtQ9C/QCccKnmL4QqTbNyzTXq5yC6cBrzjFjN7fUzA0=
1274+
github.com/siderolabs/go-vex v0.1.1 h1:2AqXmQzSEkX/m2ol4srx8EafBxWrJfkF3oZ3iuyhYA0=
1275+
github.com/siderolabs/go-vex v0.1.1/go.mod h1:HYOk8edSCaVbTR8DPlC5gii5fw09JXQPfviNq+O2sy8=
12801276
github.com/siderolabs/net v0.4.0 h1:1bOgVay/ijPkJz4qct98nHsiB/ysLQU0KLoBC4qLm7I=
12811277
github.com/siderolabs/net v0.4.0/go.mod h1:/ibG+Hm9HU27agp5r9Q3eZicEfjquzNzQNux5uEk0kM=
12821278
github.com/siderolabs/protoenc v0.2.4 h1:D3Fpn2nQSQOhl8ZlAxijZAf7K6F8CM1uZq0afIGsr8Q=
@@ -1423,8 +1419,6 @@ github.com/umisama/go-cpe v0.0.0-20190323060751-cdd6c3c28a23 h1:+168JmE638t0Oxro
14231419
github.com/umisama/go-cpe v0.0.0-20190323060751-cdd6c3c28a23/go.mod h1:Jv/KoYWD3+46wW8r3pEwISwtgv5Q8NTfFto2wFRKvoA=
14241420
github.com/vbatts/go-mtree v0.7.0 h1:ytmOc3MTRidZiBi9VBCyZ2BHe4fZS47L5v7BVXDWW4E=
14251421
github.com/vbatts/go-mtree v0.7.0/go.mod h1:EjdpFC+LZy1TXbRGNa1MKKgjQ+7ew3foMFJK8o4/TdY=
1426-
github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4=
1427-
github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
14281422
github.com/vifraa/gopom v1.0.0 h1:L9XlKbyvid8PAIK8nr0lihMApJQg/12OBvMA28BcWh0=
14291423
github.com/vifraa/gopom v1.0.0/go.mod h1:oPa1dcrGrtlO37WPDBm5SqHAT+wTgF8An1Q71Z6Vv4o=
14301424
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
@@ -1594,8 +1588,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
15941588
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
15951589
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
15961590
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
1597-
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
1598-
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
1591+
golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
1592+
golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
15991593
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
16001594
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
16011595
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1846,8 +1840,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
18461840
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
18471841
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
18481842
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
1849-
golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
1850-
golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
1843+
golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
1844+
golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
18511845
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
18521846
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
18531847
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)