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/internal/launch/launch.go b/core/internal/launch/launch.go
index d08117d..90eb00b 100644
--- a/core/internal/launch/launch.go
+++ b/core/internal/launch/launch.go
@@ -37,8 +37,8 @@
"golang.org/x/sys/unix"
"google.golang.org/grpc"
- apipb "git.monogon.dev/source/nexantic.git/core/generated/api"
"git.monogon.dev/source/nexantic.git/core/internal/common"
+ apb "git.monogon.dev/source/nexantic.git/core/proto/api"
freeport "git.monogon.dev/source/nexantic.git/golibs/common"
)
@@ -130,7 +130,7 @@
SerialPort *os.File
// EnrolmentConfig is passed into the VM and subsequently used for bootstrapping if no enrolment config is built-in
- EnrolmentConfig *apipb.EnrolmentConfig
+ EnrolmentConfig *apb.EnrolmentConfig
}
var requiredPorts = []uint16{common.ConsensusPort, common.NodeServicePort, common.MasterServicePort,