osbase: move test packages under osbase/test
The cmd, freeport and socksproxy packages are only used in tests, and
are also intended to be only used in tests. This change moves these
packages under osbase/test.
Change-Id: I8fe679945990c295bdf822abfce56c25233c4588
Reviewed-on: https://review.monogon.dev/c/monogon/+/4564
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/cloud/agent/takeover/e2e/BUILD.bazel b/cloud/agent/takeover/e2e/BUILD.bazel
index dc05d9e..1a00569 100644
--- a/cloud/agent/takeover/e2e/BUILD.bazel
+++ b/cloud/agent/takeover/e2e/BUILD.bazel
@@ -21,8 +21,8 @@
deps = [
"//cloud/agent/api",
"//osbase/fat32",
- "//osbase/freeport",
"//osbase/structfs",
+ "//osbase/test/freeport",
"@com_github_pkg_sftp//:sftp",
"@io_bazel_rules_go//go/runfiles",
"@org_golang_google_protobuf//proto",
diff --git a/cloud/agent/takeover/e2e/main_test.go b/cloud/agent/takeover/e2e/main_test.go
index 2062be7..db7278a 100644
--- a/cloud/agent/takeover/e2e/main_test.go
+++ b/cloud/agent/takeover/e2e/main_test.go
@@ -27,8 +27,8 @@
"source.monogon.dev/cloud/agent/api"
"source.monogon.dev/osbase/fat32"
- "source.monogon.dev/osbase/freeport"
"source.monogon.dev/osbase/structfs"
+ "source.monogon.dev/osbase/test/freeport"
)
var (
diff --git a/metropolis/cli/metroctl/test/BUILD.bazel b/metropolis/cli/metroctl/test/BUILD.bazel
index edaa112..3632a44 100644
--- a/metropolis/cli/metroctl/test/BUILD.bazel
+++ b/metropolis/cli/metroctl/test/BUILD.bazel
@@ -14,7 +14,7 @@
deps = [
"//metropolis/test/launch",
"//metropolis/test/util",
- "//osbase/cmd",
+ "//osbase/test/cmd",
"@io_bazel_rules_go//go/runfiles",
],
)
diff --git a/metropolis/cli/metroctl/test/main_test.go b/metropolis/cli/metroctl/test/main_test.go
index b853b82..f44f508 100644
--- a/metropolis/cli/metroctl/test/main_test.go
+++ b/metropolis/cli/metroctl/test/main_test.go
@@ -18,7 +18,7 @@
mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/cmd"
+ "source.monogon.dev/osbase/test/cmd"
)
var (
diff --git a/metropolis/cli/takeover/e2e/BUILD.bazel b/metropolis/cli/takeover/e2e/BUILD.bazel
index d01812e..6cebd51 100644
--- a/metropolis/cli/takeover/e2e/BUILD.bazel
+++ b/metropolis/cli/takeover/e2e/BUILD.bazel
@@ -23,8 +23,8 @@
},
deps = [
"//osbase/fat32",
- "//osbase/freeport",
"//osbase/structfs",
+ "//osbase/test/freeport",
"@io_bazel_rules_go//go/runfiles",
"@org_golang_x_crypto//ssh",
"@org_golang_x_crypto//ssh/agent",
diff --git a/metropolis/cli/takeover/e2e/main_test.go b/metropolis/cli/takeover/e2e/main_test.go
index 556f300..c86a48d 100644
--- a/metropolis/cli/takeover/e2e/main_test.go
+++ b/metropolis/cli/takeover/e2e/main_test.go
@@ -25,8 +25,8 @@
"golang.org/x/sys/unix"
"source.monogon.dev/osbase/fat32"
- "source.monogon.dev/osbase/freeport"
"source.monogon.dev/osbase/structfs"
+ "source.monogon.dev/osbase/test/freeport"
)
var (
diff --git a/metropolis/installer/test/BUILD.bazel b/metropolis/installer/test/BUILD.bazel
index 8c6bc8d..ff8cb00 100644
--- a/metropolis/installer/test/BUILD.bazel
+++ b/metropolis/installer/test/BUILD.bazel
@@ -25,10 +25,10 @@
"//metropolis/cli/metroctl/core",
"//metropolis/installer/install",
"//metropolis/proto/api",
- "//osbase/cmd",
"//osbase/oci",
"//osbase/oci/osimage",
"//osbase/structfs",
+ "//osbase/test/cmd",
"@com_github_diskfs_go_diskfs//:go-diskfs",
"@com_github_diskfs_go_diskfs//disk",
"@com_github_diskfs_go_diskfs//partition/gpt",
diff --git a/metropolis/installer/test/run_test.go b/metropolis/installer/test/run_test.go
index 898ad44..3b7de86 100644
--- a/metropolis/installer/test/run_test.go
+++ b/metropolis/installer/test/run_test.go
@@ -25,10 +25,10 @@
mctl "source.monogon.dev/metropolis/cli/metroctl/core"
"source.monogon.dev/metropolis/installer/install"
- "source.monogon.dev/osbase/cmd"
"source.monogon.dev/osbase/oci"
"source.monogon.dev/osbase/oci/osimage"
"source.monogon.dev/osbase/structfs"
+ "source.monogon.dev/osbase/test/cmd"
)
var (
diff --git a/metropolis/node/core/metrics/BUILD.bazel b/metropolis/node/core/metrics/BUILD.bazel
index 893a6c4..bc94863 100644
--- a/metropolis/node/core/metrics/BUILD.bazel
+++ b/metropolis/node/core/metrics/BUILD.bazel
@@ -35,8 +35,8 @@
"//metropolis/node",
"//metropolis/node/core/curator/proto/api",
"//metropolis/test/util",
- "//osbase/freeport",
"//osbase/supervisor",
+ "//osbase/test/freeport",
"@com_zx2c4_golang_wireguard_wgctrl//wgtypes",
"@io_bazel_rules_go//go/runfiles",
],
diff --git a/metropolis/node/core/metrics/metrics_test.go b/metropolis/node/core/metrics/metrics_test.go
index b7c3eab..ebb59a9 100644
--- a/metropolis/node/core/metrics/metrics_test.go
+++ b/metropolis/node/core/metrics/metrics_test.go
@@ -22,8 +22,8 @@
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/freeport"
"source.monogon.dev/osbase/supervisor"
+ "source.monogon.dev/osbase/test/freeport"
)
var (
diff --git a/metropolis/test/nanoswitch/BUILD.bazel b/metropolis/test/nanoswitch/BUILD.bazel
index d7f9d12..9aff921 100644
--- a/metropolis/test/nanoswitch/BUILD.bazel
+++ b/metropolis/test/nanoswitch/BUILD.bazel
@@ -14,8 +14,8 @@
"//metropolis/node/core/network/dhcp4c",
"//metropolis/node/core/network/dhcp4c/callback",
"//osbase/bringup",
- "//osbase/socksproxy",
"//osbase/supervisor",
+ "//osbase/test/socksproxy",
"@com_github_google_nftables//:nftables",
"@com_github_google_nftables//expr",
"@com_github_insomniacslk_dhcp//dhcpv4",
diff --git a/metropolis/test/nanoswitch/socks.go b/metropolis/test/nanoswitch/socks.go
index 15e0f81..41efcde 100644
--- a/metropolis/test/nanoswitch/socks.go
+++ b/metropolis/test/nanoswitch/socks.go
@@ -8,8 +8,8 @@
"fmt"
"net"
- "source.monogon.dev/osbase/socksproxy"
"source.monogon.dev/osbase/supervisor"
+ "source.monogon.dev/osbase/test/socksproxy"
)
// SOCKSPort is the port at which nanoswitch listens for SOCKS conenctions.
diff --git a/osbase/bringup/test/BUILD.bazel b/osbase/bringup/test/BUILD.bazel
index 307220c..15409ac 100644
--- a/osbase/bringup/test/BUILD.bazel
+++ b/osbase/bringup/test/BUILD.bazel
@@ -30,7 +30,7 @@
"xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
},
deps = [
- "//osbase/cmd",
+ "//osbase/test/cmd",
"@io_bazel_rules_go//go/runfiles",
],
)
diff --git a/osbase/bringup/test/run_test.go b/osbase/bringup/test/run_test.go
index 03ae71b..69b881e 100644
--- a/osbase/bringup/test/run_test.go
+++ b/osbase/bringup/test/run_test.go
@@ -12,7 +12,7 @@
"github.com/bazelbuild/rules_go/go/runfiles"
- "source.monogon.dev/osbase/cmd"
+ "source.monogon.dev/osbase/test/cmd"
)
var (
diff --git a/osbase/cmd/BUILD.bazel b/osbase/test/cmd/BUILD.bazel
similarity index 78%
rename from osbase/cmd/BUILD.bazel
rename to osbase/test/cmd/BUILD.bazel
index dd5f66e..6d6a3c9 100644
--- a/osbase/cmd/BUILD.bazel
+++ b/osbase/test/cmd/BUILD.bazel
@@ -3,7 +3,7 @@
go_library(
name = "cmd",
srcs = ["run.go"],
- importpath = "source.monogon.dev/osbase/cmd",
+ importpath = "source.monogon.dev/osbase/test/cmd",
visibility = ["//visibility:public"],
deps = [
"//osbase/logbuffer",
diff --git a/osbase/cmd/run.go b/osbase/test/cmd/run.go
similarity index 100%
rename from osbase/cmd/run.go
rename to osbase/test/cmd/run.go
diff --git a/osbase/freeport/BUILD.bazel b/osbase/test/freeport/BUILD.bazel
similarity index 72%
rename from osbase/freeport/BUILD.bazel
rename to osbase/test/freeport/BUILD.bazel
index b0fcd25..30d229f 100644
--- a/osbase/freeport/BUILD.bazel
+++ b/osbase/test/freeport/BUILD.bazel
@@ -3,6 +3,6 @@
go_library(
name = "freeport",
srcs = ["freeport.go"],
- importpath = "source.monogon.dev/osbase/freeport",
+ importpath = "source.monogon.dev/osbase/test/freeport",
visibility = ["//visibility:public"],
)
diff --git a/osbase/freeport/freeport.go b/osbase/test/freeport/freeport.go
similarity index 100%
rename from osbase/freeport/freeport.go
rename to osbase/test/freeport/freeport.go
diff --git a/osbase/test/qemu/BUILD.bazel b/osbase/test/qemu/BUILD.bazel
index 0145ddb..dc89881 100644
--- a/osbase/test/qemu/BUILD.bazel
+++ b/osbase/test/qemu/BUILD.bazel
@@ -15,7 +15,7 @@
"xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
},
deps = [
- "//osbase/freeport",
+ "//osbase/test/freeport",
"@io_bazel_rules_go//go/runfiles",
"@org_golang_x_sys//unix",
],
diff --git a/osbase/test/qemu/launch.go b/osbase/test/qemu/launch.go
index ba33961..a427f17 100644
--- a/osbase/test/qemu/launch.go
+++ b/osbase/test/qemu/launch.go
@@ -21,7 +21,7 @@
"github.com/bazelbuild/rules_go/go/runfiles"
"golang.org/x/sys/unix"
- "source.monogon.dev/osbase/freeport"
+ "source.monogon.dev/osbase/test/freeport"
)
var (
diff --git a/osbase/socksproxy/BUILD.bazel b/osbase/test/socksproxy/BUILD.bazel
similarity index 85%
rename from osbase/socksproxy/BUILD.bazel
rename to osbase/test/socksproxy/BUILD.bazel
index 2365f12..4ba8a71 100644
--- a/osbase/socksproxy/BUILD.bazel
+++ b/osbase/test/socksproxy/BUILD.bazel
@@ -6,7 +6,7 @@
"protocol.go",
"socksproxy.go",
],
- importpath = "source.monogon.dev/osbase/socksproxy",
+ importpath = "source.monogon.dev/osbase/test/socksproxy",
visibility = ["//visibility:public"],
)
diff --git a/osbase/socksproxy/protocol.go b/osbase/test/socksproxy/protocol.go
similarity index 100%
rename from osbase/socksproxy/protocol.go
rename to osbase/test/socksproxy/protocol.go
diff --git a/osbase/socksproxy/socksproxy.go b/osbase/test/socksproxy/socksproxy.go
similarity index 100%
rename from osbase/socksproxy/socksproxy.go
rename to osbase/test/socksproxy/socksproxy.go
diff --git a/osbase/socksproxy/socksproxy_test.go b/osbase/test/socksproxy/socksproxy_test.go
similarity index 100%
rename from osbase/socksproxy/socksproxy_test.go
rename to osbase/test/socksproxy/socksproxy_test.go