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/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")