lock: update lock change resolution to fix mutating image collision #337
Conversation
jmt-lab
force-pushed
the
lock-resolution-fix
branch
4 times, most recently
from
2f7b23d
to
55855c6
Compare
| fn eq(&self, other: &Self) -> bool { | ||
| self.source == other.source && self.digest == other.digest | ||
| } | ||
| } |
There was a problem hiding this comment.
I think the image digest should be sufficient for equivalency, no?
There was a problem hiding this comment.
The source could change with vendor but the digest could theoretically be the same
| pub(crate) async fn create(project: &Project) -> Result<Self> { | ||
| let lock_file_path = project.project_dir().join(TWOLITER_LOCK); | ||
| if lock_file_path.exists() { | ||
| remove_file(&lock_file_path).await?; |
There was a problem hiding this comment.
do we need to remove the existing lockfile when create == true?
| pub schema_version: SchemaVersion<1>, | ||
| /// The workspace release version | ||
| pub release_version: String, | ||
| /// The resolved bottlerocket sdk |
There was a problem hiding this comment.
Does this require a SchemaVersion change?
There was a problem hiding this comment.
No not really the schema version here is more to track the schema version of Twoliter.toml
There was a problem hiding this comment.
I'm imagining that it could also be a problem if you update twoliter and the lockfile no longer matches, despite the contents being the same. I believe that shouldn't be the case here, though.
jmt-lab
force-pushed
the
lock-resolution-fix
branch
from
55855c6
to
7a70969
Compare
jmt-lab
force-pushed
the
lock-resolution-fix
branch
from
7a70969
to
777878d
Compare
The format changed after bottlerocket-os/twoliter#337
Description of changes:
Testing done:
Tested that Twoliter.lock collision still correctly occurs including remote digest change.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.