mirror of
https://git.deuxfleurs.fr/Deuxfleurs/garage.git
synced 2024-11-10 18:21:06 +00:00
b4592a00fe
Implement ListMultipartUploads, also refactor ListObjects and ListObjectsV2. It took me some times as I wanted to propose the following things: - Using an iterator instead of the loop+goto pattern. I find it easier to read and it should enable some optimizations. For example, when consuming keys of a common prefix, we do many [redundant checks](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/src/api/s3_list.rs#L125-L156) while the only thing to do is to [check if the following key is still part of the common prefix](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/feature/s3-multipart-compat/src/api/s3_list.rs#L476). - Try to name things (see ExtractionResult and RangeBegin enums) and to separate concerns (see ListQuery and Accumulator) - An IO closure to make unit tests possibles. - Unit tests, to track regressions and document how to interact with the code - Integration tests with `s3api`. In the future, I would like to move them in Rust with the aws rust SDK. Merging of the logic of ListMultipartUploads and ListObjects was not a goal but a consequence of the previous modifications. Some points that we might want to discuss: - ListObjectsV1, when using pagination and delimiters, has a weird behavior (it lists multiple times the same prefix) with `aws s3api` due to the fact that it can not use our optimization to skip the whole prefix. It is independant from my refactor and can be tested with the commented `s3api` tests in `test-smoke.sh`. It probably has the same weird behavior on the official AWS S3 implementation. - Considering ListMultipartUploads, I had to "abuse" upload id marker to support prefix skipping. I send an `upload-id-marker` with the hardcoded value `include` to emulate your "including" token. - Some ways to test ListMultipartUploads with existing software (my tests are limited to s3api for now). Co-authored-by: Quentin Dufour <quentin@deuxfleurs.fr> Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/171 Co-authored-by: Quentin <quentin@dufour.io> Co-committed-by: Quentin <quentin@dufour.io>
94 lines
1.9 KiB
Nix
94 lines
1.9 KiB
Nix
{
|
|
system ? builtins.currentSystem,
|
|
rust ? true,
|
|
integration ? true,
|
|
release ? true,
|
|
}:
|
|
|
|
with import ./nix/common.nix;
|
|
|
|
let
|
|
pkgs = import pkgsSrc {
|
|
inherit system;
|
|
overlays = [ cargo2nixOverlay ];
|
|
};
|
|
kaniko = (import ./nix/kaniko.nix) pkgs;
|
|
|
|
in
|
|
|
|
pkgs.mkShell {
|
|
shellHook = ''
|
|
function to_s3 {
|
|
aws \
|
|
--endpoint-url https://garage.deuxfleurs.fr \
|
|
--region garage \
|
|
s3 cp \
|
|
./result/bin/garage \
|
|
s3://garagehq.deuxfleurs.fr/_releases/''${DRONE_TAG:-$DRONE_COMMIT}/''${TARGET}/garage
|
|
}
|
|
|
|
function to_docker {
|
|
executor \
|
|
--force \
|
|
--customPlatform="''${DOCKER_PLATFORM}" \
|
|
--destination "''${CONTAINER_NAME}:''${CONTAINER_TAG}" \
|
|
--context dir://`pwd` \
|
|
--verbosity=debug
|
|
}
|
|
|
|
function refresh_index {
|
|
aws \
|
|
--endpoint-url https://garage.deuxfleurs.fr \
|
|
--region garage \
|
|
s3 ls \
|
|
--recursive \
|
|
s3://garagehq.deuxfleurs.fr/_releases/ \
|
|
> aws-list.txt
|
|
|
|
nix-build nix/build_index.nix
|
|
|
|
aws \
|
|
--endpoint-url https://garage.deuxfleurs.fr \
|
|
--region garage \
|
|
s3 cp \
|
|
--content-type "text/html" \
|
|
result \
|
|
s3://garagehq.deuxfleurs.fr/_releases.html
|
|
}
|
|
|
|
function refresh_toolchain {
|
|
nix copy \
|
|
--to 's3://nix?endpoint=garage.deuxfleurs.fr®ion=garage&secret-key=/etc/nix/signing-key.sec' \
|
|
$(nix-store -qR \
|
|
$(nix-build --quiet --no-build-output --no-out-link nix/toolchain.nix))
|
|
}
|
|
'';
|
|
|
|
nativeBuildInputs =
|
|
(if rust then [
|
|
pkgs.rustPlatform.rust.rustc
|
|
pkgs.rustPlatform.rust.cargo
|
|
pkgs.clippy
|
|
pkgs.rustfmt
|
|
/*(pkgs.callPackage cargo2nix {}).package*/
|
|
] else [])
|
|
++
|
|
(if integration then [
|
|
pkgs.s3cmd
|
|
pkgs.awscli2
|
|
pkgs.minio-client
|
|
pkgs.rclone
|
|
pkgs.socat
|
|
pkgs.psmisc
|
|
pkgs.which
|
|
pkgs.openssl
|
|
pkgs.curl
|
|
pkgs.jq
|
|
] else [])
|
|
++
|
|
(if release then [
|
|
pkgs.awscli2
|
|
kaniko
|
|
] else [])
|
|
;
|
|
}
|