treewide: switch to gomod and bump everything
This switches version resolution from fietsje to gomod and updates
all Go dependencies. It also bumps rules_go (required by gVisor) and
switches the Gazelle naming convention from go_default_xxx to the
standard Bazel convention of the default target having the package
name.
Since Kubernetes dropped upstream Bazel support and doesn't check in
all generated files I manually pregenerated the OpenAPI spec. This
should be fixed, but because of the already-huge scope of this CL
and the rebase complexity this is not in here.
Change-Id: Iec8ea613d06946882426c2f9fad5bda7e8aaf833
Reviewed-on: https://review.monogon.dev/c/monogon/+/639
Reviewed-by: Sergiusz Bazanski <serge@monogon.tech>
Reviewed-by: Leopold Schabel <leo@nexantic.com>
diff --git a/metropolis/node/core/consensus/BUILD.bazel b/metropolis/node/core/consensus/BUILD.bazel
index c4f65ec..693f789 100644
--- a/metropolis/node/core/consensus/BUILD.bazel
+++ b/metropolis/node/core/consensus/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "consensus",
srcs = [
"configuration.go",
"consensus.go",
@@ -12,30 +12,30 @@
importpath = "source.monogon.dev/metropolis/node/core/consensus",
visibility = ["//:__subpackages__"],
deps = [
- "//metropolis/node:go_default_library",
- "//metropolis/node/core/consensus/client:go_default_library",
- "//metropolis/node/core/identity:go_default_library",
- "//metropolis/node/core/localstorage:go_default_library",
- "//metropolis/pkg/event:go_default_library",
- "//metropolis/pkg/event/memory:go_default_library",
- "//metropolis/pkg/logbuffer:go_default_library",
- "//metropolis/pkg/logtree:go_default_library",
- "//metropolis/pkg/logtree/unraw:go_default_library",
- "//metropolis/pkg/pki:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "@io_etcd_go_etcd//clientv3:go_default_library",
- "@io_etcd_go_etcd//embed:go_default_library",
+ "//metropolis/node",
+ "//metropolis/node/core/consensus/client",
+ "//metropolis/node/core/identity",
+ "//metropolis/node/core/localstorage",
+ "//metropolis/pkg/event",
+ "//metropolis/pkg/event/memory",
+ "//metropolis/pkg/logbuffer",
+ "//metropolis/pkg/logtree",
+ "//metropolis/pkg/logtree/unraw",
+ "//metropolis/pkg/pki",
+ "//metropolis/pkg/supervisor",
+ "@io_etcd_go_etcd_client_v3//:client",
+ "@io_etcd_go_etcd_server_v3//embed",
],
)
go_test(
- name = "go_default_test",
+ name = "consensus_test",
size = "small",
srcs = [
"consensus_test.go",
"logparser_test.go",
],
- embed = [":go_default_library"],
+ embed = [":consensus"],
tags = [
# Enable network sandboxing by asking the Bazel executor to block any
# network access. This is necessary as tests listen on static ports on
@@ -43,11 +43,11 @@
"block-network",
],
deps = [
- "//metropolis/node/core/localstorage:go_default_library",
- "//metropolis/node/core/localstorage/declarative:go_default_library",
- "//metropolis/pkg/logbuffer:go_default_library",
- "//metropolis/pkg/logtree:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "@com_github_google_go_cmp//cmp:go_default_library",
+ "//metropolis/node/core/localstorage",
+ "//metropolis/node/core/localstorage/declarative",
+ "//metropolis/pkg/logbuffer",
+ "//metropolis/pkg/logtree",
+ "//metropolis/pkg/supervisor",
+ "@com_github_google_go_cmp//cmp",
],
)
diff --git a/metropolis/node/core/consensus/client/BUILD.bazel b/metropolis/node/core/consensus/client/BUILD.bazel
index a98eaf5..23c6c14 100644
--- a/metropolis/node/core/consensus/client/BUILD.bazel
+++ b/metropolis/node/core/consensus/client/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "client",
srcs = [
"client.go",
"unimplemented.go",
@@ -9,7 +9,7 @@
importpath = "source.monogon.dev/metropolis/node/core/consensus/client",
visibility = ["//visibility:public"],
deps = [
- "@io_etcd_go_etcd//clientv3:go_default_library",
- "@io_etcd_go_etcd//clientv3/namespace:go_default_library",
+ "@io_etcd_go_etcd_client_v3//:client",
+ "@io_etcd_go_etcd_client_v3//namespace",
],
)
diff --git a/metropolis/node/core/consensus/client/client.go b/metropolis/node/core/consensus/client/client.go
index 1304cf1..821919b 100644
--- a/metropolis/node/core/consensus/client/client.go
+++ b/metropolis/node/core/consensus/client/client.go
@@ -25,8 +25,8 @@
"fmt"
"strings"
- "go.etcd.io/etcd/clientv3"
- "go.etcd.io/etcd/clientv3/namespace"
+ clientv3 "go.etcd.io/etcd/client/v3"
+ "go.etcd.io/etcd/client/v3/namespace"
)
// Namespaced etcd/consensus client. Each Namespaced client allows access to a
diff --git a/metropolis/node/core/consensus/client/unimplemented.go b/metropolis/node/core/consensus/client/unimplemented.go
index b0bb695..047e8ee 100644
--- a/metropolis/node/core/consensus/client/unimplemented.go
+++ b/metropolis/node/core/consensus/client/unimplemented.go
@@ -5,7 +5,7 @@
"errors"
"io"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
)
var (
@@ -59,6 +59,10 @@
panic(UnimplementedInNamespaced)
}
+func (c *unimplementedAuth) AuthStatus(ctx context.Context) (*clientv3.AuthStatusResponse, error) {
+ panic(UnimplementedInNamespaced)
+}
+
func (c *unimplementedAuth) UserAdd(ctx context.Context, name string, password string) (*clientv3.AuthUserAddResponse, error) {
panic(UnimplementedInNamespaced)
}
diff --git a/metropolis/node/core/consensus/configuration.go b/metropolis/node/core/consensus/configuration.go
index 1e7cff6..552b81d 100644
--- a/metropolis/node/core/consensus/configuration.go
+++ b/metropolis/node/core/consensus/configuration.go
@@ -9,8 +9,8 @@
"strconv"
"time"
- "go.etcd.io/etcd/clientv3"
- "go.etcd.io/etcd/embed"
+ clientv3 "go.etcd.io/etcd/client/v3"
+ "go.etcd.io/etcd/server/v3/embed"
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/identity"
diff --git a/metropolis/node/core/consensus/consensus.go b/metropolis/node/core/consensus/consensus.go
index d4ab964..1137556 100644
--- a/metropolis/node/core/consensus/consensus.go
+++ b/metropolis/node/core/consensus/consensus.go
@@ -94,8 +94,8 @@
"math/big"
"time"
- "go.etcd.io/etcd/clientv3"
- "go.etcd.io/etcd/embed"
+ clientv3 "go.etcd.io/etcd/client/v3"
+ "go.etcd.io/etcd/server/v3/embed"
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/metropolis/node/core/identity"
diff --git a/metropolis/node/core/consensus/status.go b/metropolis/node/core/consensus/status.go
index 43a70fd..e2b15f8 100644
--- a/metropolis/node/core/consensus/status.go
+++ b/metropolis/node/core/consensus/status.go
@@ -8,7 +8,7 @@
"net"
"strconv"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/consensus/client"
diff --git a/metropolis/node/core/consensus/testhelpers.go b/metropolis/node/core/consensus/testhelpers.go
index 627a278..32bbc46 100644
--- a/metropolis/node/core/consensus/testhelpers.go
+++ b/metropolis/node/core/consensus/testhelpers.go
@@ -4,7 +4,7 @@
"context"
"testing"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"source.monogon.dev/metropolis/pkg/event/memory"
)