metropolis: unify utility packages
One last sweeping rename / reshuffle.
We get rid of //metropolis/node/common and //golibs, unifying them into
a single //metropolis/pkg meta-package.
This is to be documented somwhere properly, but here's the new logic
behind selecting where to place a new library package:
- if it's specific to k8s-on-metropolis, put it in
//metropolis/node/kubernetes/*. This is a self-contained tree that
other paths cannot import from.
- if it's a big new subsystem of the metropolis core, put it in
//metropolis/node/core. This can be imported by anything in
//m/n (eg the Kubernetes code at //m/n/kubernetes
- otherwise, treat it as generic library that's part of the metropolis
project, and put it in //metropolis/pkg. This can be imported by
anything within //metropolis.
This will be followed up by a diff that updates visibility rules.
Test Plan: Pure refactor, CI only.
X-Origin-Diff: phab/D683
GitOrigin-RevId: 883e7f09a7d22d64e966d07bbe839454ed081c79
diff --git a/metropolis/node/core/consensus/BUILD.bazel b/metropolis/node/core/consensus/BUILD.bazel
index cab2c0a..464dc79 100644
--- a/metropolis/node/core/consensus/BUILD.bazel
+++ b/metropolis/node/core/consensus/BUILD.bazel
@@ -7,9 +7,9 @@
visibility = ["//:__subpackages__"],
deps = [
"//metropolis/node:go_default_library",
- "//metropolis/node/common/supervisor:go_default_library",
"//metropolis/node/core/consensus/ca:go_default_library",
"//metropolis/node/core/localstorage:go_default_library",
+ "//metropolis/pkg/supervisor:go_default_library",
"@io_etcd_go_etcd//clientv3:go_default_library",
"@io_etcd_go_etcd//clientv3/namespace:go_default_library",
"@io_etcd_go_etcd//embed:go_default_library",
@@ -22,9 +22,9 @@
srcs = ["consensus_test.go"],
embed = [":go_default_library"],
deps = [
- "//golibs/common:go_default_library",
- "//metropolis/node/common/supervisor:go_default_library",
"//metropolis/node/core/localstorage:go_default_library",
"//metropolis/node/core/localstorage/declarative:go_default_library",
+ "//metropolis/pkg/freeport:go_default_library",
+ "//metropolis/pkg/supervisor:go_default_library",
],
)
diff --git a/metropolis/node/core/consensus/consensus.go b/metropolis/node/core/consensus/consensus.go
index b707a27..241ce03 100644
--- a/metropolis/node/core/consensus/consensus.go
+++ b/metropolis/node/core/consensus/consensus.go
@@ -44,10 +44,10 @@
"go.etcd.io/etcd/embed"
"go.uber.org/atomic"
- common "git.monogon.dev/source/nexantic.git/metropolis/node"
- "git.monogon.dev/source/nexantic.git/metropolis/node/common/supervisor"
+ node "git.monogon.dev/source/nexantic.git/metropolis/node"
"git.monogon.dev/source/nexantic.git/metropolis/node/core/consensus/ca"
"git.monogon.dev/source/nexantic.git/metropolis/node/core/localstorage"
+ "git.monogon.dev/source/nexantic.git/metropolis/pkg/supervisor"
)
const (
@@ -118,7 +118,7 @@
port := s.config.Port
if port == 0 {
- port = common.ConsensusPort
+ port = node.ConsensusPort
}
cfg := embed.NewConfig()
diff --git a/metropolis/node/core/consensus/consensus_test.go b/metropolis/node/core/consensus/consensus_test.go
index 22bcf20..a25ebef 100644
--- a/metropolis/node/core/consensus/consensus_test.go
+++ b/metropolis/node/core/consensus/consensus_test.go
@@ -26,10 +26,10 @@
"testing"
"time"
- "git.monogon.dev/source/nexantic.git/golibs/common"
- "git.monogon.dev/source/nexantic.git/metropolis/node/common/supervisor"
"git.monogon.dev/source/nexantic.git/metropolis/node/core/localstorage"
"git.monogon.dev/source/nexantic.git/metropolis/node/core/localstorage/declarative"
+ "git.monogon.dev/source/nexantic.git/metropolis/pkg/freeport"
+ "git.monogon.dev/source/nexantic.git/metropolis/pkg/supervisor"
)
type boilerplate struct {
@@ -90,7 +90,7 @@
InitialCluster: "127.0.0.1",
ExternalHost: "127.0.0.1",
ListenHost: "127.0.0.1",
- Port: common.MustConsume(common.AllocateTCPPort()),
+ Port: freeport.MustConsume(freeport.AllocateTCPPort()),
})
supervisor.New(b.ctx, etcd.Run)
@@ -116,7 +116,7 @@
InitialCluster: "127.0.0.1",
ExternalHost: "127.0.0.1",
ListenHost: "127.0.0.1",
- Port: common.MustConsume(common.AllocateTCPPort()),
+ Port: freeport.MustConsume(freeport.AllocateTCPPort()),
})
supervisor.New(b.ctx, etcd.Run)
waitEtcd(t, etcd)
@@ -161,7 +161,7 @@
InitialCluster: "127.0.0.1",
ExternalHost: "127.0.0.1",
ListenHost: "127.0.0.1",
- Port: common.MustConsume(common.AllocateTCPPort()),
+ Port: freeport.MustConsume(freeport.AllocateTCPPort()),
})
ctx, ctxC := context.WithCancel(b.ctx)
supervisor.New(ctx, etcd.Run)
@@ -207,7 +207,7 @@
InitialCluster: "127.0.0.1",
ExternalHost: "127.0.0.1",
ListenHost: "127.0.0.1",
- Port: common.MustConsume(common.AllocateTCPPort()),
+ Port: freeport.MustConsume(freeport.AllocateTCPPort()),
})
supervisor.New(b.ctx, etcd.Run)
waitEtcd(t, etcd)