Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move VMMetadata proto to a more fitting home #6341

Merged
merged 3 commits into from
Apr 11, 2024
Merged

Conversation

maggie-lou
Copy link
Contributor

@maggie-lou maggie-lou commented Apr 9, 2024

The VMMetadata proto feels a little too firecracker-specific to live in remote_execution.proto. I've hit some problems with import cycles (firecracker.proto needs to import remote_execution.proto for generic RBE concepts like files, but now there is an implicit import loop because remote_execution.proto contains the definition for this firecracker-specific field).

This PR sets VMMetadata in the more generic repeated google.protobuf.Any auxiliary_metadata field of ExecutedActionMetadata. That allows us to move the proto definition into firecracker.proto

Related issues: Based on feedback/challenges from #6303

@maggie-lou maggie-lou force-pushed the vm_metadata_proto branch 2 times, most recently from 0ca4ee0 to ab9bdb1 Compare April 9, 2024 21:33
@maggie-lou maggie-lou changed the title Test move WIP Move VMMetadata proto Apr 10, 2024
@maggie-lou maggie-lou changed the title WIP Move VMMetadata proto Move VMMetadata proto to a more fitting home Apr 10, 2024
@maggie-lou maggie-lou marked this pull request as ready for review April 10, 2024 23:33
Copy link
Member

@bduffany bduffany left a comment

Choose a reason for hiding this comment

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

nice, thanks for making this change!

return this.getDeprecatedFirecrackerVMMetadata();
}
for (const metadata of auxiliaryMetadata) {
if (metadata.typeUrl.includes("firecracker.VMMetadata")) {
Copy link
Member

Choose a reason for hiding this comment

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

nit: can we do an equality check on the typeUrl instead of .includes() ? or does the URL include some contents we aren't expecting?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed. I thought the includes might be slightly less brittle, but don't feel strongly

@maggie-lou maggie-lou merged commit 0ddef0e into master Apr 11, 2024
18 checks passed
@maggie-lou maggie-lou deleted the vm_metadata_proto branch April 11, 2024 17:19
maggie-lou added a commit that referenced this pull request Apr 11, 2024
maggie-lou added a commit that referenced this pull request Apr 12, 2024
maggie-lou added a commit that referenced this pull request Apr 12, 2024
maggie-lou added a commit that referenced this pull request Apr 12, 2024
maggie-lou added a commit that referenced this pull request Apr 12, 2024
maggie-lou added a commit that referenced this pull request Apr 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants