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/tests/e2e/condition_helpers.go b/core/tests/e2e/condition_helpers.go
index df5d38c..7f9bc63 100644
--- a/core/tests/e2e/condition_helpers.go
+++ b/core/tests/e2e/condition_helpers.go
@@ -21,15 +21,15 @@
"errors"
"time"
- apipb "git.monogon.dev/source/nexantic.git/core/generated/api"
+ apb "git.monogon.dev/source/nexantic.git/core/proto/api"
)
-func waitForCondition(ctx context.Context, client apipb.NodeDebugServiceClient, condition string) error {
+func waitForCondition(ctx context.Context, client apb.NodeDebugServiceClient, condition string) error {
var lastErr = errors.New("No RPC for checking condition completed")
for {
- reqCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
+ reqT, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
- res, err := client.GetCondition(reqCtx, &apipb.GetConditionRequest{Name: condition})
+ res, err := client.GetCondition(reqT, &apb.GetConditionRequest{Name: condition})
if err != nil {
if err == ctx.Err() {
return err