Skip to content

Commit

Permalink
maint(go): Go 1.22.0 (#669)
Browse files Browse the repository at this point in the history 
Update all modules and code to Go 1.22.0
Adapt some code to avoid suttering on `foo := foo`
Prefer 1.22.1 to fix security vulnerability

UDENG-2352
  • Loading branch information
@didrocks
didrocks authored Mar 6, 2024
2 parents 21c35ad + 110df7d commit 504f5b1
Show file tree
Hide file tree
Showing 61 changed files with 198 additions and 302 deletions.
8 changes: 4 additions & 4 deletions agentapi/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/canonical/ubuntu-pro-for-wsl/agentapi

go 1.21.0
go 1.22.0

toolchain go1.21.5
toolchain go1.22.1

require (
google.golang.org/grpc v1.62.0
Expand All @@ -11,8 +11,8 @@ require (

require (
github.com/golang/protobuf v1.5.3 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
)
8 changes: 4 additions & 4 deletions agentapi/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
12 changes: 6 additions & 6 deletions common/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/canonical/ubuntu-pro-for-wsl/common

go 1.21.0
go 1.22.0

toolchain go1.21.5
toolchain go1.22.1

require (
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.6.0
github.com/sirupsen/logrus v1.9.3
github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2
github.com/stretchr/testify v1.9.0
github.com/ubuntu/gowsl v0.0.0-20231004124730-8fd8df02f394
github.com/ubuntu/gowsl v0.0.0-20240213160838-c27a23d27d12
google.golang.org/grpc v1.62.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.32.0
Expand All @@ -21,10 +21,10 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/ubuntu/decorate v0.0.0-20230905131025-e968fa48a85c // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
Expand Down
16 changes: 8 additions & 8 deletions common/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/snapcore/go-gettext v0.0.0-20201130093759-38740d1bd3d2 h1:nETXPg0CiJrMAwC2gqkcam9BiBWYGvTsSYRfrjOz2Kg=
Expand All @@ -37,13 +37,13 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/ubuntu/decorate v0.0.0-20230905131025-e968fa48a85c h1:jO41xNLddTDkrfz4w4RCMWCmX8Y+ZHz5jSbJWNLDvqU=
github.com/ubuntu/decorate v0.0.0-20230905131025-e968fa48a85c/go.mod h1:edGgz97NOqS2oqzbKrZqO9YU9neosRrkEZbVJVQynAA=
github.com/ubuntu/gowsl v0.0.0-20231004124730-8fd8df02f394 h1:DS9wb53gTUxFCPYnhAqOhfdRLsHTL9NpzT+F/D8NwIg=
github.com/ubuntu/gowsl v0.0.0-20231004124730-8fd8df02f394/go.mod h1:gu6CgOaqMFFz1h96UocQwXvRvF6CePIqQnI58DzIg2Q=
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
github.com/ubuntu/gowsl v0.0.0-20240213160838-c27a23d27d12 h1:LrBQDPvsK4Pqluy05iw8w51F6XWndIfyssL4g/fLAzo=
github.com/ubuntu/gowsl v0.0.0-20240213160838-c27a23d27d12/go.mod h1:7hcEt67BNrsJHVZtWBCU0tJG0JQEvoMSi+TN1hFZHHg=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
1 change: 0 additions & 1 deletion common/grpc/grpcerror/grpcerror_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func TestFormat(t *testing.T) {

for name, tc := range tests {
t.Run(name, func(t *testing.T) {
tc := tc
t.Parallel()

err := grpcerror.Format(tc.err, "DaemonName")
Expand Down
1 change: 0 additions & 1 deletion common/grpc/logconnections/logconnections_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func TestChildRecvMsgAndHandlerCalled(t *testing.T) {
"Error when RecvMsg errors out": {recvMsgError: true, wantHandlerNum: 1, wantRecvMsgError: true},
}
for name, tc := range tests {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()

Expand Down
1 change: 0 additions & 1 deletion common/grpc/logstreamer/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ func TestRecvLogMsg(t *testing.T) {
}

for name, tc := range tests {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()

Expand Down
1 change: 0 additions & 1 deletion common/grpc/logstreamer/log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ func TestSetReportCaller(t *testing.T) {
}

for name, tc := range tests {
tc := tc
t.Run(name, func(t *testing.T) {
orig := logrus.StandardLogger().ReportCaller
defer logrus.SetReportCaller(orig)
Expand Down
1 change: 0 additions & 1 deletion common/grpc/logstreamer/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ func TestStreamServerInterceptorLoggerInvalidMetadata(t *testing.T) {
}

for name, tc := range tests {
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()

Expand Down
1 change: 0 additions & 1 deletion common/i18n/i18n_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func TestTranslations(t *testing.T) {
}

for name, tc := range tests {
tc := tc
t.Run(name, func(t *testing.T) {
// We can't run those subtests in parallel as we want defer of global functions to end once all subtests are.

Expand Down
10 changes: 4 additions & 6 deletions common/testutils/set_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ func TestSet(t *testing.T) {
// Concurrently add items to it
var wg sync.WaitGroup
for i := 0; i < testSize; i++ {
i := i
wg.Add(1)
go func() {
go func(i int) {
set.Set(i)
wg.Done()
}()
}(i)
}
wg.Wait()

Expand All @@ -35,12 +34,11 @@ func TestSet(t *testing.T) {
// Concurrently remove items
wg = sync.WaitGroup{}
for i := 0; i < testSize; i++ {
i := i
wg.Add(1)
go func() {
go func(i int) {
set.Unset(i)
wg.Done()
}()
}(i)
}
wg.Wait()

Expand Down
2 changes: 0 additions & 2 deletions common/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ func TestWSLLauncher(t *testing.T) {
}

for name, tc := range testCases {
name := name
tc := tc
t.Run(name, func(t *testing.T) {
t.Parallel()

Expand Down
4 changes: 2 additions & 2 deletions contractsapi/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/canonical/ubuntu-pro-for-wsl/contractsapi

go 1.21.0
go 1.22.0

toolchain go1.21.5
toolchain go1.22.1
17 changes: 9 additions & 8 deletions end-to-end/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
module github.com/canonical/ubuntu-pro-for-wsl/end-to-end

go 1.21.0
go 1.22.0

toolchain go1.21.5
toolchain go1.22.1

require (
github.com/canonical/landscape-hostagent-api v0.0.0-20231122074150-cd77c9c81c2d
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240131155254-d69397537350
github.com/canonical/ubuntu-pro-for-wsl/mocks v0.0.0-20240131155254-d69397537350
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240306140056-b2552aec01d2
github.com/canonical/ubuntu-pro-for-wsl/mocks v0.0.0-20240306142331-92bc29c88c71
github.com/stretchr/testify v1.9.0
github.com/ubuntu/gowsl v0.0.0-20231004124730-8fd8df02f394
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
github.com/ubuntu/gowsl v0.0.0-20240213160838-c27a23d27d12
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
golang.org/x/sys v0.18.0
google.golang.org/grpc v1.62.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240131154921-6a764837eef6 // indirect
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240306140056-b2552aec01d2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/ubuntu/decorate v0.0.0-20230905131025-e968fa48a85c // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/protobuf v1.32.0 // indirect
Expand Down
28 changes: 14 additions & 14 deletions end-to-end/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ github.com/0xrawsec/golang-utils v1.3.2 h1:ww4jrtHRSnX9xrGzJYbalx5nXoZewy4zPxiY+
github.com/0xrawsec/golang-utils v1.3.2/go.mod h1:m7AzHXgdSAkFCD9tWWsApxNVxMlyy7anpPVOyT/yM7E=
github.com/canonical/landscape-hostagent-api v0.0.0-20231122074150-cd77c9c81c2d h1:PTSPzsRV4/nnpZv4PhqxBHUezvSm49IHNM0qkWQGn/s=
github.com/canonical/landscape-hostagent-api v0.0.0-20231122074150-cd77c9c81c2d/go.mod h1:3N+AXDrTJvuwy+F9uIDzi2g9xqpeZpxfwobtn84JHEQ=
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240131155254-d69397537350 h1:H9FbBM/pBMyTmVb6QV9anBIMbBLkyCSagE6ggEAMmXQ=
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240131155254-d69397537350/go.mod h1:IaCk16F1RcAoIsgFv0+4h9/1uXZ/PjDrKTk8UKBQiTY=
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240131154921-6a764837eef6 h1:e1MZy4h0RZkdEv6xxxYvXT8O2abIGuhwsqHhXtuNxkE=
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240131154921-6a764837eef6/go.mod h1:3efujuUQL3QIz8JA5gDsGBQBwADlUuK8yoirn6nosgQ=
github.com/canonical/ubuntu-pro-for-wsl/mocks v0.0.0-20240131155254-d69397537350 h1:kOnJNaSImR8CetAchhtjR3XlVuafRlRZjEUE8MriOqg=
github.com/canonical/ubuntu-pro-for-wsl/mocks v0.0.0-20240131155254-d69397537350/go.mod h1:+IxX/xE9tQVisRcSodJb5s16P+Pt50EC5iHy2X7R0UM=
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240306140056-b2552aec01d2 h1:1LdjWxhDaYxBRC/MStDE+rthINYaJbjimYwHWJhPTv4=
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240306140056-b2552aec01d2/go.mod h1:0CIQ8lk4Iwsy5HP84DgMJDkncJIMhVtcBo0yroGKlx8=
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240306140056-b2552aec01d2 h1:lEM7p1vssN3Ah52aETTtbBizAyWsaEuuTWtx1bOlSy0=
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240306140056-b2552aec01d2/go.mod h1:E3fwYB344DobWyl0ZSHSn/Se5ol03wIz8OewjhuobNk=
github.com/canonical/ubuntu-pro-for-wsl/mocks v0.0.0-20240306142331-92bc29c88c71 h1:o3K8AfCpKE5ZFHldDUZ3T5ppo2bLp3Svku6LVFb+Uik=
github.com/canonical/ubuntu-pro-for-wsl/mocks v0.0.0-20240306142331-92bc29c88c71/go.mod h1:yo1yISWIDqj2F5sNyJwNcjESqOAModyi06jOCTk2LD4=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -30,8 +30,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
Expand All @@ -45,12 +45,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/ubuntu/decorate v0.0.0-20230905131025-e968fa48a85c h1:jO41xNLddTDkrfz4w4RCMWCmX8Y+ZHz5jSbJWNLDvqU=
github.com/ubuntu/decorate v0.0.0-20230905131025-e968fa48a85c/go.mod h1:edGgz97NOqS2oqzbKrZqO9YU9neosRrkEZbVJVQynAA=
github.com/ubuntu/gowsl v0.0.0-20231004124730-8fd8df02f394 h1:DS9wb53gTUxFCPYnhAqOhfdRLsHTL9NpzT+F/D8NwIg=
github.com/ubuntu/gowsl v0.0.0-20231004124730-8fd8df02f394/go.mod h1:gu6CgOaqMFFz1h96UocQwXvRvF6CePIqQnI58DzIg2Q=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
github.com/ubuntu/gowsl v0.0.0-20240213160838-c27a23d27d12 h1:LrBQDPvsK4Pqluy05iw8w51F6XWndIfyssL4g/fLAzo=
github.com/ubuntu/gowsl v0.0.0-20240213160838-c27a23d27d12/go.mod h1:7hcEt67BNrsJHVZtWBCU0tJG0JQEvoMSi+TN1hFZHHg=
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
Expand Down
2 changes: 0 additions & 2 deletions end-to-end/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ func buildProject(ctx context.Context) (string, error) {

results := make(chan error)
for jobName, cmd := range jobs {
jobName := jobName
cmd := cmd
go func() {
log.Printf("Started job: %s\n", jobName)

Expand Down
1 change: 0 additions & 1 deletion end-to-end/manual_token_input_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func TestManualTokenInput(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
ctx := context.Background()

Expand Down
1 change: 0 additions & 1 deletion end-to-end/organization_token_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func TestOrganizationProvidedToken(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down
1 change: 0 additions & 1 deletion end-to-end/purchase_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ func TestPurchase(t *testing.T) {
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
ctx := context.Background()

Expand Down
4 changes: 3 additions & 1 deletion go.work
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
go 1.21.5
go 1.22.0

toolchain go1.22.1

use (
./agentapi
Expand Down
19 changes: 10 additions & 9 deletions mocks/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
module github.com/canonical/ubuntu-pro-for-wsl/mocks

go 1.21.0
go 1.22.0

toolchain go1.21.5
toolchain go1.22.1

require (
github.com/canonical/landscape-hostagent-api v0.0.0-20231122074150-cd77c9c81c2d
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240131154921-6a764837eef6
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240131154921-6a764837eef6
github.com/canonical/ubuntu-pro-for-wsl/common v0.0.0-20240306140056-b2552aec01d2
github.com/canonical/ubuntu-pro-for-wsl/contractsapi v0.0.0-20240306140056-b2552aec01d2
github.com/spf13/cobra v1.8.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
google.golang.org/grpc v1.61.0
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
google.golang.org/grpc v1.62.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/protobuf v1.32.0 // indirect
)
Loading

0 comments on commit 504f5b1

Please sign in to comment.