core/api: move to core/proto
This is keeping in line with conventions that protobuf files generally
live in a 'proto/' directory. Even without that, a lot of the protos in
there aren't actually part of an API, so keeping them in `api/` is a bit
of a misnomer.
We also remove unused protos that were part of the old
integrity/lifecycle flow. Again, these will make a comeback.
Test Plan: this should fail. part of a larger stack. D590 is the first tip of the stack that should work.
X-Origin-Diff: phab/D588
GitOrigin-RevId: 4a7af494810348f6bcabd49e63902b4c47e6ec35
diff --git a/core/cmd/dbg/BUILD.bazel b/core/cmd/dbg/BUILD.bazel
index 7088ea1..3ca06d0 100644
--- a/core/cmd/dbg/BUILD.bazel
+++ b/core/cmd/dbg/BUILD.bazel
@@ -6,7 +6,7 @@
importpath = "git.monogon.dev/source/nexantic.git/core/cmd/dbg",
visibility = ["//visibility:private"],
deps = [
- "//core/api/api:go_default_library",
+ "//core/proto/api:go_default_library",
"@com_github_spf13_pflag//:go_default_library",
"@io_k8s_component_base//cli/flag:go_default_library",
"@io_k8s_kubectl//pkg/cmd/plugin:go_default_library",
diff --git a/core/cmd/dbg/main.go b/core/cmd/dbg/main.go
index 44803ec..bfa7871 100644
--- a/core/cmd/dbg/main.go
+++ b/core/cmd/dbg/main.go
@@ -33,17 +33,18 @@
"k8s.io/kubectl/pkg/util/logs"
"k8s.io/kubernetes/pkg/kubectl/cmd"
- apipb "git.monogon.dev/source/nexantic.git/core/generated/api"
+ apb "git.monogon.dev/source/nexantic.git/core/proto/api"
)
func main() {
+ ctx := context.Background()
// Hardcode localhost since this should never be used to interface with a production node because of missing
// encryption & authentication
grpcClient, err := grpc.Dial("localhost:7837", grpc.WithInsecure())
if err != nil {
fmt.Printf("Failed to dial debug service (is it running): %v\n", err)
}
- debugClient := apipb.NewNodeDebugServiceClient(grpcClient)
+ debugClient := apb.NewNodeDebugServiceClient(grpcClient)
if len(os.Args) < 2 {
fmt.Println("Please specify a subcommand")
os.Exit(1)
@@ -68,7 +69,7 @@
case "logs":
logsCmd.Parse(os.Args[2:])
componentPath := strings.Split(logsCmd.Arg(0), ".")
- res, err := debugClient.GetComponentLogs(context.Background(), &apipb.GetComponentLogsRequest{ComponentPath: componentPath, TailLines: uint32(*logsTailN)})
+ res, err := debugClient.GetComponentLogs(ctx, &apb.GetComponentLogsRequest{ComponentPath: componentPath, TailLines: uint32(*logsTailN)})
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to get logs: %v\n", err)
os.Exit(1)
@@ -80,7 +81,7 @@
case "condition":
conditionCmd.Parse(os.Args[2:])
condition := conditionCmd.Arg(0)
- res, err := debugClient.GetCondition(context.Background(), &apipb.GetConditionRequest{Name: condition})
+ res, err := debugClient.GetCondition(ctx, &apb.GetConditionRequest{Name: condition})
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to get condition: %v\n", err)
os.Exit(1)
@@ -96,7 +97,7 @@
defer kubeconfigFile.Close()
defer os.Remove(kubeconfigFile.Name())
- res, err := debugClient.GetDebugKubeconfig(context.Background(), &apipb.GetDebugKubeconfigRequest{Id: "debug-user", Groups: []string{"system:masters"}})
+ res, err := debugClient.GetDebugKubeconfig(ctx, &apb.GetDebugKubeconfigRequest{Id: "debug-user", Groups: []string{"system:masters"}})
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to get kubeconfig: %v\n", err)
os.Exit(1)
diff --git a/core/cmd/launch-multi2/BUILD.bazel b/core/cmd/launch-multi2/BUILD.bazel
index 3e3e570..87f4c88 100644
--- a/core/cmd/launch-multi2/BUILD.bazel
+++ b/core/cmd/launch-multi2/BUILD.bazel
@@ -6,9 +6,9 @@
importpath = "git.monogon.dev/source/nexantic.git/core/cmd/launch-multi2",
visibility = ["//visibility:private"],
deps = [
- "//core/api/api:go_default_library",
"//core/internal/common:go_default_library",
"//core/internal/launch:go_default_library",
+ "//core/proto/api:go_default_library",
"@com_github_grpc_ecosystem_go_grpc_middleware//retry:go_default_library",
"@org_golang_google_grpc//:go_default_library",
],
diff --git a/core/cmd/launch-multi2/main.go b/core/cmd/launch-multi2/main.go
index 0b7ef4e..f8c9035 100644
--- a/core/cmd/launch-multi2/main.go
+++ b/core/cmd/launch-multi2/main.go
@@ -27,9 +27,9 @@
grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
"google.golang.org/grpc"
- "git.monogon.dev/source/nexantic.git/core/generated/api"
"git.monogon.dev/source/nexantic.git/core/internal/common"
"git.monogon.dev/source/nexantic.git/core/internal/launch"
+ apb "git.monogon.dev/source/nexantic.git/core/proto/api"
)
func main() {