Merge branch 'branch/v16' into bernard/backport-46824-branch/v16

.github/workflows/dependency-review.yaml

@@ -11,7 +11,7 @@ jobs:
       contents: read
       pull-requests: write
     with:
-      base-ref: ${{ github.event.pull_request.base.sha || 'master' }}
+      base-ref: ${{ github.event.pull_request.base.sha || 'branch/v16' }}
       # 'GHSA-6xf3-5hp7-xqqg' is a false positive. That's an old Teleport Vuln,
       # but because of the replace, the dependency cannot find the correct
       # Teleport version.

api/proto/teleport/usertasks/v1/user_tasks.proto

@@ -63,19 +63,23 @@ message UserTaskSpec {
 message DiscoverEC2 {
   // Instances maps an instance id to the result of enrolling that instance into teleport.
   map<string, DiscoverEC2Instance> instances = 1;
+  // AccountID is the AWS Account ID for the instances.
+  string account_id = 2;
+  // Region is the AWS Region where Teleport failed to enroll EC2 instances.
+  string region = 3;
 }
 
 // DiscoverEC2Instance contains the result of enrolling an AWS EC2 Instance.
 message DiscoverEC2Instance {
+  // AccountID and Region were moved into the DiscoverEC2 message.
+  reserved 3, 4;
+  reserved "account_id", "region";
+
   // InstanceID is the EC2 Instance ID that uniquely identifies the instance.
   string instance_id = 1;
   // Name is the instance Name.
   // Might be empty, if the instance doesn't have the Name tag.
   string name = 2;
-  // AccountID is the AWS Account ID for this instance.
-  string account_id = 3;
-  // Region is the AWS Region where this issue is happening.
-  string region = 4;
   // InvocationURL is the URL that points to the invocation.
   // Empty if there was an error before installing the
   string invocation_url = 5;