Skip to content

Commit 74a0169

Browse files
AkihiroSudaAkihiroSuda
committed
go.mod: update dependencies (take 2)
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 4823db4 commit 74a0169

469 files changed

Lines changed: 63342 additions & 32603 deletions

File tree

Some content is hidden

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

‎cmd/continuity/go.mod‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ module github.com/containerd/continuity/cmd/continuity
33
go 1.17
44

55
require (
6-
// 5883e5a4b512fe2e32f915b1c66a1ddfef81cb3f is the last version to support macOS
7-
// see https://github.com/bazil/fuse/commit/60eaf8f021ce00e5c52529cdcba1067e13c1c2c2
8-
bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512
6+
bazil.org/fuse v0.0.0-20200524192727-fb710f7dfd05
97
github.com/containerd/continuity v0.0.0-00010101000000-000000000000 // see replace
108
github.com/dustin/go-humanize v1.0.0
11-
github.com/golang/protobuf v1.3.5
9+
github.com/golang/protobuf v1.5.2
1210
github.com/opencontainers/go-digest v1.0.0
1311
github.com/sirupsen/logrus v1.8.1
14-
github.com/spf13/cobra v1.0.0
12+
github.com/spf13/cobra v1.4.0
1513
)
1614

1715
require (
1816
github.com/inconshreveable/mousetrap v1.0.0 // indirect
19-
github.com/spf13/pflag v1.0.3 // indirect
20-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
17+
github.com/spf13/pflag v1.0.5 // indirect
18+
golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 // indirect
19+
google.golang.org/protobuf v1.26.0 // indirect
2120
)
2221

2322
// use local source for the main module

‎cmd/continuity/go.sum‎

Lines changed: 45 additions & 127 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ module github.com/containerd/continuity
33
go 1.17
44

55
require (
6-
github.com/Microsoft/go-winio v0.5.1
7-
github.com/golang/protobuf v1.3.5
6+
github.com/Microsoft/go-winio v0.5.2
87
github.com/opencontainers/go-digest v1.0.0
98
github.com/sirupsen/logrus v1.8.1
10-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
11-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
9+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
10+
golang.org/x/sys v0.0.0-20220405210540-1e041c57c461
11+
google.golang.org/protobuf v1.26.0
1212
)
13+
14+
require github.com/stretchr/testify v1.3.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
2-
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
1+
github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
2+
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
3+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
34
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
45
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
6-
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
6+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
7+
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
8+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
79
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
810
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
9-
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
1011
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1112
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1213
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
1314
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
1415
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
15-
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
16+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1617
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
17-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
18-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
18+
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
19+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
20+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
21+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1922
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
20-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
2123
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
24+
golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 h1:kHVeDEnfKn3T238CvrUcz6KeEsFHVaKh4kMTt6Wsysg=
25+
golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
26+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
27+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
28+
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
29+
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
30+
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

‎manifest.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import (
2323
"sort"
2424

2525
pb "github.com/containerd/continuity/proto"
26-
"github.com/golang/protobuf/proto"
26+
"google.golang.org/protobuf/encoding/prototext"
27+
"google.golang.org/protobuf/proto"
2728
)
2829

2930
// Manifest provides the contents of a manifest. Users of this struct should
@@ -68,7 +69,12 @@ func MarshalText(w io.Writer, m *Manifest) error {
6869
bm.Resource = append(bm.Resource, toProto(resource))
6970
}
7071

71-
return proto.MarshalText(w, &bm)
72+
b, err := prototext.Marshal(&bm)
73+
if err != nil {
74+
return err
75+
}
76+
_, err = w.Write(b)
77+
return err
7278
}
7379

7480
// BuildManifest creates the manifest for the given context

‎proto/gen.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@
1717
package proto
1818

1919
//go:generate protoc --go_out=. manifest.proto
20+
//go:generate mv github.com/containerd/continuity/proto/manifest.pb.go .
21+
//go:generate rmdir -p github.com/containerd/continuity/proto

0 commit comments

Comments
 (0)