From 2862d25da0defe2e44ec6a3eba2d2808c89c167a Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 7 Jun 2024 11:35:50 -0400 Subject: [PATCH 1/5] gomod: temporarily replace gopkg.in/square/go-jose.v2 by gopkg.in/go-jose/go-jose.v2 This buys us time until #13526 is properly fixed. Signed-off-by: Simon Deziel --- go.mod | 3 +++ go.sum | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 5295308ec1ca..6c02046e377f 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/canonical/lxd go 1.22.3 +replace gopkg.in/square/go-jose.v2 v2.6.0 => github.com/go-jose/go-jose v2.6.3+incompatible + require ( github.com/Rican7/retry v0.3.1 github.com/armon/go-proxyproto v0.1.0 @@ -153,6 +155,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/grpc v1.64.0 // indirect + gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect diff --git a/go.sum b/go.sum index 30781a0de22a..f324fc4f054b 100644 --- a/go.sum +++ b/go.sum @@ -158,6 +158,8 @@ github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNIT github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose v2.6.3+incompatible h1:eU70erXEHN0wZl7K7kBTRLel/hu4P09qqopkDaXiXso= +github.com/go-jose/go-jose v2.6.3+incompatible/go.mod h1:coBhWG9DQz8V/JlBMg3LkUGnarUaxjQlWQUUv9Cv7tw= github.com/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk= github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -1115,6 +1117,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v1 v1.0.0-20161222125816-442357a80af5/go.mod h1:u0ALmqvLRxLI95fkdCEWrE6mhWYZW1aMOJHp5YXLHTg= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs= +gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI= gopkg.in/httprequest.v1 v1.1.1/go.mod h1:/CkavNL+g3qLOrpFHVrEx4NKepeqR4XTZWNj4sGGjz0= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= @@ -1122,8 +1126,6 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20160818015218-f2b6f6c918c4/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 h1:yiW+nvdHb9LVqSHQBXfZCieqV4fzYhNBql77zY0ykqs= gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod h1:BHsqpu/nsuzkT5BpiH1EMZPLyqSMM8JbIavyFACoFNk= From c6caf13e5ee56ce3f060a4a107ba22974633a37a Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 7 Jun 2024 11:45:55 -0400 Subject: [PATCH 2/5] test/godeps: Update go-jose.v2 dependency for client Signed-off-by: Simon Deziel --- test/godeps/client.list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/godeps/client.list b/test/godeps/client.list index 8cc963ad69ba..f9717360050e 100644 --- a/test/godeps/client.list +++ b/test/godeps/client.list @@ -48,9 +48,9 @@ golang.org/x/text/internal/language golang.org/x/text/internal/language/compact golang.org/x/text/internal/tag golang.org/x/text/language +gopkg.in/go-jose/go-jose.v2/cipher +gopkg.in/go-jose/go-jose.v2/json gopkg.in/square/go-jose.v2 -gopkg.in/square/go-jose.v2/cipher -gopkg.in/square/go-jose.v2/json vendor/golang.org/x/crypto/chacha20 vendor/golang.org/x/crypto/chacha20poly1305 vendor/golang.org/x/crypto/cryptobyte From 2e266f48ed8a808bb1bec8edf7ee06e11dab889d Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 7 Jun 2024 12:04:38 -0400 Subject: [PATCH 3/5] test/godeps: Update go-jose.v2 dependency for lxc-config Signed-off-by: Simon Deziel --- test/godeps/lxc-config.list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/godeps/lxc-config.list b/test/godeps/lxc-config.list index 3a4bc35a1b6b..14eaaa3110de 100644 --- a/test/godeps/lxc-config.list +++ b/test/godeps/lxc-config.list @@ -49,9 +49,9 @@ golang.org/x/text/internal/language golang.org/x/text/internal/language/compact golang.org/x/text/internal/tag golang.org/x/text/language +gopkg.in/go-jose/go-jose.v2/cipher +gopkg.in/go-jose/go-jose.v2/json gopkg.in/square/go-jose.v2 -gopkg.in/square/go-jose.v2/cipher -gopkg.in/square/go-jose.v2/json gopkg.in/yaml.v2 vendor/golang.org/x/crypto/chacha20 vendor/golang.org/x/crypto/chacha20poly1305 From db4b8fcdcbc6a51086e3b0e3f6525e84c3dc29b6 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 7 Jun 2024 12:07:10 -0400 Subject: [PATCH 4/5] test/godeps: Update go-jose.v2 dependency for lxd-agent Signed-off-by: Simon Deziel --- test/godeps/lxd-agent.list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/godeps/lxd-agent.list b/test/godeps/lxd-agent.list index 472b8b23ea7f..88d1822c68d8 100644 --- a/test/godeps/lxd-agent.list +++ b/test/godeps/lxd-agent.list @@ -299,12 +299,12 @@ google.golang.org/protobuf/types/known/anypb google.golang.org/protobuf/types/known/durationpb google.golang.org/protobuf/types/known/emptypb google.golang.org/protobuf/types/known/timestamppb +gopkg.in/go-jose/go-jose.v2/cipher +gopkg.in/go-jose/go-jose.v2/json gopkg.in/ini.v1 gopkg.in/mgo.v2/bson gopkg.in/mgo.v2/internal/json gopkg.in/square/go-jose.v2 -gopkg.in/square/go-jose.v2/cipher -gopkg.in/square/go-jose.v2/json gopkg.in/tomb.v2 gopkg.in/yaml.v2 gopkg.in/yaml.v3 From d9b979362f6f4ccfdb7ab496cabe3da950305199 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 7 Jun 2024 11:46:37 -0400 Subject: [PATCH 5/5] gomod: update Signed-off-by: Simon Deziel --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c02046e377f..a562fb1d3448 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/jochenvg/go-udev v0.0.0-20171110120927-d6b62d56d37b github.com/juju/gomaasapi v0.0.0-20200602032615-aa561369c767 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/lxc/go-lxc v0.0.0-20230926171149-ccae595aa49e + github.com/lxc/go-lxc v0.0.0-20240606200241-27b3d116511f github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-sqlite3 v1.14.22 github.com/mdlayher/ndp v1.1.0 diff --git a/go.sum b/go.sum index f324fc4f054b..cfdc6ba73d56 100644 --- a/go.sum +++ b/go.sum @@ -447,8 +447,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lunixbochs/vtclean v0.0.0-20160125035106-4fbf7632a2c6/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/lxc/go-lxc v0.0.0-20230926171149-ccae595aa49e h1:qM376kOMJIIDi5yqcxMzezaA2O+lLybIDSL4o1AEHLI= -github.com/lxc/go-lxc v0.0.0-20230926171149-ccae595aa49e/go.mod h1:d7gwEiQlW13OqE5UDJp2JJO78aTiSabSC/jUiVRZSes= +github.com/lxc/go-lxc v0.0.0-20240606200241-27b3d116511f h1:KnZqnn4R9Ae+jOK7DwacF1CnWEBMSwoXh44owa6j6k4= +github.com/lxc/go-lxc v0.0.0-20240606200241-27b3d116511f/go.mod h1:3UTWXVcHfgxE7JM4ZUnsy6bDA8L1vuzwJbJRF6dlB90= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=