Skip to content

[v12] Define a new DeviceEvent proto with the usual embeds#25555

Merged
codingllama merged 1 commit intobranch/v12from
codingllama/backport/25353-v12
May 4, 2023
Merged

[v12] Define a new DeviceEvent proto with the usual embeds#25555
codingllama merged 1 commit intobranch/v12from
codingllama/backport/25353-v12

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

Define a new base event for device trust, with the usual embeds of Status and UserMetadata.

We can't swap the event in single PR as the code that issues it lives in e/, so it has to be done in multiple steps.

#25288

Backport #25355 to branch/v12

* Define a new, standardized device event

* Update generated protos

* Add OneOf support, swap legacy for new event

* Do not mix old and new events
@codingllama codingllama requested review from nklaassen and zmb3 May 3, 2023 14:41
@github-actions github-actions Bot requested review from AntonAM and strideynet May 3, 2023 14:41
@github-actions github-actions Bot added audit-log Issues related to Teleports Audit Log backport size/sm labels May 3, 2023
events.DeviceEvent2 DeviceEvent2 = 121;
}

reserved 120; // OpenSearchRequest not backported.
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this line for the backport.

@codingllama
Copy link
Copy Markdown
Contributor Author

Conflicts fixed on events.proto (see comments in file) and generated files (fixed using make grpc).

@codingllama codingllama added this pull request to the merge queue May 4, 2023
@codingllama codingllama removed this pull request from the merge queue due to a manual request May 4, 2023
@codingllama codingllama added this pull request to the merge queue May 4, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 4, 2023
@codingllama codingllama added this pull request to the merge queue May 4, 2023
Merged via the queue into branch/v12 with commit 016f750 May 4, 2023
@codingllama codingllama deleted the codingllama/backport/25353-v12 branch May 4, 2023 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

audit-log Issues related to Teleports Audit Log backport size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants