Skip to content

Commit b4607d1

Browse files
authored
chore: flintlock dependency updates (#352)
Various updates to flintlock dependencies and any code changes that are required as a result. Signed-off-by: Richard Case <richard@weave.works>
1 parent 6a2445a commit b4607d1

File tree

11 files changed

+19766
-5068
lines changed

11 files changed

+19766
-5068
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARCH := $(shell go env GOARCH)
88
UNAME := $(shell uname -s)
99

1010
# Versions
11-
BUF_VERSION := v0.43.2
11+
BUF_VERSION := v1.0.0-rc10
1212

1313
# Directories
1414
REPO_ROOT := $(shell git rev-parse --show-toplevel)
@@ -77,6 +77,7 @@ generate-go: $(MOCKGEN) ## Generate Go Code
7777

7878
.PHONY: generate-proto ## Generate protobuf/grpc code
7979
generate-proto: $(BUF) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_GRPC) $(PROTO_GEN_GRPC_GW) $(PROTO_GEN_GRPC_OAPI) $(PROTOC_GEN_DOC)
80+
$(BUF) mod update
8081
$(BUF) generate
8182

8283
.PHONY: generate-di ## Generate the dependency injection code

api/services/microvm/v1alpha1/microvms.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/types/microvm.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buf.lock

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# Generated by buf. DO NOT EDIT.
2+
version: v1
23
deps:
34
- remote: buf.build
4-
owner: beta
5+
owner: googleapis
56
repository: googleapis
67
branch: main
7-
commit: 1c473ad9220a49bca9320f4cc690eba5
8-
digest: b1-unlhrcI3tnJd0JEGuOb692LZ_tY_gCGq6mK1bgCn1Pg=
9-
create_time: 2021-06-23T20:16:47.788079Z
8+
commit: 0039142542b74d11b0ae5a1e9fd4d523
9+
digest: b1-AzPoqjtlLpx5dVojvgRauI1re5i4LPsghzU0KO-16o4=
10+
create_time: 2022-01-05T15:03:17.46488Z
1011
- remote: buf.build
1112
owner: grpc-ecosystem
1213
repository: grpc-gateway
1314
branch: main
14-
commit: 3d91372e5af6451c8af137f3b5594ac6
15-
digest: b1-Iy4ANYcU1Z6T0LEswISKGoxqT-UJNNHWlJS6ZFhno4o=
16-
create_time: 2021-08-01T01:14:29.490277Z
15+
commit: ff83506eb9cc4cf8972f49ce87e6ed3e
16+
digest: b1-iLPHgLaoeWWinMiXXqPnxqE4BThtY3eSbswVGh9GOGI=
17+
create_time: 2021-10-23T16:26:52.283938Z

buf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: v1beta1
22
name: buf.build/weaveworks/flintlock
33
deps:
4-
- buf.build/beta/googleapis
4+
- buf.build/googleapis/googleapis
55
- buf.build/grpc-ecosystem/grpc-gateway
66
build:
77
roots:

go.mod

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ replace (
99

1010
require (
1111
github.com/Microsoft/go-winio v0.5.0 // indirect
12-
// github.com/weaveworks/flintlock/api TO_ADD
13-
github.com/containerd/containerd v1.5.8
12+
github.com/containerd/containerd v1.5.9
1413
github.com/containerd/typeurl v1.0.2
1514
github.com/firecracker-microvm/firecracker-go-sdk v0.22.0
1615
github.com/go-openapi/strfmt v0.21.1 // indirect
17-
github.com/go-playground/validator/v10 v10.9.0
16+
github.com/go-playground/validator/v10 v10.10.0
1817
github.com/golang/mock v1.6.0
1918
github.com/google/go-cmp v0.5.6
2019
github.com/google/uuid v1.3.0 // indirect
2120
github.com/google/wire v0.5.0
2221
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
23-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.1
22+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.2
2423
github.com/klauspost/compress v1.13.6 // indirect
2524
github.com/oklog/ulid v1.3.1
2625
github.com/onsi/ginkgo v1.16.5
@@ -30,13 +29,13 @@ require (
3029
github.com/pelletier/go-toml v1.9.4
3130
github.com/prometheus/client_golang v1.11.0
3231
github.com/sirupsen/logrus v1.8.1
33-
github.com/spf13/afero v1.6.0
32+
github.com/spf13/afero v1.8.0
3433
github.com/spf13/cobra v1.3.0
3534
github.com/spf13/pflag v1.0.5
36-
github.com/spf13/viper v1.10.0
35+
github.com/spf13/viper v1.10.1
3736
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
3837
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
39-
google.golang.org/grpc v1.42.0
38+
google.golang.org/grpc v1.43.0
4039
google.golang.org/protobuf v1.27.1
4140
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
4241
)
@@ -54,13 +53,20 @@ require (
5453
github.com/beorn7/perks v1.0.1 // indirect
5554
github.com/bits-and-blooms/bitset v1.2.0 // indirect
5655
github.com/cespare/xxhash/v2 v2.1.2 // indirect
56+
github.com/checkpoint-restore/go-criu/v5 v5.0.0 // indirect
57+
github.com/cilium/ebpf v0.6.2 // indirect
5758
github.com/containerd/cgroups v1.0.1 // indirect
59+
github.com/containerd/console v1.0.2 // indirect
5860
github.com/containerd/continuity v0.1.0 // indirect
5961
github.com/containerd/fifo v1.0.0 // indirect
6062
github.com/containerd/ttrpc v1.1.0 // indirect
6163
github.com/containernetworking/cni v0.8.1 // indirect
6264
github.com/containernetworking/plugins v0.9.1 // indirect
65+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
66+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
67+
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
6368
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
69+
github.com/docker/go-units v0.4.0 // indirect
6470
github.com/fsnotify/fsnotify v1.5.1 // indirect
6571
github.com/go-openapi/analysis v0.19.10 // indirect
6672
github.com/go-openapi/errors v0.19.8 // indirect
@@ -74,6 +80,7 @@ require (
7480
github.com/go-playground/locales v0.14.0 // indirect
7581
github.com/go-playground/universal-translator v0.18.0 // indirect
7682
github.com/go-stack/stack v1.8.0 // indirect
83+
github.com/godbus/dbus/v5 v5.0.4 // indirect
7784
github.com/gofrs/uuid v3.3.0+incompatible // indirect
7885
github.com/gogo/googleapis v1.4.0 // indirect
7986
github.com/gogo/protobuf v1.3.2 // indirect
@@ -92,25 +99,30 @@ require (
9299
github.com/mitchellh/mapstructure v1.4.3 // indirect
93100
github.com/moby/locker v1.0.1 // indirect
94101
github.com/moby/sys/mountinfo v0.4.1 // indirect
102+
github.com/mrunalp/fileutils v0.5.0 // indirect
95103
github.com/nxadm/tail v1.4.8 // indirect
96-
github.com/opencontainers/runc v1.0.2 // indirect
104+
github.com/opencontainers/runc v1.0.3 // indirect
97105
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
98106
github.com/opencontainers/selinux v1.8.2 // indirect
99107
github.com/pkg/errors v0.9.1 // indirect
100108
github.com/pmezard/go-difflib v1.0.0 // indirect
101109
github.com/prometheus/client_model v0.2.0 // indirect
102110
github.com/prometheus/common v0.26.0 // indirect
103111
github.com/prometheus/procfs v0.6.0 // indirect
112+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
113+
github.com/seccomp/libseccomp-golang v0.9.1 // indirect
104114
github.com/spf13/cast v1.4.1 // indirect
105115
github.com/spf13/jwalterweatherman v1.1.0 // indirect
106116
github.com/subosito/gotenv v1.2.0 // indirect
117+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
118+
github.com/urfave/cli v1.22.2 // indirect
107119
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
108120
go.mongodb.org/mongo-driver v1.7.5 // indirect
109121
go.opencensus.io v0.23.0 // indirect
110-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
122+
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
111123
golang.org/x/mod v0.5.0 // indirect
112124
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
113-
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
125+
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
114126
golang.org/x/text v0.3.7 // indirect
115127
golang.org/x/tools v0.1.5 // indirect
116128
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect

0 commit comments

Comments
 (0)