fix(agoric-sdk): Include version twins in valid bundle compartment names #9667
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
turadg
approved these changes
Jul 8, 2024
| @@ -11,7 +11,7 @@ import { ZipReader } from '@endo/zip'; | |||
| /** @import {Bundle} from '@agoric/swingset-vat'; */ | |||
| /** @import {CoreEvalPlan} from '@agoric/deploy-script-support/src/writeCoreEvalParts.js' */ | |||
|
|
|||
| const PACKAGE_NAME_RE = /(?<packageName>.*-v[\d.]+)\//; | |||
| const PACKAGE_NAME_RE = /(?<packageName>.*-v[\d.]+(?:-n\d+)?)\//; | |||
There was a problem hiding this comment.
seems pretty low level to JS ecosystem. is there someplace from which we could import it?
There was a problem hiding this comment.
These names are generated by the compartment mapper and can technically be anything. I’m going to land this since it’s the smallest expedient, but it might be better to just remove the check so we don’t accidentally break if we need to change the scheme.
kriskowal
force-pushed
the
kriskowal-allow-bundle-dups
branch
from
1278710 to
861ecaf
Compare
Deploying agoric-sdk with
|
| Latest commit: |
861ecaf
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://d1ab46cf.agoric-sdk.pages.dev |
| Branch Preview URL: | https://kriskowal-allow-bundle-dups.agoric-sdk.pages.dev |
mergify bot
added a commit
that referenced
this pull request
Jul 12, 2024
…es (#9669) ## Description Following #9667 we learn that the bundle analyzer needs to understand exotic package names that include `-dev$hash` and such. To that end, this change fully generalizes the package name detector based on the `@` prefix distinguishing a package name with two path components. ### Security Considerations None. ### Scaling Considerations None. ### Documentation Considerations None. ### Testing Considerations None. ### Upgrade Considerations None.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The Agoric CLI now does some validation of bundles. This includes a regular expression for valid compartment names, but doesn’t account for duplicate compartments from the same alleged version of a package.
Security Considerations
None.
Scaling Considerations
As written, we replace a cryptic failure mode (valid bundle) with a different cryptic failure mode (bundle is oversized due to duplicates of the same package).
Documentation Considerations
None.
Testing Considerations
To test would require an overconstrained scenario that would fail in the face of valid changes. It might be better to further relax these constraints to warnings.
Upgrade Considerations
None.