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/cli/metroctl/BUILD.bazel b/metropolis/cli/metroctl/BUILD.bazel
index 37f4b56..e390ff8 100644
--- a/metropolis/cli/metroctl/BUILD.bazel
+++ b/metropolis/cli/metroctl/BUILD.bazel
@@ -46,12 +46,12 @@
"//metropolis/node/core/identity",
"//metropolis/node/core/rpc",
"//metropolis/node/core/rpc/resolver",
- "//metropolis/pkg/blkio",
- "//metropolis/pkg/fat32",
- "//metropolis/pkg/logtree",
- "//metropolis/pkg/logtree/proto",
"//metropolis/proto/api",
"//metropolis/proto/common",
+ "//osbase/blkio",
+ "//osbase/fat32",
+ "//osbase/logtree",
+ "//osbase/logtree/proto",
"//version",
"@com_github_adrg_xdg//:xdg",
"@com_github_spf13_cobra//:cobra",
diff --git a/metropolis/cli/metroctl/cmd_install.go b/metropolis/cli/metroctl/cmd_install.go
index fc463b4..992da3e 100644
--- a/metropolis/cli/metroctl/cmd_install.go
+++ b/metropolis/cli/metroctl/cmd_install.go
@@ -17,8 +17,8 @@
cpb "source.monogon.dev/metropolis/proto/common"
"source.monogon.dev/metropolis/cli/metroctl/core"
- "source.monogon.dev/metropolis/pkg/blkio"
- "source.monogon.dev/metropolis/pkg/fat32"
+ "source.monogon.dev/osbase/blkio"
+ "source.monogon.dev/osbase/fat32"
)
var installCmd = &cobra.Command{
diff --git a/metropolis/cli/metroctl/cmd_node_logs.go b/metropolis/cli/metroctl/cmd_node_logs.go
index 77dd8c2..5b8cef9 100644
--- a/metropolis/cli/metroctl/cmd_node_logs.go
+++ b/metropolis/cli/metroctl/cmd_node_logs.go
@@ -8,10 +8,10 @@
"github.com/spf13/cobra"
"source.monogon.dev/metropolis/cli/metroctl/core"
- "source.monogon.dev/metropolis/pkg/logtree"
- lpb "source.monogon.dev/metropolis/pkg/logtree/proto"
"source.monogon.dev/metropolis/proto/api"
cpb "source.monogon.dev/metropolis/proto/common"
+ "source.monogon.dev/osbase/logtree"
+ lpb "source.monogon.dev/osbase/logtree/proto"
)
type metroctlLogFlags struct {
diff --git a/metropolis/cli/metroctl/core/BUILD.bazel b/metropolis/cli/metroctl/core/BUILD.bazel
index 1795765..36f02c3 100644
--- a/metropolis/cli/metroctl/core/BUILD.bazel
+++ b/metropolis/cli/metroctl/core/BUILD.bazel
@@ -16,10 +16,10 @@
"//metropolis/node/core/curator/proto/api",
"//metropolis/node/core/rpc",
"//metropolis/node/core/rpc/resolver",
- "//metropolis/pkg/blockdev",
- "//metropolis/pkg/fat32",
- "//metropolis/pkg/gpt",
"//metropolis/proto/api",
+ "//osbase/blockdev",
+ "//osbase/fat32",
+ "//osbase/gpt",
"@io_k8s_client_go//pkg/apis/clientauthentication/v1:clientauthentication",
"@io_k8s_client_go//tools/clientcmd",
"@io_k8s_client_go//tools/clientcmd/api",
diff --git a/metropolis/cli/metroctl/core/install.go b/metropolis/cli/metroctl/core/install.go
index 223e773..4175e22 100644
--- a/metropolis/cli/metroctl/core/install.go
+++ b/metropolis/cli/metroctl/core/install.go
@@ -9,10 +9,10 @@
"google.golang.org/protobuf/proto"
- "source.monogon.dev/metropolis/pkg/blockdev"
- "source.monogon.dev/metropolis/pkg/fat32"
- "source.monogon.dev/metropolis/pkg/gpt"
"source.monogon.dev/metropolis/proto/api"
+ "source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/fat32"
+ "source.monogon.dev/osbase/gpt"
)
type MakeInstallerImageArgs struct {
diff --git a/metropolis/cli/metroctl/test/BUILD.bazel b/metropolis/cli/metroctl/test/BUILD.bazel
index 23bbc4a..9b9c4cc 100644
--- a/metropolis/cli/metroctl/test/BUILD.bazel
+++ b/metropolis/cli/metroctl/test/BUILD.bazel
@@ -13,10 +13,10 @@
rundir = ".",
deps = [
"//metropolis/node",
- "//metropolis/pkg/cmd",
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/launch",
"//metropolis/test/util",
"//metropolis/version",
+ "//osbase/cmd",
"//version",
"@io_bazel_rules_go//go/runfiles:go_default_library",
],
@@ -28,10 +28,10 @@
importpath = "source.monogon.dev/metropolis/cli/metroctl/test",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/pkg/cmd",
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/launch",
"//metropolis/test/util",
"//metropolis/version",
+ "//osbase/cmd",
"//version",
"@io_bazel_rules_go//go/runfiles:go_default_library",
],
diff --git a/metropolis/cli/metroctl/test/test.go b/metropolis/cli/metroctl/test/test.go
index 7b31918..f601811 100644
--- a/metropolis/cli/metroctl/test/test.go
+++ b/metropolis/cli/metroctl/test/test.go
@@ -15,9 +15,9 @@
mversion "source.monogon.dev/metropolis/version"
- "source.monogon.dev/metropolis/pkg/cmd"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/cmd"
"source.monogon.dev/version"
)
@@ -95,10 +95,10 @@
ctx, ctxC := context.WithCancel(context.Background())
defer ctxC()
- co := cluster.ClusterOptions{
+ co := mlaunch.ClusterOptions{
NumNodes: 2,
}
- cl, err := cluster.LaunchCluster(context.Background(), co)
+ cl, err := mlaunch.LaunchCluster(context.Background(), co)
if err != nil {
t.Fatalf("LaunchCluster failed: %v", err)
}
@@ -109,7 +109,7 @@
}
}()
- socksRemote := fmt.Sprintf("localhost:%d", cl.Ports[cluster.SOCKSPort])
+ socksRemote := fmt.Sprintf("localhost:%d", cl.Ports[mlaunch.SOCKSPort])
var clusterEndpoints []string
// Use node starting order for endpoints
for _, ep := range cl.NodeIDs {
@@ -118,7 +118,7 @@
ownerPem := pem.EncodeToMemory(&pem.Block{
Type: "METROPOLIS INITIAL OWNER PRIVATE KEY",
- Bytes: cluster.InsecurePrivateKey,
+ Bytes: mlaunch.InsecurePrivateKey,
})
if err := os.WriteFile("owner-key.pem", ownerPem, 0644); err != nil {
log.Fatal("Couldn't write owner-key.pem")