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/metrics/BUILD.bazel b/metropolis/node/core/metrics/BUILD.bazel
index 9169ae6..6385bb8 100644
--- a/metropolis/node/core/metrics/BUILD.bazel
+++ b/metropolis/node/core/metrics/BUILD.bazel
@@ -15,7 +15,7 @@
"//metropolis/node/core/curator/proto/api",
"//metropolis/node/core/curator/watcher",
"//metropolis/node/core/identity",
- "//metropolis/pkg/supervisor",
+ "//osbase/supervisor",
],
)
@@ -30,9 +30,9 @@
deps = [
"//metropolis/node",
"//metropolis/node/core/curator/proto/api",
- "//metropolis/pkg/freeport",
- "//metropolis/pkg/supervisor",
"//metropolis/test/util",
+ "//osbase/freeport",
+ "//osbase/supervisor",
"@com_zx2c4_golang_wireguard_wgctrl//wgtypes",
"@io_bazel_rules_go//go/runfiles:go_default_library",
],
diff --git a/metropolis/node/core/metrics/discovery.go b/metropolis/node/core/metrics/discovery.go
index ff3fcf1..116291e 100644
--- a/metropolis/node/core/metrics/discovery.go
+++ b/metropolis/node/core/metrics/discovery.go
@@ -9,7 +9,7 @@
"source.monogon.dev/go/types/mapsets"
"source.monogon.dev/metropolis/node/core/curator/watcher"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/supervisor"
ipb "source.monogon.dev/metropolis/node/core/curator/proto/api"
)
diff --git a/metropolis/node/core/metrics/exporters.go b/metropolis/node/core/metrics/exporters.go
index c14abcc..2dd2cfc 100644
--- a/metropolis/node/core/metrics/exporters.go
+++ b/metropolis/node/core/metrics/exporters.go
@@ -6,7 +6,7 @@
"net/http"
"source.monogon.dev/metropolis/node"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/supervisor"
)
// An Exporter is a Prometheus binary running under the Metrics service which
diff --git a/metropolis/node/core/metrics/metrics.go b/metropolis/node/core/metrics/metrics.go
index bd229fa..b07a980 100644
--- a/metropolis/node/core/metrics/metrics.go
+++ b/metropolis/node/core/metrics/metrics.go
@@ -11,7 +11,7 @@
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/identity"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/supervisor"
)
// Service is the Metropolis Metrics Service.
diff --git a/metropolis/node/core/metrics/metrics_test.go b/metropolis/node/core/metrics/metrics_test.go
index b0a9310..06b1d4e 100644
--- a/metropolis/node/core/metrics/metrics_test.go
+++ b/metropolis/node/core/metrics/metrics_test.go
@@ -18,9 +18,9 @@
apb "source.monogon.dev/metropolis/node/core/curator/proto/api"
"source.monogon.dev/metropolis/node"
- "source.monogon.dev/metropolis/pkg/freeport"
- "source.monogon.dev/metropolis/pkg/supervisor"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/freeport"
+ "source.monogon.dev/osbase/supervisor"
)
func fakeExporter(name, value string) *Exporter {