treewide: introduce osbase package and move things around
All except localregistry moved from metropolis/pkg to osbase,
localregistry moved to metropolis/test as its only used there anyway.
Change-Id: If1a4bf377364bef0ac23169e1b90379c71b06d72
Reviewed-on: https://review.monogon.dev/c/monogon/+/3079
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/node/core/consensus/BUILD.bazel b/metropolis/node/core/consensus/BUILD.bazel
index 359b6dc..eeb8d3b 100644
--- a/metropolis/node/core/consensus/BUILD.bazel
+++ b/metropolis/node/core/consensus/BUILD.bazel
@@ -16,13 +16,13 @@
"//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",
+ "//osbase/event",
+ "//osbase/event/memory",
+ "//osbase/logbuffer",
+ "//osbase/logtree",
+ "//osbase/logtree/unraw",
+ "//osbase/pki",
+ "//osbase/supervisor",
"@io_etcd_go_etcd_client_v3//:client",
"@io_etcd_go_etcd_server_v3//embed",
],
@@ -45,10 +45,10 @@
deps = [
"//metropolis/node/core/localstorage",
"//metropolis/node/core/localstorage/declarative",
- "//metropolis/pkg/logbuffer",
- "//metropolis/pkg/logtree",
- "//metropolis/pkg/supervisor",
"//metropolis/test/util",
+ "//osbase/logbuffer",
+ "//osbase/logtree",
+ "//osbase/supervisor",
"@com_github_google_go_cmp//cmp",
],
)
diff --git a/metropolis/node/core/consensus/configuration.go b/metropolis/node/core/consensus/configuration.go
index dc3cd06..bb3db82 100644
--- a/metropolis/node/core/consensus/configuration.go
+++ b/metropolis/node/core/consensus/configuration.go
@@ -15,7 +15,7 @@
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/identity"
"source.monogon.dev/metropolis/node/core/localstorage"
- "source.monogon.dev/metropolis/pkg/pki"
+ "source.monogon.dev/osbase/pki"
)
// Config describes the startup configuration of a consensus instance.
diff --git a/metropolis/node/core/consensus/consensus.go b/metropolis/node/core/consensus/consensus.go
index 3244972..e749f7b 100644
--- a/metropolis/node/core/consensus/consensus.go
+++ b/metropolis/node/core/consensus/consensus.go
@@ -102,11 +102,11 @@
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/metropolis/node/core/identity"
- "source.monogon.dev/metropolis/pkg/event"
- "source.monogon.dev/metropolis/pkg/event/memory"
- "source.monogon.dev/metropolis/pkg/logtree/unraw"
- "source.monogon.dev/metropolis/pkg/pki"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/event"
+ "source.monogon.dev/osbase/event/memory"
+ "source.monogon.dev/osbase/logtree/unraw"
+ "source.monogon.dev/osbase/pki"
+ "source.monogon.dev/osbase/supervisor"
)
var (
diff --git a/metropolis/node/core/consensus/consensus_test.go b/metropolis/node/core/consensus/consensus_test.go
index 1866ff5..85df62e 100644
--- a/metropolis/node/core/consensus/consensus_test.go
+++ b/metropolis/node/core/consensus/consensus_test.go
@@ -29,8 +29,8 @@
"source.monogon.dev/metropolis/node/core/localstorage"
"source.monogon.dev/metropolis/node/core/localstorage/declarative"
- "source.monogon.dev/metropolis/pkg/supervisor"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/supervisor"
)
type boilerplate struct {
diff --git a/metropolis/node/core/consensus/logparser.go b/metropolis/node/core/consensus/logparser.go
index dbd3b1d..b403423 100644
--- a/metropolis/node/core/consensus/logparser.go
+++ b/metropolis/node/core/consensus/logparser.go
@@ -8,9 +8,9 @@
"strings"
"time"
- "source.monogon.dev/metropolis/pkg/logbuffer"
- "source.monogon.dev/metropolis/pkg/logtree"
- "source.monogon.dev/metropolis/pkg/logtree/unraw"
+ "source.monogon.dev/osbase/logbuffer"
+ "source.monogon.dev/osbase/logtree"
+ "source.monogon.dev/osbase/logtree/unraw"
)
// etcdLogEntry is a JSON-encoded, structured log entry received from a running
diff --git a/metropolis/node/core/consensus/logparser_test.go b/metropolis/node/core/consensus/logparser_test.go
index c53c13d..cfe6fea 100644
--- a/metropolis/node/core/consensus/logparser_test.go
+++ b/metropolis/node/core/consensus/logparser_test.go
@@ -6,8 +6,8 @@
"github.com/google/go-cmp/cmp"
- "source.monogon.dev/metropolis/pkg/logbuffer"
- "source.monogon.dev/metropolis/pkg/logtree"
+ "source.monogon.dev/osbase/logbuffer"
+ "source.monogon.dev/osbase/logtree"
)
// TestParsing exercises the parseEtcdLogEntry function.
diff --git a/metropolis/node/core/consensus/status.go b/metropolis/node/core/consensus/status.go
index 44562bf..994e9f7 100644
--- a/metropolis/node/core/consensus/status.go
+++ b/metropolis/node/core/consensus/status.go
@@ -13,8 +13,8 @@
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/metropolis/node/core/identity"
- "source.monogon.dev/metropolis/pkg/event"
- "source.monogon.dev/metropolis/pkg/pki"
+ "source.monogon.dev/osbase/event"
+ "source.monogon.dev/osbase/pki"
)
// ServiceHandle is implemented by Service and should be the type expected by
diff --git a/metropolis/node/core/consensus/testhelpers.go b/metropolis/node/core/consensus/testhelpers.go
index 3522e06..3471e3c 100644
--- a/metropolis/node/core/consensus/testhelpers.go
+++ b/metropolis/node/core/consensus/testhelpers.go
@@ -6,7 +6,7 @@
clientv3 "go.etcd.io/etcd/client/v3"
- "source.monogon.dev/metropolis/pkg/event/memory"
+ "source.monogon.dev/osbase/event/memory"
)
type testServiceHandle struct {