protobuf cursed circular import

Author: espadolini

api/client/proto/authservice.pb.go

@@ -22,6 +22,7 @@ import "google/protobuf/timestamp.proto";
 import "teleport/attestation/v1/attestation.proto";
 import "teleport/legacy/client/proto/certs.proto";
 import "teleport/legacy/client/proto/event.proto";
+import public "teleport/legacy/client/proto/updaterv2info/updaterv2info.proto";
 import "teleport/legacy/types/events/events.proto";
 import "teleport/legacy/types/types.proto";
 import "teleport/legacy/types/webauthn/webauthn.proto";
@@ -2504,36 +2505,6 @@ message UpstreamInventoryHello {
   UpdaterV2Info UpdaterV2Info = 7;
 }
 
-message UpdaterV2Info {
-  // UpdateGroup is the update group the agent's updater is part of.
-  // The autoupdate_agent_rollout resource controls when different groups update.
-  // Reporting the update group in the Hello allows us to track the update progress per group.
-  // See RFD 184 for more details.
-  string UpdateGroup = 1;
-  // UpdateUUID is the agent's updater UUID.
-  // Each updater has a UUID, this can be used in two cases:
-  // - To update individual agents when doing canary updates
-  // - To track the lowest non-updated agent to avoid a deadlock when doing a progressive rollout
-  bytes UpdateUUID = 2;
-  // UpdaterStatus represents any updater-related status information that the Teleport cluster
-  // should be aware of. For example, the fact the updater got disabled, the version pinned,
-  // or that the updater seems to not be running.
-  UpdaterStatus UpdaterStatus = 3;
-}
-
-enum UpdaterStatus {
-  // UPDATER_STATUS_UNSPECIFIED is the zero value.
-  UPDATER_STATUS_UNSPECIFIED = 0;
-  // UPDATER_STATUS_OK means that everything looks OK from the agent pov.
-  UPDATER_STATUS_OK = 1;
-  // UPDATER_STATUS_DISABLED means that automatic updates seem disabled or paused.
-  UPDATER_STATUS_DISABLED = 2;
-  // UPDATER_STATUS_PINNED means that a specific version is pinned.
-  UPDATER_STATUS_PINNED = 3;
-  // UPDATER_STATUS_UNREADABLE means that the agent failed to read its update status.
-  UPDATER_STATUS_UNREADABLE = 4;
-}
-
 // UpstreamInventoryAgentMetadata is the message sent up the inventory control stream containing
 // metadata about the instance.
 message UpstreamInventoryAgentMetadata {

api/client/proto/updaterv2info/updaterv2info.pb.go

@@ -0,0 +1,49 @@
+// Copyright 2025 Gravitational, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package proto;
+
+option go_package = "github.com/gravitational/teleport/api/client/proto/updaterv2info";
+
+message UpdaterV2Info {
+  // UpdateGroup is the update group the agent's updater is part of.
+  // The autoupdate_agent_rollout resource controls when different groups update.s
+  // Reporting the update group in the Hello allows us to track the update progress per group.
+  // See RFD 184 for more details.
+  string UpdateGroup = 1;
+  // UpdateUUID is the agent's updater UUID.
+  // Each updater has a UUID, this can be used in two cases:
+  // - To update individual agents when doing canary updates
+  // - To track the lowest non-updated agent to avoid a deadlock when doing a progressive rollout
+  bytes UpdateUUID = 2;
+  // UpdaterStatus represents any updater-related status information that the Teleport cluster
+  // should be aware of. For example, the fact the updater got disabled, the version pinned,
+  // or that the updater seems to not be running.
+  UpdaterStatus UpdaterStatus = 3;
+}
+
+enum UpdaterStatus {
+  // UPDATER_STATUS_UNSPECIFIED is the zero value.
+  UPDATER_STATUS_UNSPECIFIED = 0;
+  // UPDATER_STATUS_OK means that everything looks OK from the agent pov.
+  UPDATER_STATUS_OK = 1;
+  // UPDATER_STATUS_DISABLED means that automatic updates seem disabled or paused.
+  UPDATER_STATUS_DISABLED = 2;
+  // UPDATER_STATUS_PINNED means that a specific version is pinned.
+  UPDATER_STATUS_PINNED = 3;
+  // UPDATER_STATUS_UNREADABLE means that the agent failed to read its update status.
+  UPDATER_STATUS_UNREADABLE = 4;
+}

api/proto/teleport/legacy/client/proto/authservice.proto

@@ -21,6 +21,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 import "teleport/attestation/v1/attestation.proto";
+import "teleport/legacy/client/proto/updaterv2info/updaterv2info.proto";
 import "teleport/legacy/types/trusted_device_requirement.proto";
 import "teleport/legacy/types/wrappers/wrappers.proto";
 
@@ -29,6 +30,10 @@ option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;
 
+message Unused {
+  proto.UpdaterV2Info unused = 1;
+}
+
 message KeepAlive {
   reserved 3; // LeaseID
   reserved "LeaseID";