Skip to content

Fix conflicts for PR 78 #100

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

Open
wants to merge 9 commits into
base: gv/69
Choose a base branch
from
Open

Conversation

Dramelac
Copy link
Contributor

Following the refacto of the garbage collector, there is some change needed to handle the new multi-part upload files. This PR handle conflict between the main branch and gv/69 branch.

PS: The vitest error cmme from the direct import import sha256Wasm from "@taylorzane/hash-wasm/wasm/sha256.wasm"; in r2.ts line 37 but i'm not sure how to fix it properly.

@gabivlj Any update to merge PR #78 ?

Dramelac and others added 9 commits January 3, 2025 15:51
* Fix empty string detection + undefined bypass

* Delete upload file from R2 after cancel
Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.3.7...3.3.8)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: yurhasko <yurij.hasko@gmail.com>
* Remove sha256 manifest from the tag list + Handle invalid n values + Dynamically add the next link if needed

* Update tests to exclude SHA256 from tag listing

* Change typo to camelCase
…re#92)

* Add support for layer mounting cross repository

* Refacto garbage collector selector:
- Fix config blobs were delete when referenced
- Add manifest-list support for multi-arch images
- Add layer mounting support cross-repository

* Upgrade tests with random blobs data + config blob different from layer blob

* Add test for manifest list and garbage collector

* Reduce number of tags for more vitest stability

* Prevent recursive symlink

* Fix typescript error for registry.list include option in garbage-collector.ts

* Change typo to camelCase

* Change typo to camelCase

* Add mountExistingLayer to RegistryHTTPClient to satisfy Registry interface

* Update symlinkHeader name

* Update variable naming + add symlink filter optimisation
When there are many references in the R2 registry, the delete manifest endpoint responds with a 400 request and a cursor.

The `list` call uses `startAfter` which is meant for filenames instead of the `cursor` which makes the `list` call return the same data on each call, despite of what's set in the `last` query parameter.

This leads a caller following the `Link` call without checking whether the URL is the same as before to run into an infinite loop.
# Conflicts:
#	src/registry/garbage-collector.ts
#	src/registry/r2.ts
#	src/router.ts
#	test/index.test.ts
@Dramelac
Copy link
Contributor Author

Hello @gabivlj any update on the subject ?
Thank you !

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.

3 participants