Hi Mauricio,
Since you asked about the vendored dependency changes, here's the changes:
$ git show abbf5d88edb27008d0899f313db347f3eccece4b go.mod > ../go.mod.diff
$ cat ../go.mod.diff
commit abbf5d88edb27008d0899f313db347f3eccece4b (lp-core/upstream, kajiya/upstream, upstream) Author: Chloé Smith <email address hidden> Date: Thu May 2 21:14:04 2024 +0100
New upstream version 20240320.00
diff --git a/go.mod b/go.mod index 4065215..7e6c171 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,9 @@ module github.com/GoogleCloudPlatform/osconfig
-go 1.16 +go 1.21
require ( - cloud.google.com/go v0.110.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 - cloud.google.com/go/iam v0.12.0 // indirect - cloud.google.com/go/longrunning v0.4.1 // indirect cloud.google.com/go/osconfig v1.11.0 cloud.google.com/go/storage v1.29.0 cos.googlesource.com/cos/tools.git v0.0.0-20210329212435-a349a79f950d @@ -17,12 +14,36 @@ require ( github.com/google/go-cmp v0.5.9 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 github.com/ulikunitz/xz v0.5.11 + golang.org/x/crypto v0.17.0 + golang.org/x/oauth2 v0.7.0 + golang.org/x/sys v0.15.0 + google.golang.org/api v0.114.0 + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 + google.golang.org/grpc v1.56.3 + google.golang.org/protobuf v1.30.0 +) + +require ( + cloud.google.com/go v0.110.0 // indirect + cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/logging v1.7.0 // indirect + cloud.google.com/go/longrunning v0.4.1 // indirect + github.com/golang/glog v1.1.0 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect + github.com/googleapis/gax-go/v2 v2.7.1 // indirect + github.com/julienschmidt/httprouter v1.3.0 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/sirupsen/logrus v1.6.0 // indirect go.chromium.org/luci v0.0.0-20201204084249-3e81ee3e83fe // indirect - golang.org/x/crypto v0.6.0 - golang.org/x/oauth2 v0.5.0 - golang.org/x/sys v0.5.0 - google.golang.org/api v0.110.0 - google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 - google.golang.org/grpc v1.53.0 - google.golang.org/protobuf v1.28.1 + go.opencensus.io v0.24.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sync v0.1.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/appengine v1.6.7 // indirect )
Furthermore, the actual vendored changes are here: https://git.launchpad.net/~ubuntu-core-dev/+git/google-osconfig-agent/commit/?h=ubuntu/master&id=04c6d100f1d2a63c41456d04d0d3331e29199127
This also shows the exact files changed and the number of lines changed in those files.
I'll formally put this in the bug and in the template.
Hi Mauricio,
Since you asked about the vendored dependency changes, here's the changes:
$ git show abbf5d88edb2700 8d0899f313db347 f3eccece4b go.mod > ../go.mod.diff
$ cat ../go.mod.diff
commit abbf5d88edb2700 8d0899f313db347 f3eccece4b (lp-core/upstream, kajiya/upstream, upstream)
Author: Chloé Smith <email address hidden>
Date: Thu May 2 21:14:04 2024 +0100
New upstream version 20240320.00
diff --git a/go.mod b/go.mod com/GoogleCloud Platform/ osconfig
index 4065215..7e6c171 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,9 @@
module github.
-go 1.16
+go 1.21
require ( google. com/go/ compute/ metadata v0.2.3 com/go/ iam v0.12.0 // indirect com/go/ longrunning v0.4.1 // indirect google. com/go/ osconfig v1.11.0 google. com/go/ storage v1.29.0 rce.com/ cos/tools. git v0.0.0- 20210329212435- a349a79f950d com/google/ go-cmp v0.5.9 com/tarm/ serial v0.0.0- 20180830185346- 98f6abe2eb07 com/ulikunitz/ xz v0.5.11 golang. org/api v0.114.0 golang. org/genproto v0.0.0- 20230410155749- daa745c078e1 golang. org/grpc v1.56.3 golang. org/protobuf v1.30.0 com/go/ compute v1.19.1 // indirect com/go/ iam v0.13.0 // indirect com/go/ logging v1.7.0 // indirect com/go/ longrunning v0.4.1 // indirect com/golang/ glog v1.1.0 // indirect com/golang/ groupcache v0.0.0- 20200121045136- 8c9f03a8e57e // indirect com/golang/ protobuf v1.5.3 // indirect com/google/ uuid v1.3.0 // indirect com/googleapis/ enterprise- certificate- proxy v0.2.3 // indirect com/googleapis/ gax-go/ v2 v2.7.1 // indirect com/julienschmi dt/httprouter v1.3.0 // indirect com/konsorten/ go-windows- terminal- sequences v1.0.3 // indirect com/pkg/ errors v0.9.1 // indirect com/sirupsen/ logrus v1.6.0 // indirect org/luci v0.0.0- 20201204084249- 3e81ee3e83fe // indirect golang. org/api v0.110.0 golang. org/genproto v0.0.0- 20230223222841- 637eb2293923 golang. org/grpc v1.53.0 golang. org/protobuf v1.28.1 org/x/xerrors v0.0.0- 20220907171357- 04be3eba64a2 // indirect golang. org/appengine v1.6.7 // indirect
- cloud.google.com/go v0.110.0 // indirect
cloud.
- cloud.google.
- cloud.google.
cloud.
cloud.
cos.googlesou
@@ -17,12 +14,36 @@ require (
github.
github.
github.
+ golang.org/x/crypto v0.17.0
+ golang.org/x/oauth2 v0.7.0
+ golang.org/x/sys v0.15.0
+ google.
+ google.
+ google.
+ google.
+)
+
+require (
+ cloud.google.com/go v0.110.0 // indirect
+ cloud.google.
+ cloud.google.
+ cloud.google.
+ cloud.google.
+ github.
+ github.
+ github.
+ github.
+ github.
+ github.
+ github.
+ github.
+ github.
+ github.
go.chromium.
- golang.org/x/crypto v0.6.0
- golang.org/x/oauth2 v0.5.0
- golang.org/x/sys v0.5.0
- google.
- google.
- google.
- google.
+ go.opencensus.io v0.24.0 // indirect
+ golang.org/x/net v0.17.0 // indirect
+ golang.org/x/sync v0.1.0 // indirect
+ golang.org/x/text v0.14.0 // indirect
+ golang.
+ google.
)
Furthermore, the actual vendored changes are here: /git.launchpad. net/~ubuntu- core-dev/ +git/google- osconfig- agent/commit/ ?h=ubuntu/ master& id=04c6d100f1d2 a63c41456d04d0d 3331e29199127
https:/
This also shows the exact files changed and the number of lines changed in those files.
I'll formally put this in the bug and in the template.