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/BUILD.bazel b/metropolis/node/core/BUILD.bazel
index 651e9df..6d2c9c3 100644
--- a/metropolis/node/core/BUILD.bazel
+++ b/metropolis/node/core/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "core_lib",
# keep
srcs = [
"main.go",
@@ -19,30 +19,30 @@
importpath = "source.monogon.dev/metropolis/node/core",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node:go_default_library",
- "//metropolis/node/core/cluster:go_default_library",
- "//metropolis/node/core/localstorage:go_default_library",
- "//metropolis/node/core/localstorage/declarative:go_default_library",
- "//metropolis/node/core/network:go_default_library",
- "//metropolis/node/core/network/hostsfile:go_default_library",
- "//metropolis/node/core/roleserve:go_default_library",
- "//metropolis/node/core/time:go_default_library",
- "//metropolis/pkg/logtree:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "//metropolis/pkg/tpm:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "@com_github_containerd_containerd//:go_default_library",
- "@com_github_containerd_containerd//namespaces:go_default_library",
+ "//metropolis/node",
+ "//metropolis/node/core/cluster",
+ "//metropolis/node/core/localstorage",
+ "//metropolis/node/core/localstorage/declarative",
+ "//metropolis/node/core/network",
+ "//metropolis/node/core/network/hostsfile",
+ "//metropolis/node/core/roleserve",
+ "//metropolis/node/core/time",
+ "//metropolis/pkg/logtree",
+ "//metropolis/pkg/supervisor",
+ "//metropolis/pkg/tpm",
+ "//metropolis/proto/api",
+ "@com_github_containerd_containerd//:containerd",
+ "@com_github_containerd_containerd//namespaces",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
+ "@org_golang_x_sys//unix",
],
)
go_binary(
name = "core",
- embed = [":go_default_library"],
+ embed = [":core_lib"],
pure = "on", # keep
visibility = ["//metropolis/node:__pkg__"],
)
diff --git a/metropolis/node/core/cluster/BUILD.bazel b/metropolis/node/core/cluster/BUILD.bazel
index 93cc5de..78078bb 100644
--- a/metropolis/node/core/cluster/BUILD.bazel
+++ b/metropolis/node/core/cluster/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "cluster",
srcs = [
"cluster.go",
"cluster_bootstrap.go",
@@ -11,20 +11,20 @@
importpath = "source.monogon.dev/metropolis/node/core/cluster",
visibility = ["//metropolis/node/core:__subpackages__"],
deps = [
- "//metropolis/node:go_default_library",
- "//metropolis/node/core/consensus:go_default_library",
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/node/core/identity:go_default_library",
- "//metropolis/node/core/localstorage:go_default_library",
- "//metropolis/node/core/network:go_default_library",
- "//metropolis/node/core/roleserve:go_default_library",
- "//metropolis/node/core/rpc:go_default_library",
- "//metropolis/pkg/event/memory:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "//metropolis/proto/private:go_default_library",
- "@com_github_cenkalti_backoff_v4//:go_default_library",
+ "//metropolis/node",
+ "//metropolis/node/core/consensus",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/node/core/identity",
+ "//metropolis/node/core/localstorage",
+ "//metropolis/node/core/network",
+ "//metropolis/node/core/roleserve",
+ "//metropolis/node/core/rpc",
+ "//metropolis/pkg/event/memory",
+ "//metropolis/pkg/supervisor",
+ "//metropolis/proto/api",
+ "//metropolis/proto/private",
+ "@com_github_cenkalti_backoff_v4//:backoff",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
+ "@org_golang_google_protobuf//proto",
],
)
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"
)
diff --git a/metropolis/node/core/curator/BUILD.bazel b/metropolis/node/core/curator/BUILD.bazel
index 90ae216..c13282e 100644
--- a/metropolis/node/core/curator/BUILD.bazel
+++ b/metropolis/node/core/curator/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 = "curator",
srcs = [
"bootstrap.go",
"curator.go",
@@ -19,57 +19,58 @@
importpath = "source.monogon.dev/metropolis/node/core/curator",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node:go_default_library",
- "//metropolis/node/core/consensus:go_default_library",
- "//metropolis/node/core/consensus/client:go_default_library",
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/node/core/curator/proto/private:go_default_library",
- "//metropolis/node/core/identity:go_default_library",
- "//metropolis/node/core/rpc:go_default_library",
- "//metropolis/pkg/combinectx:go_default_library",
- "//metropolis/pkg/event:go_default_library",
- "//metropolis/pkg/event/etcd:go_default_library",
- "//metropolis/pkg/event/memory:go_default_library",
- "//metropolis/pkg/pki:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "//metropolis/proto/common:go_default_library",
- "@io_etcd_go_etcd//clientv3:go_default_library",
- "@io_etcd_go_etcd//clientv3/concurrency:go_default_library",
+ "//metropolis/node",
+ "//metropolis/node/core/consensus",
+ "//metropolis/node/core/consensus/client",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/node/core/curator/proto/private",
+ "//metropolis/node/core/identity",
+ "//metropolis/node/core/rpc",
+ "//metropolis/pkg/combinectx",
+ "//metropolis/pkg/event",
+ "//metropolis/pkg/event/etcd",
+ "//metropolis/pkg/event/memory",
+ "//metropolis/pkg/pki",
+ "//metropolis/pkg/supervisor",
+ "//metropolis/proto/api",
+ "//metropolis/proto/common",
+ "@io_etcd_go_etcd_client_v3//:client",
+ "@io_etcd_go_etcd_client_v3//concurrency",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
+ "@org_golang_google_protobuf//proto",
],
)
go_test(
- name = "go_default_test",
+ name = "curator_test",
srcs = [
"curator_test.go",
"impl_leader_test.go",
"listener_test.go",
"state_test.go",
],
- embed = [":go_default_library"],
+ embed = [":curator"],
deps = [
- "//metropolis/node/core/consensus:go_default_library",
- "//metropolis/node/core/consensus/client:go_default_library",
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/node/core/curator/proto/private:go_default_library",
- "//metropolis/node/core/identity:go_default_library",
- "//metropolis/node/core/rpc:go_default_library",
- "//metropolis/pkg/event/memory:go_default_library",
- "//metropolis/pkg/pki:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "//metropolis/proto/common:go_default_library",
- "@io_etcd_go_etcd//clientv3:go_default_library",
- "@io_etcd_go_etcd//integration:go_default_library",
+ "//metropolis/node/core/consensus",
+ "//metropolis/node/core/consensus/client",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/node/core/curator/proto/private",
+ "//metropolis/node/core/identity",
+ "//metropolis/node/core/rpc",
+ "//metropolis/pkg/event/memory",
+ "//metropolis/pkg/pki",
+ "//metropolis/pkg/supervisor",
+ "//metropolis/proto/api",
+ "//metropolis/proto/common",
+ "@io_etcd_go_etcd_client_pkg_v3//testutil",
+ "@io_etcd_go_etcd_client_v3//:client",
+ "@io_etcd_go_etcd_tests_v3//integration",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_google_grpc//test/bufconn:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
+ "@org_golang_google_grpc//test/bufconn",
+ "@org_golang_google_protobuf//proto",
],
)
diff --git a/metropolis/node/core/curator/bootstrap.go b/metropolis/node/core/curator/bootstrap.go
index d05a764..12b24fd 100644
--- a/metropolis/node/core/curator/bootstrap.go
+++ b/metropolis/node/core/curator/bootstrap.go
@@ -5,7 +5,7 @@
"crypto/x509"
"fmt"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/protobuf/proto"
"source.monogon.dev/metropolis/node/core/consensus"
diff --git a/metropolis/node/core/curator/curator.go b/metropolis/node/core/curator/curator.go
index 5d6eedd..d6ec579 100644
--- a/metropolis/node/core/curator/curator.go
+++ b/metropolis/node/core/curator/curator.go
@@ -19,7 +19,7 @@
"fmt"
"time"
- "go.etcd.io/etcd/clientv3/concurrency"
+ "go.etcd.io/etcd/client/v3/concurrency"
"google.golang.org/protobuf/proto"
"source.monogon.dev/metropolis/node/core/consensus"
diff --git a/metropolis/node/core/curator/curator_test.go b/metropolis/node/core/curator/curator_test.go
index cd5889b..3ea66a0 100644
--- a/metropolis/node/core/curator/curator_test.go
+++ b/metropolis/node/core/curator/curator_test.go
@@ -2,13 +2,15 @@
import (
"context"
+ "flag"
"fmt"
"os"
"testing"
"time"
- "go.etcd.io/etcd/clientv3"
- "go.etcd.io/etcd/integration"
+ "go.etcd.io/etcd/client/pkg/v3/testutil"
+ clientv3 "go.etcd.io/etcd/client/v3"
+ "go.etcd.io/etcd/tests/v3/integration"
"source.monogon.dev/metropolis/node/core/consensus"
"source.monogon.dev/metropolis/node/core/identity"
@@ -29,14 +31,21 @@
Size: 3,
GRPCKeepAliveMinTime: time.Millisecond,
}
- cluster = integration.NewClusterV3(nil, &cfg)
+ t, cancel := testutil.NewTestingTBProthesis("curator")
+ defer cancel()
+
+ flag.Parse()
+
+ integration.BeforeTest(t)
+
+ cluster = integration.NewClusterV3(t, &cfg)
endpoints = make([]string, 3)
for i := range endpoints {
endpoints[i] = cluster.Client(i).Endpoints()[0]
}
v := m.Run()
- cluster.Terminate(nil)
+ cluster.Terminate(t)
os.Exit(v)
}
diff --git a/metropolis/node/core/curator/impl_leader.go b/metropolis/node/core/curator/impl_leader.go
index 75ede5d..d6894a2 100644
--- a/metropolis/node/core/curator/impl_leader.go
+++ b/metropolis/node/core/curator/impl_leader.go
@@ -7,7 +7,7 @@
"strings"
"sync"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/metropolis/node/core/curator/impl_leader_test.go b/metropolis/node/core/curator/impl_leader_test.go
index b07b49f..7254fab 100644
--- a/metropolis/node/core/curator/impl_leader_test.go
+++ b/metropolis/node/core/curator/impl_leader_test.go
@@ -11,7 +11,7 @@
"net"
"testing"
- "go.etcd.io/etcd/integration"
+ "go.etcd.io/etcd/tests/v3/integration"
"google.golang.org/grpc"
"google.golang.org/grpc/test/bufconn"
"google.golang.org/protobuf/proto"
@@ -44,13 +44,14 @@
ctx, ctxC := context.WithCancel(context.Background())
// Start a single-node etcd cluster.
- cluster := integration.NewClusterV3(nil, &integration.ClusterConfig{
+ integration.BeforeTest(t)
+ cluster := integration.NewClusterV3(t, &integration.ClusterConfig{
Size: 1,
})
// Terminate the etcd cluster on context cancel.
go func() {
<-ctx.Done()
- cluster.Terminate(nil)
+ cluster.Terminate(t)
}()
// Create etcd client to test cluster.
diff --git a/metropolis/node/core/curator/proto/api/BUILD.bazel b/metropolis/node/core/curator/proto/api/BUILD.bazel
index 2cec346..dbc1cbf 100644
--- a/metropolis/node/core/curator/proto/api/BUILD.bazel
+++ b/metropolis/node/core/curator/proto/api/BUILD.bazel
@@ -19,13 +19,13 @@
proto = ":api_proto",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/proto/common:go_default_library",
- "//metropolis/proto/ext:go_default_library",
+ "//metropolis/proto/common",
+ "//metropolis/proto/ext",
],
)
go_library(
- name = "go_default_library",
+ name = "api",
embed = [":api_go_proto"],
importpath = "source.monogon.dev/metropolis/node/core/curator/proto/api",
visibility = ["//visibility:public"],
diff --git a/metropolis/node/core/curator/proto/private/BUILD.bazel b/metropolis/node/core/curator/proto/private/BUILD.bazel
index e3c032d..a731e06 100644
--- a/metropolis/node/core/curator/proto/private/BUILD.bazel
+++ b/metropolis/node/core/curator/proto/private/BUILD.bazel
@@ -17,11 +17,11 @@
importpath = "source.monogon.dev/metropolis/node/core/curator/proto/private",
proto = ":private_proto",
visibility = ["//visibility:public"],
- deps = ["//metropolis/proto/common:go_default_library"],
+ deps = ["//metropolis/proto/common"],
)
go_library(
- name = "go_default_library",
+ name = "private",
embed = [":private_go_proto"],
importpath = "source.monogon.dev/metropolis/node/core/curator/proto/private",
visibility = ["//visibility:public"],
diff --git a/metropolis/node/core/curator/state.go b/metropolis/node/core/curator/state.go
index 0db9af5..c1969d4 100644
--- a/metropolis/node/core/curator/state.go
+++ b/metropolis/node/core/curator/state.go
@@ -4,7 +4,7 @@
"fmt"
"strings"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
)
// etcdPrefix is the location of some data in etcd, with each data element keyed
diff --git a/metropolis/node/core/curator/state_node.go b/metropolis/node/core/curator/state_node.go
index f20f981..ce87723 100644
--- a/metropolis/node/core/curator/state_node.go
+++ b/metropolis/node/core/curator/state_node.go
@@ -21,7 +21,7 @@
"crypto/x509"
"fmt"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
diff --git a/metropolis/node/core/curator/state_registerticket.go b/metropolis/node/core/curator/state_registerticket.go
index 4b674aa..8b8ea15 100644
--- a/metropolis/node/core/curator/state_registerticket.go
+++ b/metropolis/node/core/curator/state_registerticket.go
@@ -4,7 +4,7 @@
"context"
"crypto/rand"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
diff --git a/metropolis/node/core/identity/BUILD.bazel b/metropolis/node/core/identity/BUILD.bazel
index c5b481a..92e8943 100644
--- a/metropolis/node/core/identity/BUILD.bazel
+++ b/metropolis/node/core/identity/BUILD.bazel
@@ -1,18 +1,18 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "identity",
srcs = [
"certificates.go",
"identity.go",
],
importpath = "source.monogon.dev/metropolis/node/core/identity",
visibility = ["//visibility:public"],
- deps = ["//metropolis/node/core/localstorage:go_default_library"],
+ deps = ["//metropolis/node/core/localstorage"],
)
go_test(
- name = "go_default_test",
+ name = "identity_test",
srcs = ["certificates_test.go"],
- embed = [":go_default_library"],
+ embed = [":identity"],
)
diff --git a/metropolis/node/core/localstorage/BUILD.bazel b/metropolis/node/core/localstorage/BUILD.bazel
index 13cd8a9..b360e2c 100644
--- a/metropolis/node/core/localstorage/BUILD.bazel
+++ b/metropolis/node/core/localstorage/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 = "localstorage",
srcs = [
"directory_data.go",
"directory_pki.go",
@@ -12,19 +12,19 @@
importpath = "source.monogon.dev/metropolis/node/core/localstorage",
visibility = ["//metropolis/node:__subpackages__"],
deps = [
- "//metropolis/node/core/localstorage/crypt:go_default_library",
- "//metropolis/node/core/localstorage/declarative:go_default_library",
- "//metropolis/pkg/tpm:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "//metropolis/proto/private:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "//metropolis/node/core/localstorage/crypt",
+ "//metropolis/node/core/localstorage/declarative",
+ "//metropolis/pkg/tpm",
+ "//metropolis/proto/api",
+ "//metropolis/proto/private",
+ "@org_golang_google_protobuf//proto",
+ "@org_golang_x_sys//unix",
],
)
go_test(
- name = "go_default_test",
+ name = "localstorage_test",
srcs = ["storage_test.go"],
- embed = [":go_default_library"],
- deps = ["//metropolis/node/core/localstorage/declarative:go_default_library"],
+ embed = [":localstorage"],
+ deps = ["//metropolis/node/core/localstorage/declarative"],
)
diff --git a/metropolis/node/core/localstorage/crypt/BUILD.bazel b/metropolis/node/core/localstorage/crypt/BUILD.bazel
index 39afbb8..36e17bb 100644
--- a/metropolis/node/core/localstorage/crypt/BUILD.bazel
+++ b/metropolis/node/core/localstorage/crypt/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "crypt",
# keep
srcs = [
"blockdev.go",
@@ -12,9 +12,9 @@
importpath = "source.monogon.dev/metropolis/node/core/localstorage/crypt",
visibility = ["//metropolis/node/core/localstorage:__subpackages__"],
deps = [
- "//metropolis/pkg/devicemapper:go_default_library",
- "//metropolis/pkg/sysfs:go_default_library",
- "@com_github_rekby_gpt//:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "//metropolis/pkg/devicemapper",
+ "//metropolis/pkg/sysfs",
+ "@com_github_rekby_gpt//:gpt",
+ "@org_golang_x_sys//unix",
],
)
diff --git a/metropolis/node/core/localstorage/declarative/BUILD.bazel b/metropolis/node/core/localstorage/declarative/BUILD.bazel
index de35579..53d1608 100644
--- a/metropolis/node/core/localstorage/declarative/BUILD.bazel
+++ b/metropolis/node/core/localstorage/declarative/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "declarative",
srcs = [
"declarative.go",
"placement.go",
@@ -9,5 +9,5 @@
],
importpath = "source.monogon.dev/metropolis/node/core/localstorage/declarative",
visibility = ["//metropolis/node:__subpackages__"],
- deps = ["@org_golang_x_sys//unix:go_default_library"],
+ deps = ["@org_golang_x_sys//unix"],
)
diff --git a/metropolis/node/core/network/BUILD.bazel b/metropolis/node/core/network/BUILD.bazel
index 489f1d4..86ffda8 100644
--- a/metropolis/node/core/network/BUILD.bazel
+++ b/metropolis/node/core/network/BUILD.bazel
@@ -1,20 +1,20 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "network",
srcs = ["main.go"],
importpath = "source.monogon.dev/metropolis/node/core/network",
visibility = ["//:__subpackages__"],
deps = [
- "//metropolis/node/core/network/dhcp4c:go_default_library",
- "//metropolis/node/core/network/dhcp4c/callback:go_default_library",
- "//metropolis/node/core/network/dns:go_default_library",
- "//metropolis/pkg/event:go_default_library",
- "//metropolis/pkg/event/memory:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "@com_github_google_nftables//:go_default_library",
- "@com_github_google_nftables//expr:go_default_library",
- "@com_github_insomniacslk_dhcp//dhcpv4:go_default_library",
- "@com_github_vishvananda_netlink//:go_default_library",
+ "//metropolis/node/core/network/dhcp4c",
+ "//metropolis/node/core/network/dhcp4c/callback",
+ "//metropolis/node/core/network/dns",
+ "//metropolis/pkg/event",
+ "//metropolis/pkg/event/memory",
+ "//metropolis/pkg/supervisor",
+ "@com_github_google_nftables//:nftables",
+ "@com_github_google_nftables//expr",
+ "@com_github_insomniacslk_dhcp//dhcpv4",
+ "@com_github_vishvananda_netlink//:netlink",
],
)
diff --git a/metropolis/node/core/network/dhcp4c/BUILD.bazel b/metropolis/node/core/network/dhcp4c/BUILD.bazel
index 72e16f6..d514f2d 100644
--- a/metropolis/node/core/network/dhcp4c/BUILD.bazel
+++ b/metropolis/node/core/network/dhcp4c/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 = "dhcp4c",
srcs = [
"dhcpc.go",
"doc.go",
@@ -14,26 +14,26 @@
"//metropolis/test/nanoswitch:__subpackages__",
],
deps = [
- "//metropolis/node/core/network/dhcp4c/transport:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "@com_github_cenkalti_backoff_v4//:go_default_library",
- "@com_github_insomniacslk_dhcp//dhcpv4:go_default_library",
- "@com_github_insomniacslk_dhcp//iana:go_default_library",
+ "//metropolis/node/core/network/dhcp4c/transport",
+ "//metropolis/pkg/supervisor",
+ "@com_github_cenkalti_backoff_v4//:backoff",
+ "@com_github_insomniacslk_dhcp//dhcpv4",
+ "@com_github_insomniacslk_dhcp//iana",
],
)
go_test(
- name = "go_default_test",
+ name = "dhcp4c_test",
srcs = [
"dhcpc_test.go",
"lease_test.go",
],
- embed = [":go_default_library"],
+ embed = [":dhcp4c"],
pure = "on",
deps = [
- "//metropolis/node/core/network/dhcp4c/transport:go_default_library",
- "@com_github_cenkalti_backoff_v4//:go_default_library",
- "@com_github_insomniacslk_dhcp//dhcpv4:go_default_library",
- "@com_github_stretchr_testify//assert:go_default_library",
+ "//metropolis/node/core/network/dhcp4c/transport",
+ "@com_github_cenkalti_backoff_v4//:backoff",
+ "@com_github_insomniacslk_dhcp//dhcpv4",
+ "@com_github_stretchr_testify//assert",
],
)
diff --git a/metropolis/node/core/network/dhcp4c/callback/BUILD.bazel b/metropolis/node/core/network/dhcp4c/callback/BUILD.bazel
index 622fb48..d841c6e 100644
--- a/metropolis/node/core/network/dhcp4c/callback/BUILD.bazel
+++ b/metropolis/node/core/network/dhcp4c/callback/BUILD.bazel
@@ -2,7 +2,7 @@
load("//metropolis/test/ktest:ktest.bzl", "ktest")
go_library(
- name = "go_default_library",
+ name = "callback",
srcs = ["callback.go"],
importpath = "source.monogon.dev/metropolis/node/core/network/dhcp4c/callback",
visibility = [
@@ -11,27 +11,27 @@
"//metropolis/test/nanoswitch:__subpackages__",
],
deps = [
- "//metropolis/node/core/network/dhcp4c:go_default_library",
- "@com_github_insomniacslk_dhcp//dhcpv4:go_default_library",
- "@com_github_vishvananda_netlink//:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "//metropolis/node/core/network/dhcp4c",
+ "@com_github_insomniacslk_dhcp//dhcpv4",
+ "@com_github_vishvananda_netlink//:netlink",
+ "@org_golang_x_sys//unix",
],
)
go_test(
- name = "go_default_test",
+ name = "callback_test",
srcs = ["callback_test.go"],
- embed = [":go_default_library"],
+ embed = [":callback"],
pure = "on",
deps = [
- "//metropolis/node/core/network/dhcp4c:go_default_library",
- "@com_github_insomniacslk_dhcp//dhcpv4:go_default_library",
- "@com_github_stretchr_testify//require:go_default_library",
- "@com_github_vishvananda_netlink//:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "//metropolis/node/core/network/dhcp4c",
+ "@com_github_insomniacslk_dhcp//dhcpv4",
+ "@com_github_stretchr_testify//require",
+ "@com_github_vishvananda_netlink//:netlink",
+ "@org_golang_x_sys//unix",
],
)
ktest(
- tester = ":go_default_test",
+ tester = ":callback_test",
)
diff --git a/metropolis/node/core/network/dhcp4c/callback/callback_test.go b/metropolis/node/core/network/dhcp4c/callback/callback_test.go
index 7f5b5d3..7b06713 100644
--- a/metropolis/node/core/network/dhcp4c/callback/callback_test.go
+++ b/metropolis/node/core/network/dhcp4c/callback/callback_test.go
@@ -128,6 +128,7 @@
// Associate dynamically-generated interface name for later comparison
for i := range test.expectedAddrs {
test.expectedAddrs[i].Label = testLink.Name
+ test.expectedAddrs[i].LinkIndex = testLink.Index
}
cb := ManageIP(testLink)
if err := cb(test.oldLease, test.newLease); err != nil {
diff --git a/metropolis/node/core/network/dhcp4c/transport/BUILD.bazel b/metropolis/node/core/network/dhcp4c/transport/BUILD.bazel
index f9e3a74..8b8e02b 100644
--- a/metropolis/node/core/network/dhcp4c/transport/BUILD.bazel
+++ b/metropolis/node/core/network/dhcp4c/transport/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "transport",
srcs = [
"transport.go",
"transport_broadcast.go",
@@ -10,11 +10,11 @@
importpath = "source.monogon.dev/metropolis/node/core/network/dhcp4c/transport",
visibility = ["//metropolis/node/core/network/dhcp4c:__subpackages__"],
deps = [
- "@com_github_google_gopacket//:go_default_library",
- "@com_github_google_gopacket//layers:go_default_library",
- "@com_github_insomniacslk_dhcp//dhcpv4:go_default_library",
- "@com_github_mdlayher_raw//:go_default_library",
- "@org_golang_x_net//bpf:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "@com_github_google_gopacket//:gopacket",
+ "@com_github_google_gopacket//layers",
+ "@com_github_insomniacslk_dhcp//dhcpv4",
+ "@com_github_mdlayher_raw//:raw",
+ "@org_golang_x_net//bpf",
+ "@org_golang_x_sys//unix",
],
)
diff --git a/metropolis/node/core/network/dns/BUILD.bazel b/metropolis/node/core/network/dns/BUILD.bazel
index 1ef31f1..7d5419e 100644
--- a/metropolis/node/core/network/dns/BUILD.bazel
+++ b/metropolis/node/core/network/dns/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "dns",
srcs = [
"coredns.go",
"directives.go",
@@ -9,8 +9,8 @@
importpath = "source.monogon.dev/metropolis/node/core/network/dns",
visibility = ["//metropolis/node:__subpackages__"],
deps = [
- "//metropolis/pkg/fileargs:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
+ "//metropolis/pkg/fileargs",
+ "//metropolis/pkg/supervisor",
],
)
diff --git a/metropolis/node/core/network/hostsfile/BUILD.bazel b/metropolis/node/core/network/hostsfile/BUILD.bazel
index 5cfffc9..7c0b117 100644
--- a/metropolis/node/core/network/hostsfile/BUILD.bazel
+++ b/metropolis/node/core/network/hostsfile/BUILD.bazel
@@ -1,17 +1,17 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "hostsfile",
srcs = ["hostsfile.go"],
importpath = "source.monogon.dev/metropolis/node/core/network/hostsfile",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/node/core/localstorage:go_default_library",
- "//metropolis/node/core/network:go_default_library",
- "//metropolis/node/core/roleserve:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/node/core/localstorage",
+ "//metropolis/node/core/network",
+ "//metropolis/node/core/roleserve",
+ "//metropolis/pkg/supervisor",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_x_sys//unix:go_default_library",
+ "@org_golang_x_sys//unix",
],
)
diff --git a/metropolis/node/core/roleserve/BUILD.bazel b/metropolis/node/core/roleserve/BUILD.bazel
index ec1d443..4188202 100644
--- a/metropolis/node/core/roleserve/BUILD.bazel
+++ b/metropolis/node/core/roleserve/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "roleserve",
srcs = [
"roleserve.go",
"value_bootstrapdata.go",
@@ -16,22 +16,22 @@
importpath = "source.monogon.dev/metropolis/node/core/roleserve",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node:go_default_library",
- "//metropolis/node/core/consensus:go_default_library",
- "//metropolis/node/core/curator:go_default_library",
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/node/core/identity:go_default_library",
- "//metropolis/node/core/localstorage:go_default_library",
- "//metropolis/node/core/network:go_default_library",
- "//metropolis/node/core/rpc:go_default_library",
- "//metropolis/node/kubernetes:go_default_library",
- "//metropolis/node/kubernetes/containerd:go_default_library",
- "//metropolis/node/kubernetes/pki:go_default_library",
- "//metropolis/pkg/event:go_default_library",
- "//metropolis/pkg/event/memory:go_default_library",
- "//metropolis/pkg/pki:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
- "//metropolis/proto/common:go_default_library",
+ "//metropolis/node",
+ "//metropolis/node/core/consensus",
+ "//metropolis/node/core/curator",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/node/core/identity",
+ "//metropolis/node/core/localstorage",
+ "//metropolis/node/core/network",
+ "//metropolis/node/core/rpc",
+ "//metropolis/node/kubernetes",
+ "//metropolis/node/kubernetes/containerd",
+ "//metropolis/node/kubernetes/pki",
+ "//metropolis/pkg/event",
+ "//metropolis/pkg/event/memory",
+ "//metropolis/pkg/pki",
+ "//metropolis/pkg/supervisor",
+ "//metropolis/proto/common",
"@org_golang_google_grpc//:go_default_library",
],
)
diff --git a/metropolis/node/core/rpc/BUILD.bazel b/metropolis/node/core/rpc/BUILD.bazel
index 8ec88c0..9b171e3 100644
--- a/metropolis/node/core/rpc/BUILD.bazel
+++ b/metropolis/node/core/rpc/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 = "rpc",
srcs = [
"client.go",
"methodinfo.go",
@@ -14,39 +14,39 @@
importpath = "source.monogon.dev/metropolis/node/core/rpc",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/node/core/identity:go_default_library",
- "//metropolis/pkg/logtree:go_default_library",
- "//metropolis/pkg/pki:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "//metropolis/proto/ext:go_default_library",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/node/core/identity",
+ "//metropolis/pkg/logtree",
+ "//metropolis/pkg/pki",
+ "//metropolis/proto/api",
+ "//metropolis/proto/ext",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//credentials:go_default_library",
- "@org_golang_google_grpc//peer:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_google_protobuf//encoding/prototext:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
- "@org_golang_google_protobuf//reflect/protoregistry:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//credentials",
+ "@org_golang_google_grpc//peer",
+ "@org_golang_google_grpc//status",
+ "@org_golang_google_protobuf//encoding/prototext",
+ "@org_golang_google_protobuf//proto",
+ "@org_golang_google_protobuf//reflect/protoreflect",
+ "@org_golang_google_protobuf//reflect/protoregistry",
],
)
go_test(
- name = "go_default_test",
+ name = "rpc_test",
srcs = [
"server_authentication_test.go",
"trace_test.go",
],
- embed = [":go_default_library"],
+ embed = [":rpc"],
deps = [
- "//metropolis/node/core/curator/proto/api:go_default_library",
- "//metropolis/pkg/logtree:go_default_library",
- "//metropolis/proto/api:go_default_library",
- "//metropolis/proto/ext:go_default_library",
+ "//metropolis/node/core/curator/proto/api",
+ "//metropolis/pkg/logtree",
+ "//metropolis/proto/api",
+ "//metropolis/proto/ext",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_google_grpc//test/bufconn:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
+ "@org_golang_google_grpc//test/bufconn",
],
)
diff --git a/metropolis/node/core/time/BUILD.bazel b/metropolis/node/core/time/BUILD.bazel
index 05a938a..fb9af73 100644
--- a/metropolis/node/core/time/BUILD.bazel
+++ b/metropolis/node/core/time/BUILD.bazel
@@ -1,13 +1,13 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "time",
srcs = ["time.go"],
importpath = "source.monogon.dev/metropolis/node/core/time",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node:go_default_library",
- "//metropolis/pkg/fileargs:go_default_library",
- "//metropolis/pkg/supervisor:go_default_library",
+ "//metropolis/node",
+ "//metropolis/pkg/fileargs",
+ "//metropolis/pkg/supervisor",
],
)