metropolis/test/util: move in NewEphemeralClusterCredentials from rpc
Change-Id: I41603b19a76ea91c2191b0118183957973fc9ccd
Reviewed-on: https://review.monogon.dev/c/monogon/+/1960
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/node/core/curator/BUILD.bazel b/metropolis/node/core/curator/BUILD.bazel
index ff7599f..5857772 100644
--- a/metropolis/node/core/curator/BUILD.bazel
+++ b/metropolis/node/core/curator/BUILD.bazel
@@ -77,6 +77,7 @@
"//metropolis/pkg/supervisor",
"//metropolis/proto/api",
"//metropolis/proto/common",
+ "//metropolis/test/util",
"@com_github_google_go_cmp//cmp",
"@io_etcd_go_etcd_client_v3//:client",
"@io_etcd_go_etcd_tests_v3//integration",
diff --git a/metropolis/node/core/curator/curator_test.go b/metropolis/node/core/curator/curator_test.go
index c4ae80a..6cd3f84 100644
--- a/metropolis/node/core/curator/curator_test.go
+++ b/metropolis/node/core/curator/curator_test.go
@@ -14,10 +14,10 @@
"source.monogon.dev/metropolis/node/core/consensus"
"source.monogon.dev/metropolis/node/core/identity"
- "source.monogon.dev/metropolis/node/core/rpc"
"source.monogon.dev/metropolis/pkg/event"
"source.monogon.dev/metropolis/pkg/logtree"
"source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/metropolis/test/util"
)
var (
@@ -216,7 +216,7 @@
}
// Start a new supervisor in which we create all curator DUTs.
- ephemeral := rpc.NewEphemeralClusterCredentials(t, 3)
+ ephemeral := util.NewEphemeralClusterCredentials(t, 3)
dutC := make(chan *dut)
supervisor.TestHarness(t, func(ctx context.Context) error {
for e, n := range endpointToNum {
diff --git a/metropolis/node/core/metrics/BUILD.bazel b/metropolis/node/core/metrics/BUILD.bazel
index da69068..3317719 100644
--- a/metropolis/node/core/metrics/BUILD.bazel
+++ b/metropolis/node/core/metrics/BUILD.bazel
@@ -27,7 +27,6 @@
deps = [
"//metropolis/cli/pkg/datafile",
"//metropolis/node",
- "//metropolis/node/core/rpc",
"//metropolis/pkg/supervisor",
"//metropolis/test/util",
],
diff --git a/metropolis/node/core/metrics/metrics_test.go b/metropolis/node/core/metrics/metrics_test.go
index 5452a90..03fabca 100644
--- a/metropolis/node/core/metrics/metrics_test.go
+++ b/metropolis/node/core/metrics/metrics_test.go
@@ -14,7 +14,6 @@
"source.monogon.dev/metropolis/cli/pkg/datafile"
"source.monogon.dev/metropolis/node"
- "source.monogon.dev/metropolis/node/core/rpc"
"source.monogon.dev/metropolis/pkg/supervisor"
"source.monogon.dev/metropolis/test/util"
)
@@ -46,7 +45,7 @@
},
}
- eph := rpc.NewEphemeralClusterCredentials(t, 1)
+ eph := util.NewEphemeralClusterCredentials(t, 1)
svc := Service{
Credentials: eph.Nodes[0],
diff --git a/metropolis/node/core/roleserve/BUILD.bazel b/metropolis/node/core/roleserve/BUILD.bazel
index f6d8b86..abdf8b3 100644
--- a/metropolis/node/core/roleserve/BUILD.bazel
+++ b/metropolis/node/core/roleserve/BUILD.bazel
@@ -57,9 +57,9 @@
"//metropolis/node/core/consensus",
"//metropolis/node/core/curator",
"//metropolis/node/core/curator/proto/api",
- "//metropolis/node/core/rpc",
"//metropolis/pkg/supervisor",
"//metropolis/proto/common",
+ "//metropolis/test/util",
"@com_github_cenkalti_backoff_v4//:backoff",
"@com_github_google_go_cmp//cmp",
"@org_golang_google_grpc//:go_default_library",
diff --git a/metropolis/node/core/roleserve/worker_statuspush_test.go b/metropolis/node/core/roleserve/worker_statuspush_test.go
index d8a0a8c..a237360 100644
--- a/metropolis/node/core/roleserve/worker_statuspush_test.go
+++ b/metropolis/node/core/roleserve/worker_statuspush_test.go
@@ -18,8 +18,8 @@
common "source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/consensus"
"source.monogon.dev/metropolis/node/core/curator"
- "source.monogon.dev/metropolis/node/core/rpc"
"source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/metropolis/test/util"
ipb "source.monogon.dev/metropolis/node/core/curator/proto/api"
cpb "source.monogon.dev/metropolis/proto/common"
@@ -98,7 +98,7 @@
}
defer cl.Close()
- eph := rpc.NewEphemeralClusterCredentials(t, 1)
+ eph := util.NewEphemeralClusterCredentials(t, 1)
nodeID := eph.Nodes[0].ID()
// Actual test code starts here.
diff --git a/metropolis/node/core/rpc/BUILD.bazel b/metropolis/node/core/rpc/BUILD.bazel
index c530a65..e1017d7 100644
--- a/metropolis/node/core/rpc/BUILD.bazel
+++ b/metropolis/node/core/rpc/BUILD.bazel
@@ -8,7 +8,6 @@
"peerinfo.go",
"server.go",
"server_authentication.go",
- "testhelpers.go",
"trace.go",
],
importpath = "source.monogon.dev/metropolis/node/core/rpc",
@@ -43,6 +42,7 @@
"//metropolis/pkg/logtree",
"//metropolis/proto/api",
"//metropolis/proto/ext",
+ "//metropolis/test/util",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
diff --git a/metropolis/node/core/rpc/resolver/BUILD.bazel b/metropolis/node/core/rpc/resolver/BUILD.bazel
index 6db036f..3a2e6cd 100644
--- a/metropolis/node/core/rpc/resolver/BUILD.bazel
+++ b/metropolis/node/core/rpc/resolver/BUILD.bazel
@@ -29,6 +29,7 @@
"//metropolis/node/core/rpc",
"//metropolis/proto/api",
"//metropolis/proto/common",
+ "//metropolis/test/util",
"@com_github_cenkalti_backoff_v4//:backoff",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//credentials",
diff --git a/metropolis/node/core/rpc/resolver/resolver_test.go b/metropolis/node/core/rpc/resolver/resolver_test.go
index 0de45e1..3d46448 100644
--- a/metropolis/node/core/rpc/resolver/resolver_test.go
+++ b/metropolis/node/core/rpc/resolver/resolver_test.go
@@ -19,6 +19,7 @@
"source.monogon.dev/metropolis/node/core/rpc"
apb "source.monogon.dev/metropolis/proto/api"
cpb "source.monogon.dev/metropolis/proto/common"
+ "source.monogon.dev/metropolis/test/util"
)
// fakeCuratorClusterAware is a fake curator implementation that has a vague
@@ -104,7 +105,7 @@
// Make three nodes for testing, each with its own bufconn listener.
numCurators := 3
- eph := rpc.NewEphemeralClusterCredentials(t, numCurators)
+ eph := util.NewEphemeralClusterCredentials(t, numCurators)
listeners := make([]net.Listener, numCurators)
for i := 0; i < numCurators; i++ {
diff --git a/metropolis/node/core/rpc/server_authentication_test.go b/metropolis/node/core/rpc/server_authentication_test.go
index 09565ad..326b59e 100644
--- a/metropolis/node/core/rpc/server_authentication_test.go
+++ b/metropolis/node/core/rpc/server_authentication_test.go
@@ -15,6 +15,7 @@
cpb "source.monogon.dev/metropolis/node/core/curator/proto/api"
apb "source.monogon.dev/metropolis/proto/api"
epb "source.monogon.dev/metropolis/proto/ext"
+ "source.monogon.dev/metropolis/test/util"
)
// testImplementations implements a subset of test cluster services by returning
@@ -32,7 +33,7 @@
ctx, ctxC := context.WithCancel(context.Background())
defer ctxC()
- eph := NewEphemeralClusterCredentials(t, 1)
+ eph := util.NewEphemeralClusterCredentials(t, 1)
permissions := make(Permissions)
for k, v := range nodePermissions {
permissions[k] = v
diff --git a/metropolis/test/util/BUILD.bazel b/metropolis/test/util/BUILD.bazel
index 16ed382..d431dbe 100644
--- a/metropolis/test/util/BUILD.bazel
+++ b/metropolis/test/util/BUILD.bazel
@@ -2,8 +2,15 @@
go_library(
name = "util",
- srcs = ["runners.go"],
+ srcs = [
+ "rpc.go",
+ "runners.go",
+ ],
importpath = "source.monogon.dev/metropolis/test/util",
visibility = ["//metropolis:__subpackages__"],
- deps = ["//metropolis/test/launch"],
+ deps = [
+ "//metropolis/node/core/identity",
+ "//metropolis/pkg/pki",
+ "//metropolis/test/launch",
+ ],
)
diff --git a/metropolis/node/core/rpc/testhelpers.go b/metropolis/test/util/rpc.go
similarity index 98%
rename from metropolis/node/core/rpc/testhelpers.go
rename to metropolis/test/util/rpc.go
index 93e4b46..e4caece 100644
--- a/metropolis/node/core/rpc/testhelpers.go
+++ b/metropolis/test/util/rpc.go
@@ -1,4 +1,4 @@
-package rpc
+package util
import (
"context"