Enable k2v feature flag in CI

Merge branch 'main' into admin-api
Refactor bucket emptiness check and add k2v check
2026-08-14 16:13:11 +00:00 · 2022-05-20 21:15:09 +02:00 · 2022-05-18 22:35:49 +02:00 · 2022-05-18 10:09:51 +02:00 · 2022-05-18 00:32:51 +02:00 · 2022-05-18 00:27:57 +02:00
40 changed files with 784 additions and 1000 deletions
@@ -2,26 +2,68 @@
 kind: pipeline
 name: default

-node:
-  nix-daemon: 1
+workspace:
+  base: /drone/garage
+
+volumes:
+- name: nix_store
+  host:
+    path: /var/lib/drone/nix
+- name: nix_config
+  temp: {}
+
+environment:
+  HOME: /drone/garage

 steps:
-  - name: check formatting
-    image: nixpkgs/nix:nixos-22.05
+  - name: setup nix
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-shell --attr rust --run "cargo fmt -- --check"
+      - cp nix/nix.conf /etc/nix/nix.conf
+      - nix-build --no-build-output --no-out-link shell.nix --arg release false  -A inputDerivation
+
+  - name: code quality
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
+    commands:
+      - nix-shell --arg release false --run "cargo fmt -- --check"
+      - nix-shell --arg release false --run "cargo clippy -- --deny warnings"

  - name: build
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${DRONE_TAG:-$DRONE_COMMIT}
+      - nix-build --no-build-output --option log-lines 100 --argstr target x86_64-unknown-linux-musl --arg release false --argstr git_version $DRONE_COMMIT

  - name: unit + func tests
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
    environment:
      GARAGE_TEST_INTEGRATION_EXE: result/bin/garage
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr test.amd64
+      - |
+        nix-build \
+          --no-build-output \
+          --option log-lines 100 \
+          --argstr target x86_64-unknown-linux-musl \
+          --argstr compileMode test
      - ./result/bin/garage_api-*
      - ./result/bin/garage_model-*
      - ./result/bin/garage_rpc-*
@@ -31,11 +73,16 @@ steps:
      - ./result/bin/garage-*
      - ./result/bin/integration-*

-  - name: integration tests
-    image: nixpkgs/nix:nixos-22.05
+  - name: smoke-test
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
+      - nix-build --no-build-output --argstr target x86_64-unknown-linux-musl --arg release false --argstr git_version $DRONE_COMMIT
+      - nix-shell --arg release false --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)

 trigger:
  event:
@@ -45,39 +92,78 @@ trigger:
  - tag
  - cron

+node:
+  nix: 1
+
 ---
 kind: pipeline
 type: docker
-name: release-linux-amd64
+name: release-linux-x86_64

-node:
-  nix-daemon: 1
+volumes:
+- name: nix_store
+  host:
+    path: /var/lib/drone/nix
+- name: nix_config
+  temp: {}
+
+environment:
+  TARGET: x86_64-unknown-linux-musl

 steps:
-  - name: build
-    image: nixpkgs/nix:nixos-22.05
+  - name: setup nix
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr pkgs.amd64.release --argstr git_version ${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
+      - cp nix/nix.conf /etc/nix/nix.conf
+      - nix-build --no-build-output --no-out-link shell.nix -A inputDerivation
+
+  - name: build
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
+    commands:
+      - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT

  - name: integration
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
+      - nix-shell --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)

  - name: push static binary
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: garagehq_aws_access_key_id
      AWS_SECRET_ACCESS_KEY:
        from_secret: garagehq_aws_secret_access_key
-      TARGET: "x86_64-unknown-linux-musl"
    commands:
-      - nix-shell --attr release --run "to_s3"
+      - nix-shell --arg rust false --arg integration false --run "to_s3"

  - name: docker build and publish
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      DOCKER_AUTH:
        from_secret: docker_auth
@@ -88,7 +174,7 @@ steps:
      - mkdir -p /kaniko/.docker
      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
      - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr release --run "to_docker"
+      - nix-shell --arg rust false --arg integration false --run "to_docker"


 trigger:
@@ -96,39 +182,78 @@ trigger:
  - promote
  - cron

+node:
+  nix: 1
+
 ---
 kind: pipeline
 type: docker
-name: release-linux-i386
+name: release-linux-i686

-node:
-  nix-daemon: 1
+volumes:
+- name: nix_store
+  host:
+    path: /var/lib/drone/nix
+- name: nix_config
+  temp: {}
+
+environment:
+  TARGET: i686-unknown-linux-musl

 steps:
-  - name: build
-    image: nixpkgs/nix:nixos-22.05
+  - name: setup nix
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr pkgs.i386.release --argstr git_version ${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
+      - cp nix/nix.conf /etc/nix/nix.conf
+      - nix-build --no-build-output --no-out-link shell.nix -A inputDerivation
+
+  - name: build
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
+    commands:
+      - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT

  - name: integration
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
+      - nix-shell --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)

  - name: push static binary
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: garagehq_aws_access_key_id
      AWS_SECRET_ACCESS_KEY:
        from_secret: garagehq_aws_secret_access_key
-      TARGET: "i686-unknown-linux-musl"
    commands:
-      - nix-shell --attr release --run "to_s3"
+      - nix-shell --arg rust false --arg integration false --run "to_s3"

  - name: docker build and publish
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      DOCKER_AUTH:
        from_secret: docker_auth
@@ -139,41 +264,75 @@ steps:
      - mkdir -p /kaniko/.docker
      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
      - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr release --run "to_docker"
+      - nix-shell --arg rust false --arg integration false --run "to_docker"

 trigger:
  event:
  - promote
  - cron

+node:
+  nix: 1
+
 ---
 kind: pipeline
 type: docker
-name: release-linux-arm64
+name: release-linux-aarch64

-node:
-  nix-daemon: 1
+volumes:
+- name: nix_store
+  host:
+    path: /var/lib/drone/nix
+- name: nix_config
+  temp: {}
+
+environment:
+  TARGET: aarch64-unknown-linux-musl

 steps:
-  - name: build
-    image: nixpkgs/nix:nixos-22.05
+  - name: setup nix
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr pkgs.arm64.release --argstr git_version ${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
+      - cp nix/nix.conf /etc/nix/nix.conf
+      - nix-build --no-build-output --no-out-link ./shell.nix --arg rust false --arg integration false -A inputDerivation
+
+  - name: build
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
+    commands:
+      - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT

  - name: push static binary
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: garagehq_aws_access_key_id
      AWS_SECRET_ACCESS_KEY:
        from_secret: garagehq_aws_secret_access_key
-      TARGET: "aarch64-unknown-linux-musl"
    commands:
-      - nix-shell --attr release --run "to_s3"
+      - nix-shell --arg rust false --arg integration false --run "to_s3"

  - name: docker build and publish
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      DOCKER_AUTH:
        from_secret: docker_auth
@@ -184,41 +343,75 @@ steps:
      - mkdir -p /kaniko/.docker
      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
      - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr release --run "to_docker"
+      - nix-shell --arg rust false --arg integration false --run "to_docker"

 trigger:
  event:
  - promote
  - cron

+node:
+  nix: 1
+
 ---
 kind: pipeline
 type: docker
-name: release-linux-arm
+name: release-linux-armv6l

-node:
-  nix-daemon: 1
+volumes:
+- name: nix_store
+  host:
+    path: /var/lib/drone/nix
+- name: nix_config
+  temp: {}
+
+environment:
+  TARGET: armv6l-unknown-linux-musleabihf

 steps:
-  - name: build
-    image: nixpkgs/nix:nixos-22.05
+  - name: setup nix
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    commands:
-      - nix-build --no-build-output --attr pkgs.arm.release --argstr git_version ${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr rust --run "./script/not-dynamic.sh result/bin/garage"
+      - cp nix/nix.conf /etc/nix/nix.conf
+      - nix-build --no-build-output --no-out-link --arg rust false --arg integration false -A inputDerivation
+
+  - name: build
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
+    commands:
+      - nix-build --no-build-output --argstr target $TARGET --arg release true --argstr git_version $DRONE_COMMIT

  - name: push static binary
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: garagehq_aws_access_key_id
      AWS_SECRET_ACCESS_KEY:
        from_secret: garagehq_aws_secret_access_key
-      TARGET: "armv6l-unknown-linux-musleabihf"
    commands:
-      - nix-shell --attr release --run "to_s3"
+      - nix-shell --arg integration false --arg rust false --run "to_s3"

  - name: docker build and publish
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
+    - name: nix_config
+      path: /etc/nix
    environment:
      DOCKER_AUTH:
        from_secret: docker_auth
@@ -229,24 +422,32 @@ steps:
      - mkdir -p /kaniko/.docker
      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
      - export CONTAINER_TAG=${DRONE_TAG:-$DRONE_COMMIT}
-      - nix-shell --attr release --run "to_docker"
+      - nix-shell --arg rust false --arg integration false --run "to_docker"

 trigger:
  event:
  - promote
  - cron

+node:
+  nix: 1
+
 ---
 kind: pipeline
 type: docker
 name: refresh-release-page

-node:
-  nix-daemon: 1
+volumes:
+- name: nix_store
+  host:
+    path: /var/lib/drone/nix

 steps:
  - name: refresh-index
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-21.05
+    volumes:
+    - name: nix_store
+      path: /nix
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: garagehq_aws_access_key_id
@@ -254,21 +455,24 @@ steps:
        from_secret: garagehq_aws_secret_access_key
    commands:
      - mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf
-      - nix-shell --attr release --run "refresh_index"
+      - nix-shell --arg integration false --arg rust false --run "refresh_index"

 depends_on:
-  - release-linux-amd64
-  - release-linux-i386
-  - release-linux-arm64
-  - release-linux-arm
+  - release-linux-x86_64
+  - release-linux-i686
+  - release-linux-aarch64
+  - release-linux-armv6l

 trigger:
  event:
  - promote
  - cron

+node:
+  nix: 1
+
 ---
 kind: signature
-hmac: fa1f98f327abf88486c0c54984287285a4b951efa3776af9dd33b4d782b50815
+hmac: 3fc19d6f9a3555519c8405e3281b2e74289bb802f644740d5481d53df3a01fa4

 ...
@@ -878,7 +878,7 @@ dependencies = [

 [[package]]
 name = "garage"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "assert-json-diff",
 "async-trait",
@@ -889,10 +889,10 @@ dependencies = [
 "futures",
 "futures-util",
 "garage_api",
- "garage_model 0.7.3",
- "garage_rpc 0.7.3",
- "garage_table 0.7.3",
- "garage_util 0.7.3",
+ "garage_model 0.7.0",
+ "garage_rpc 0.7.0",
+ "garage_table 0.7.0",
+ "garage_util 0.7.0",
 "garage_web",
 "hex",
 "hmac 0.10.1",
@@ -921,7 +921,7 @@ dependencies = [

 [[package]]
 name = "garage_api"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "async-trait",
 "base64",
@@ -933,10 +933,10 @@ dependencies = [
 "futures",
 "futures-util",
 "garage_block",
- "garage_model 0.7.3",
- "garage_rpc 0.7.3",
- "garage_table 0.7.3",
- "garage_util 0.7.3",
+ "garage_model 0.7.0",
+ "garage_rpc 0.7.0",
+ "garage_table 0.7.0",
+ "garage_util 0.7.0",
 "hex",
 "hmac 0.10.1",
 "http",
@@ -966,15 +966,15 @@ dependencies = [

 [[package]]
 name = "garage_block"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_rpc 0.7.3",
- "garage_table 0.7.3",
- "garage_util 0.7.3",
+ "garage_rpc 0.7.0",
+ "garage_table 0.7.0",
+ "garage_util 0.7.0",
 "hex",
 "opentelemetry",
 "rand 0.8.5",
@@ -1014,7 +1014,7 @@ dependencies = [

 [[package]]
 name = "garage_model"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "arc-swap",
 "async-trait",
@@ -1025,9 +1025,9 @@ dependencies = [
 "futures-util",
 "garage_block",
 "garage_model 0.5.1",
- "garage_rpc 0.7.3",
- "garage_table 0.7.3",
- "garage_util 0.7.3",
+ "garage_rpc 0.7.0",
+ "garage_table 0.7.0",
+ "garage_util 0.7.0",
 "hex",
 "netapp 0.4.4",
 "opentelemetry",
@@ -1070,15 +1070,16 @@ dependencies = [

 [[package]]
 name = "garage_rpc"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "arc-swap",
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_util 0.7.3",
+ "garage_util 0.7.0",
 "gethostname",
+ "git-version",
 "hex",
 "hyper",
 "k8s-openapi",
@@ -1123,14 +1124,14 @@ dependencies = [

 [[package]]
 name = "garage_table"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "async-trait",
 "bytes 1.1.0",
 "futures",
 "futures-util",
- "garage_rpc 0.7.3",
- "garage_util 0.7.3",
+ "garage_rpc 0.7.0",
+ "garage_util 0.7.0",
 "hexdump",
 "opentelemetry",
 "rand 0.8.5",
@@ -1170,13 +1171,12 @@ dependencies = [

 [[package]]
 name = "garage_util"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "blake2",
 "chrono",
 "err-derive 0.3.1",
 "futures",
- "git-version",
 "hex",
 "http",
 "hyper",
@@ -1196,14 +1196,14 @@ dependencies = [

 [[package]]
 name = "garage_web"
-version = "0.7.3"
+version = "0.7.0"
 dependencies = [
 "err-derive 0.3.1",
 "futures",
 "garage_api",
- "garage_model 0.7.3",
- "garage_table 0.7.3",
- "garage_util 0.7.3",
+ "garage_model 0.7.0",
+ "garage_table 0.7.0",
+ "garage_util 0.7.0",
 "http",
 "hyper",
 "opentelemetry",
@@ -1582,9 +1582,8 @@ version = "0.1.0"
 dependencies = [
 "base64",
 "clap 3.1.18",
- "garage_util 0.7.3",
+ "garage_util 0.7.0",
 "http",
- "log",
 "rusoto_core",
 "rusoto_credential",
 "rusoto_signature",
@@ -45,14 +45,14 @@ in
 {
  cargo2nixVersion = "0.10.0";
  workspace = {
-    garage_util = rustPackages.unknown.garage_util."0.7.3";
-    garage_rpc = rustPackages.unknown.garage_rpc."0.7.3";
-    garage_table = rustPackages.unknown.garage_table."0.7.3";
-    garage_block = rustPackages.unknown.garage_block."0.7.3";
-    garage_model = rustPackages.unknown.garage_model."0.7.3";
-    garage_api = rustPackages.unknown.garage_api."0.7.3";
-    garage_web = rustPackages.unknown.garage_web."0.7.3";
-    garage = rustPackages.unknown.garage."0.7.3";
+    garage_util = rustPackages.unknown.garage_util."0.7.0";
+    garage_rpc = rustPackages.unknown.garage_rpc."0.7.0";
+    garage_table = rustPackages.unknown.garage_table."0.7.0";
+    garage_block = rustPackages.unknown.garage_block."0.7.0";
+    garage_model = rustPackages.unknown.garage_model."0.7.0";
+    garage_api = rustPackages.unknown.garage_api."0.7.0";
+    garage_web = rustPackages.unknown.garage_web."0.7.0";
+    garage = rustPackages.unknown.garage."0.7.0";
    k2v-client = rustPackages.unknown.k2v-client."0.1.0";
  };
  "registry+https://github.com/rust-lang/crates.io-index".aho-corasick."0.7.18" = overridableMkRustCrate (profileName: rec {
@@ -688,7 +688,7 @@ in
    registry = "registry+https://github.com/rust-lang/crates.io-index";
    src = fetchCratesIo { inherit name version; sha256 = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"; };
    dependencies = {
-      ${ if hostPlatform.config == "aarch64-apple-darwin" || hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" || hostPlatform.config == "aarch64-linux-android" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
+      ${ if hostPlatform.config == "aarch64-linux-android" || hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" || hostPlatform.config == "aarch64-apple-darwin" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
    };
  });
  
@@ -1253,9 +1253,9 @@ in
    };
  });
  
-  "unknown".garage."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/garage");
    features = builtins.concatLists [
@@ -1267,12 +1267,12 @@ in
      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.21" { inherit profileName; };
-      garage_api = rustPackages."unknown".garage_api."0.7.3" { inherit profileName; };
-      garage_model = rustPackages."unknown".garage_model."0.7.3" { inherit profileName; };
-      garage_rpc = rustPackages."unknown".garage_rpc."0.7.3" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.7.3" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
-      garage_web = rustPackages."unknown".garage_web."0.7.3" { inherit profileName; };
+      garage_api = rustPackages."unknown".garage_api."0.7.0" { inherit profileName; };
+      garage_model = rustPackages."unknown".garage_model."0.7.0" { inherit profileName; };
+      garage_rpc = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
+      garage_web = rustPackages."unknown".garage_web."0.7.0" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      sodiumoxide = rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; };
      netapp = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.4.4" { inherit profileName; };
@@ -1305,9 +1305,9 @@ in
    };
  });
  
-  "unknown".garage_api."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_api."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_api";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/api");
    features = builtins.concatLists [
@@ -1323,11 +1323,11 @@ in
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "form_urlencoded" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".form_urlencoded."1.0.1" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "futures" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "futures_util" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.21" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_block" else null } = rustPackages."unknown".garage_block."0.7.3" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_model" else null } = rustPackages."unknown".garage_model."0.7.3" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_rpc" else null } = rustPackages."unknown".garage_rpc."0.7.3" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_table" else null } = rustPackages."unknown".garage_table."0.7.3" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_util" else null } = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_block" else null } = rustPackages."unknown".garage_block."0.7.0" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_model" else null } = rustPackages."unknown".garage_model."0.7.0" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_rpc" else null } = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_table" else null } = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "garage_util" else null } = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "hex" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "hmac" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hmac."0.10.1" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_web" then "http" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.6" { inherit profileName; };
@@ -1356,9 +1356,9 @@ in
    };
  });
  
-  "unknown".garage_block."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_block."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_block";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/block");
    dependencies = {
@@ -1366,9 +1366,9 @@ in
      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.21" { inherit profileName; };
-      garage_rpc = rustPackages."unknown".garage_rpc."0.7.3" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.7.3" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      garage_rpc = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      opentelemetry = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; };
      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; };
@@ -1408,9 +1408,9 @@ in
    };
  });
  
-  "unknown".garage_model."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_model."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_model";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/model");
    features = builtins.concatLists [
@@ -1424,11 +1424,11 @@ in
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "err_derive" else null } = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "futures" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "futures_util" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.21" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_block" else null } = rustPackages."unknown".garage_block."0.7.3" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_block" else null } = rustPackages."unknown".garage_block."0.7.0" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_model_050" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_model."0.5.1" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_rpc" else null } = rustPackages."unknown".garage_rpc."0.7.3" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_table" else null } = rustPackages."unknown".garage_table."0.7.3" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_util" else null } = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_rpc" else null } = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_table" else null } = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "garage_util" else null } = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "hex" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "netapp" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.4.4" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_web" then "opentelemetry" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; };
@@ -1471,9 +1471,9 @@ in
    };
  });
  
-  "unknown".garage_rpc."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_rpc."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_rpc";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/rpc");
    features = builtins.concatLists [
@@ -1489,8 +1489,9 @@ in
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "bytes" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "futures" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "futures_util" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.21" { inherit profileName; };
-      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "garage_util" else null } = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "garage_util" else null } = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "gethostname" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.2.3" { inherit profileName; };
+      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "git_version" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "hex" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_api" || rootFeatures' ? "garage_block" || rootFeatures' ? "garage_model" || rootFeatures' ? "garage_rpc" || rootFeatures' ? "garage_table" || rootFeatures' ? "garage_web" then "hyper" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.18" { inherit profileName; };
      ${ if rootFeatures' ? "garage" || rootFeatures' ? "garage_rpc" then "k8s_openapi" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".k8s-openapi."0.13.1" { inherit profileName; };
@@ -1535,9 +1536,9 @@ in
    };
  });
  
-  "unknown".garage_table."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_table."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_table";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/table");
    dependencies = {
@@ -1545,8 +1546,8 @@ in
      bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
      futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.21" { inherit profileName; };
-      garage_rpc = rustPackages."unknown".garage_rpc."0.7.3" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      garage_rpc = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      hexdump = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; };
      opentelemetry = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; };
      rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; };
@@ -1586,9 +1587,9 @@ in
    };
  });
  
-  "unknown".garage_util."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_util."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_util";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/util");
    features = builtins.concatLists [
@@ -1599,7 +1600,6 @@ in
      chrono = rustPackages."registry+https://github.com/rust-lang/crates.io-index".chrono."0.4.19" { inherit profileName; };
      err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
-      git_version = rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; };
      hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; };
      http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.6" { inherit profileName; };
      hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.18" { inherit profileName; };
@@ -1618,18 +1618,18 @@ in
    };
  });
  
-  "unknown".garage_web."0.7.3" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_web."0.7.0" = overridableMkRustCrate (profileName: rec {
    name = "garage_web";
-    version = "0.7.3";
+    version = "0.7.0";
    registry = "unknown";
    src = fetchCrateLocal (workspaceSrc + "/src/web");
    dependencies = {
      err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; };
      futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.21" { inherit profileName; };
-      garage_api = rustPackages."unknown".garage_api."0.7.3" { inherit profileName; };
-      garage_model = rustPackages."unknown".garage_model."0.7.3" { inherit profileName; };
-      garage_table = rustPackages."unknown".garage_table."0.7.3" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      garage_api = rustPackages."unknown".garage_api."0.7.0" { inherit profileName; };
+      garage_model = rustPackages."unknown".garage_model."0.7.0" { inherit profileName; };
+      garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.6" { inherit profileName; };
      hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.18" { inherit profileName; };
      opentelemetry = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; };
@@ -2115,9 +2115,8 @@ in
    dependencies = {
      base64 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".base64."0.13.0" { inherit profileName; };
      clap = rustPackages."registry+https://github.com/rust-lang/crates.io-index".clap."3.1.18" { inherit profileName; };
-      garage_util = rustPackages."unknown".garage_util."0.7.3" { inherit profileName; };
+      garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; };
      http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.6" { inherit profileName; };
-      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.16" { inherit profileName; };
      rusoto_core = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rusoto_core."0.48.0" { inherit profileName; };
      rusoto_credential = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rusoto_credential."0.48.0" { inherit profileName; };
      rusoto_signature = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rusoto_signature."0.48.0" { inherit profileName; };
@@ -2493,7 +2492,7 @@ in
      [ "os-poll" ]
    ];
    dependencies = {
-      ${ if hostPlatform.parsed.kernel.name == "wasi" || hostPlatform.isUnix then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
+      ${ if hostPlatform.isUnix || hostPlatform.parsed.kernel.name == "wasi" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
      log = rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.16" { inherit profileName; };
      ${ if hostPlatform.isWindows then "miow" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".miow."0.3.7" { inherit profileName; };
      ${ if hostPlatform.isWindows then "ntapi" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".ntapi."0.3.7" { inherit profileName; };
@@ -3484,7 +3483,7 @@ in
    ];
    dependencies = {
      ${ if hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
-      ${ if hostPlatform.parsed.kernel.name == "dragonfly" || hostPlatform.parsed.kernel.name == "freebsd" || hostPlatform.parsed.kernel.name == "illumos" || hostPlatform.parsed.kernel.name == "netbsd" || hostPlatform.parsed.kernel.name == "openbsd" || hostPlatform.parsed.kernel.name == "solaris" || hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" then "once_cell" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".once_cell."1.10.0" { inherit profileName; };
+      ${ if hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "dragonfly" || hostPlatform.parsed.kernel.name == "freebsd" || hostPlatform.parsed.kernel.name == "illumos" || hostPlatform.parsed.kernel.name == "netbsd" || hostPlatform.parsed.kernel.name == "openbsd" || hostPlatform.parsed.kernel.name == "solaris" then "once_cell" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".once_cell."1.10.0" { inherit profileName; };
      ${ if hostPlatform.parsed.cpu.name == "i686" || hostPlatform.parsed.cpu.name == "x86_64" || (hostPlatform.parsed.cpu.name == "aarch64" || hostPlatform.parsed.cpu.name == "armv6l" || hostPlatform.parsed.cpu.name == "armv7l") && (hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "fuchsia" || hostPlatform.parsed.kernel.name == "linux") then "spin" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".spin."0.5.2" { inherit profileName; };
      untrusted = rustPackages."registry+https://github.com/rust-lang/crates.io-index".untrusted."0.7.1" { inherit profileName; };
      ${ if hostPlatform.parsed.cpu.name == "wasm32" && hostPlatform.parsed.vendor.name == "unknown" && hostPlatform.parsed.kernel.name == "unknown" && hostPlatform.parsed.abi.name == "" then "web_sys" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".web-sys."0.3.56" { inherit profileName; };
@@ -4053,7 +4052,7 @@ in
    ];
    dependencies = {
      bitflags = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bitflags."1.3.2" { inherit profileName; };
-      ${ if hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "android" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
+      ${ if hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.121" { inherit profileName; };
      ${ if !(hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "android") then "parking_lot" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".parking_lot."0.11.2" { inherit profileName; };
      ${ if !(hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "android") then "parking_lot_core" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".parking_lot_core."0.8.5" { inherit profileName; };
      static_init_macro = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".static_init_macro."1.0.2" { profileName = "__noProfile"; };
@@ -1,33 +1,148 @@
 {
  system ? builtins.currentSystem,
+  release ? false,
+  target ? "x86_64-unknown-linux-musl",
+  compileMode ? null,
  git_version ? null,
 }:

 with import ./nix/common.nix;

-let 
-  pkgs = import pkgsSrc { };
-  compile = import ./nix/compile.nix;
-  build_debug_and_release = (target: {
-    debug = (compile { inherit target git_version; release = false; }).workspace.garage { compileMode = "build"; }; 
-    release = (compile { inherit target git_version; release = true; }).workspace.garage { compileMode = "build"; }; 
-  });
-  test = (rustPkgs: pkgs.symlinkJoin {
-    name ="garage-tests";
-    paths = builtins.map (key: rustPkgs.workspace.${key} { compileMode = "test"; }) (builtins.attrNames rustPkgs.workspace);
-  });
+let
+  crossSystem = { config = target; };
+in let
+  log = v: builtins.trace v v;

-in {
-  pkgs = {
-    amd64 = build_debug_and_release "x86_64-unknown-linux-musl";
-    i386 = build_debug_and_release "i686-unknown-linux-musl";
-    arm64 = build_debug_and_release "aarch64-unknown-linux-musl";
-    arm = build_debug_and_release "armv6l-unknown-linux-musleabihf";
+  pkgs = import pkgsSrc {
+    inherit system crossSystem;
+    overlays = [ cargo2nixOverlay ];
  };
-  test = {
-    amd64 = test (compile { inherit git_version; target = "x86_64-unknown-linux-musl"; });
+
+
+  /*
+   Rust and Nix triples are not the same. Cargo2nix has a dedicated library
+   to convert Nix triples to Rust ones. We need this conversion as we want to
+   set later options linked to our (rust) target in a generic way. Not only
+   the triple terminology is different, but also the "roles" are named differently.
+   Nix uses a build/host/target terminology where Nix's "host" maps to Cargo's "target".
+  */
+  rustTarget = log (pkgs.rustBuilder.rustLib.rustTriple pkgs.stdenv.hostPlatform);
+
+  /*
+   Cargo2nix is built for rustOverlay which installs Rust from Mozilla releases.
+   We want our own Rust to avoid incompatibilities, like we had with musl 1.2.0.
+   rustc was built with musl < 1.2.0 and nix shipped musl >= 1.2.0 which lead to compilation breakage.
+   So we want a Rust release that is bound to our Nix repository to avoid these problems.
+   See here for more info: https://musl.libc.org/time64.html
+   Because Cargo2nix does not support the Rust environment shipped by NixOS,
+   we emulate the structure of the Rust object created by rustOverlay.
+   In practise, rustOverlay ships rustc+cargo in a single derivation while
+   NixOS ships them in separate ones. We reunite them with symlinkJoin.
+   */
+  rustChannel = pkgs.symlinkJoin {
+    name ="rust-channel";
+    paths = [ 
+      pkgs.rustPlatform.rust.rustc
+      pkgs.rustPlatform.rust.cargo
+    ];
  };
-  clippy = {
-    amd64 = (compile { inherit git_version; compiler = "clippy"; }).workspace.garage { compileMode = "build"; } ;
+
+  /*
+   Cargo2nix provides many overrides by default, you can take inspiration from them:
+   https://github.com/cargo2nix/cargo2nix/blob/master/overlay/overrides.nix
+
+   You can have a complete list of the available options by looking at the overriden object, mkcrate:
+   https://github.com/cargo2nix/cargo2nix/blob/master/overlay/mkcrate.nix
+  */
+  overrides = pkgs.rustBuilder.overrides.all ++ [
+    /*
+     [1] We need to alter Nix hardening to be able to statically compile: PIE,
+     Position Independent Executables seems to be supported only on amd64. Having
+     this flags set either make our executables crash or compile as dynamic on many platforms.
+     In the following section codegenOpts, we reactive it for the supported targets
+     (only amd64 curently) through the `-static-pie` flag. PIE is a feature used
+     by ASLR, which helps mitigate security issues.
+     Learn more about Nix Hardening: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/cc-wrapper/add-hardening.sh
+
+     [2] We want to inject the git version while keeping the build deterministic.
+     As we do not want to consider the .git folder as part of the input source,
+     we ask the user (the CI often) to pass the value to Nix.
+    */
+    (pkgs.rustBuilder.rustLib.makeOverride {
+      name = "garage";
+      overrideAttrs = drv:
+        /* [1] */ { hardeningDisable = [ "pie" ]; }
+        //
+        /* [2] */ (if git_version != null then {
+          preConfigure = ''
+            ${drv.preConfigure or ""}
+            export GIT_VERSION="${git_version}"
+          '';
+        } else {});
+    })
+
+    /*
+     We ship some parts of the code disabled by default by putting them behind a flag.
+     It speeds up the compilation (when the feature is not required) and released crates have less dependency by default (less attack surface, disk space, etc.).
+     But we want to ship these additional features when we release Garage.
+     In the end, we chose to exclude all features from debug builds while putting (all of) them in the release builds.
+     Currently, the only such feature of Garage is kubernetes-discovery from the garage_rpc crate.
+     The experimental feature k2v is also enabled here in all builds.
+    */
+    (pkgs.rustBuilder.rustLib.makeOverride {
+      name = "garage_rpc";
+      overrideArgs = old:
+        {
+          features = if release then [ "kubernetes-discovery" "k2v" ] else [ "k2v" ];
+        };
+    })
+  ];
+
+  packageFun = import ./Cargo.nix;
+
+  /*
+    We compile fully static binaries with musl to simplify deployment on most systems.
+    When possible, we reactivate PIE hardening (see above).
+
+    Also, if you set the RUSTFLAGS environment variable, the following parameters will
+    be ignored.
+
+    For more information on static builds, please refer to Rust's RFC 1721.
+    https://rust-lang.github.io/rfcs/1721-crt-static.html#specifying-dynamicstatic-c-runtime-linkage
+  */
+
+  codegenOpts = {
+   "armv6l-unknown-linux-musleabihf" = [ "target-feature=+crt-static" "link-arg=-static" ]; /* compile as dynamic with static-pie */
+   "aarch64-unknown-linux-musl" = [ "target-feature=+crt-static" "link-arg=-static" ]; /* segfault with static-pie */
+   "i686-unknown-linux-musl" = [ "target-feature=+crt-static" "link-arg=-static" ]; /* segfault with static-pie */
+   "x86_64-unknown-linux-musl" = [ "target-feature=+crt-static" "link-arg=-static-pie" ];
  };
-}
+
+  /*
+   The following definition is not elegant as we use a low level function of Cargo2nix
+   that enables us to pass our custom rustChannel object. We need this low level definition
+   to pass Nix's Rust toolchains instead of Mozilla's one.
+
+   target is mandatory but must be kept to null to allow cargo2nix to set it to the appropriate value
+   for each crate.
+  */ 
+  rustPkgs = pkgs.rustBuilder.makePackageSet {
+    inherit packageFun rustChannel release codegenOpts;
+    packageOverrides = overrides;
+    target = null;
+
+    buildRustPackages = pkgs.buildPackages.rustBuilder.makePackageSet {
+      inherit rustChannel packageFun codegenOpts;
+      packageOverrides = overrides;
+      target = null;
+    };
+  };
+
+
+in
+  if compileMode == "test"
+    then pkgs.symlinkJoin {
+      name ="garage-tests";
+      paths = builtins.map (key: rustPkgs.workspace.${key} { inherit compileMode; }) (builtins.attrNames rustPkgs.workspace);
+    }
+    else rustPkgs.workspace.garage { inherit compileMode; }
@@ -17,61 +17,6 @@ If you still want to use Borg, you can use it with `rclone mount`.

 ## Restic

-Create your key and bucket:
-
-```bash
-garage key new my-key
-garage bucket create backup
-garage bucket allow backup --read --write --key my-key
-```
-
-Then register your Key ID and Secret key in your environment:
-
-```bash
-export AWS_ACCESS_KEY_ID=GKxxx
-export AWS_SECRET_ACCESS_KEY=xxxx
-```
-
-Configure restic from environment too:
-
-```bash
-export RESTIC_REPOSITORY="s3:http://localhost:3900/backups"
-
-echo "Generated password (save it safely): $(openssl rand -base64 32)"
-export RESTIC_PASSWORD=xxx # copy paste your generated password here
-```
-
-Do not forget to save your password safely (in your password manager or print it). It will be needed to decrypt your backups.
-
-Now you can use restic:
-
-```bash
-# Initialize the bucket, must be run once
-restic init
-
-# Backup your PostgreSQL database
-# (We suppose your PostgreSQL daemon is stopped for all commands)
-restic backup /var/lib/postgresql
-
-# Show backup history
-restic snapshots
-
-# Backup again your PostgreSQL database, it will be faster as only changes will be uploaded
-restic backup /var/lib/postgresql
-
-# Show backup history (again)
-restic snapshots
-
-# Restore a backup
-# (79766175 is the ID of the snapshot you want to restore)
-mv /var/lib/postgresql /var/lib/postgresql.broken
-restic restore 79766175 --target /var/lib/postgresql
-```
-
-Restic has way more features than the ones presented here.
-You can discover all of them by accessing its documentation from the link below.
-
-
 *External links:* [Restic Documentation > Amazon S3](https://restic.readthedocs.io/en/stable/030_preparing_a_new_repo.html#amazon-s3)

 ## Duplicity
@@ -10,7 +10,6 @@ metadata_dir = "/var/lib/garage/meta"
 data_dir = "/var/lib/garage/data"

 block_size = 1048576
-block_manager_background_tranquility = 2

 replication_mode = "3"

@@ -48,8 +47,6 @@ root_domain = ".web.garage"

 [admin]
 api_bind_addr = "0.0.0.0:3903"
-metrics_token = "cacce0b2de4bc2d9f5b5fdff551e01ac1496055aed248202d415398987e35f81"
-admin_token = "ae8cb40ea7368bbdbb6430af11cca7da833d3458a5f52086f4e805a570fb5c2a"
 trace_sink = "http://localhost:4317"
 ```

@@ -87,17 +84,6 @@ files will remain available. This however means that chunks from existing files
 will not be deduplicated with chunks from newly uploaded files, meaning you
 might use more storage space that is optimally possible.

-### `block_manager_background_tranquility`
-
-This parameter tunes the activity of the background worker responsible for
-resyncing data blocks between nodes. The higher the tranquility value is set,
-the more the background worker will wait between iterations, meaning the load
-on the system (including network usage between nodes) will be reduced. The
-minimal value for this parameter is `0`, where the background worker will
-allways work at maximal throughput to resynchronize blocks. The default value
-is `2`, where the background worker will try to spend at most 1/3 of its time
-working, and 2/3 sleeping in order to reduce system load.
-
 ### `replication_mode`

 Garage supports the following replication modes:
@@ -340,24 +326,10 @@ Garage has a few administration capabilities, in particular to allow remote moni
 ### `api_bind_addr`

 If specified, Garage will bind an HTTP server to this port and address, on
-which it will listen to requests for administration features.
-See [administration API reference](@/documentation/reference-manual/admin-api.md) to learn more about these features.
-
-### `metrics_token` (since version 0.7.2)
-
-The token for accessing the Metrics endpoint. If this token is not set in
-the config file, the Metrics endpoint can be accessed without access
-control.
-
-You can use any random string for this value. We recommend generating a random token with `openssl rand -hex 32`.
-
-### `admin_token` (since version 0.7.2)
-
-The token for accessing all of the other administration endpoints.  If this
-token is not set in the config file, access to these endpoints is disabled
-entirely.
-
-You can use any random string for this value. We recommend generating a random token with `openssl rand -hex 32`.
+which it will listen to requests for administration features. Currently,
+this endpoint only exposes Garage metrics in the Prometheus format at
+`/metrics`. This endpoint is not authenticated. In the future, bucket and
+access key management might be possible by REST calls to this endpoint.

 ### `trace_sink`

@@ -1,58 +0,0 @@
-+++
-title = "K2V"
-weight = 30
-+++
-
-Starting with version 0.7.2, Garage introduces an optionnal feature, K2V,
-which is an alternative storage API designed to help efficiently store
-many small values in buckets (in opposition to S3 which is more designed
-to store large blobs).
-
-K2V is currently disabled at compile time in all builds, as the
-specification is still subject to changes. To build a Garage version with
-K2V, the Cargo feature flag `k2v` must be activated.  Special builds with
-the `k2v` feature flag enabled can be obtained from our download page under
-"Extra builds": such builds can be identified easily as their tag name ends
-with `-k2v` (example: `v0.7.2-k2v`).
-
-The specification of the K2V API can be found
-[here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/k2v/doc/drafts/k2v-spec.md).
-This document also includes a high-level overview of K2V's design.
-
-The K2V API uses AWSv4 signatures for authentification, same as the S3 API.
-The AWS region used for signature calculation is always the same as the one
-defined for the S3 API in the config file.
-
-## Enabling and using K2V
-
-To enable K2V, download and run a build that has the `k2v` feature flag
-enabled, or produce one yourself. Then, add the following section to your
-configuration file:
-
-```toml
-[k2v_api]
-api_bind_addr = "<ip>:<port>"
-```
-
-Please select a port number that is not already in use by another API
-endpoint (S3 api, admin API) or by the RPC server.
-
-We provide an early-stage K2V client library for Rust which can be imported by adding the following to your `Cargo.toml` file:
-
-```toml
-k2v-client = { git = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git" }
-```
-
-There is also a simple CLI utility which can be built from source in the
-following way:
-
-```sh
-git clone https://git.deuxfleurs.fr/Deuxfleurs/garage.git
-cd garage/src/k2v-client
-cargo build --features cli --bin k2v-cli
-```
-
-The CLI utility is self-documented, run `k2v-cli --help` to learn how to use
-it. There is also a short README.md in the `src/k2v-client` folder with some
-instructions.
-
@@ -3,77 +3,51 @@ title = "S3 Compatibility status"
 weight = 20
 +++

-## DISCLAIMER
+## Endpoint implementation

-**The compatibility list for other platforms is given only for informational
-purposes and based on available documentation.** They are sometimes completed,
-in a best effort approach, with the source code and inputs from maintainers
-when documentation is lacking. We are not proactively monitoring new versions
-of each software: check the modification history to know when the page has been
-updated for the last time. Some entries will be inexact or outdated. For any
-serious decision, you must make your own tests.
-**The official documentation of each project can be accessed by clicking on the
-project name in the column header.**
+All APIs that are missing on Garage will return a 501 Not Implemented.
+Some `x-amz-` headers are not implemented.

-Feel free to open a PR to suggest fixes this table. Minio is missing because they do not provide a public S3 compatibility list.
+*The compatibility list for other platforms is given only for information purposes and based on available documentation. Some entries might be inexact. Feel free to open a PR to fix this table. Minio is missing because they do not provide a public S3 compatibility list.*

-## Update history
-
- 2022-02-07 - First version of this page
- 2022-05-25 - Many Ceph S3 endpoints are not documented but implemented. Following a notification from the Ceph community, we added them.
-
-
-
-## High-level features
+### Features

 | Feature                      | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
-| [signature v2](https://docs.aws.amazon.com/general/latest/gr/signature-version-2.html) (deprecated) | ❌ Missing | ✅ |  ✅ | ✅ | ✅ |
+| [signature v2](https://docs.aws.amazon.com/general/latest/gr/signature-version-2.html) (deprecated) | ❌ Missing | ✅ |  ❌ | ✅ | ✅ |
 | [signature v4](https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html) |  ✅ Implemented |  ✅ |  ✅ | ❌ | ✅ |
 | [URL path-style](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#path-style-access) (eg. `host.tld/bucket/key`) |  ✅ Implemented | ✅ |  ✅ | ❓| ✅ |
 | [URL vhost-style](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#virtual-hosted-style-access) URL (eg. `bucket.host.tld/key`) |  ✅ Implemented | ❌| ✅| ✅ | ✅ |
 | [Presigned URLs](https://docs.aws.amazon.com/AmazonS3/latest/userguide/ShareObjectPreSignedURL.html) |  ✅ Implemented | ❌|  ✅ | ✅ |  ✅(❓) |

-*Note:* OpenIO does not says if it supports presigned URLs. Because it is part
-of signature v4 and they claim they support it without additional precisions,
-we suppose that OpenIO supports presigned URLs.
-
-
-## Endpoint implementation
-
-All endpoints that are missing on Garage will return a 501 Not Implemented.
-Some `x-amz-` headers are not implemented.
+*Note:* OpenIO does not says if it supports presigned URLs. Because it is part of signature v4 and they claim they support it without additional precisions, we suppose that OpenIO supports presigned URLs.

 ### Core endoints

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [CreateBucket](https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html)                 | ✅ Implemented                      | ✅ | ✅ | ✅ | ✅ |
 | [DeleteBucket](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucket.html)                 | ✅ Implemented                      | ✅ |  ✅ | ✅ | ✅ |
 | [GetBucketLocation](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketLocation.html)            | ✅ Implemented                 | ✅ | ✅ | ❌ | ✅ |
 | [HeadBucket](https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadBucket.html)                   | ✅ Implemented                      | ✅ | ✅ |  ✅ | ✅ |
 | [ListBuckets](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html)                  | ✅ Implemented                      | ❌| ✅ | ✅ | ✅ |
-| [HeadObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html)                   | ✅ Implemented                      | ✅ | ✅ | ✅ | ✅ |
-| [CopyObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html)                   | ✅ Implemented                      |  ✅ | ✅ | ✅ | ✅ |
+| [HeadObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html)                   | ✅ Implemented                      | ✅ | ✅ | ✅ | ✅ | 
+| [CopyObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html)                   | ✅ Implemented                      |  ✅ | ✅ | ✅ | ✅ | 
 | [DeleteObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html)                 | ✅ Implemented                      | ✅ | ✅ | ✅ | ✅ |
 | [DeleteObjects](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html)                | ✅ Implemented                      |  ✅  | ✅ | ✅ | ✅ |
 | [GetObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html)                    | ✅ Implemented                      |  ✅ | ✅ | ✅ | ✅ |
 | [ListObjects](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjects.html)                  | ✅ Implemented (see details below)   | ✅ | ✅ |  ✅ | ❌|
-| [ListObjectsV2](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html)                | ✅ Implemented                      | ❌|  ✅  | ❌| ✅ |
-| [PostObject](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOST.html)                  | ✅ Implemented                      | ❌| ✅ | ❌| ❌|
+| [ListObjectsV2](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html)                | ✅ Implemented                      | ❌| ❌| ❌| ✅ |
+| [PostObject](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOST.html) (compatibility API)                   |  ❌ Missing                      | ❌| ✅ | ❌| ❌|
 | [PutObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html)                    | ✅ Implemented                      | ✅ | ✅ | ✅ | ✅ |

-**ListObjects:** Implemented, but there isn't a very good specification of what
-`encoding-type=url` covers so there might be some encoding bugs. In our
-implementation the url-encoded fields are in the same in ListObjects as they
-are in ListObjectsV2.
+**ListObjects:** Implemented, but there isn't a very good specification of what `encoding-type=url` covers so there might be some encoding bugs. In our implementation the url-encoded fields are in the same in ListObjects as they are in ListObjectsV2.

-*Note: Ceph API documentation is incomplete and lacks at least HeadBucket and UploadPartCopy,
-but these endpoints are documented in [Red Hat Ceph Storage - Chapter 2. Ceph Object Gateway and the S3 API](https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/4/html/developer_guide/ceph-object-gateway-and-the-s3-api)*
+*Note: Ceph API documentation is incomplete and miss at least HeadBucket and UploadPartCopy, but these endpoints are documented in [Red Hat Ceph Storage - Chapter 2. Ceph Object Gateway and the S3 API](https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/4/html/developer_guide/ceph-object-gateway-and-the-s3-api)*

 ### Multipart Upload endpoints

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [AbortMultipartUpload](https://docs.aws.amazon.com/AmazonS3/latest/API/API_AbortMultipartUpload.html)         | ✅ Implemented                      |  ✅ | ✅ | ✅ | ✅ |
 | [CompleteMultipartUpload](https://docs.aws.amazon.com/AmazonS3/latest/API/API_CompleteMultipartUpload.html)   | ✅ Implemented (see details below)                      | ✅ | ✅ | ✅ | ✅ |
@@ -88,18 +62,18 @@ For more information, please refer to our [issue tracker](https://git.deuxfleurs

 ### Website endpoints

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [DeleteBucketWebsite](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketWebsite.html)          | ✅ Implemented                      | ❌| ❌| ❌| ❌|
 | [GetBucketWebsite](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketWebsite.html)             | ✅ Implemented                      |  ❌ | ❌| ❌| ❌|
 | [PutBucketWebsite](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketWebsite.html)             | ⚠ Partially implemented (see below)| ❌| ❌| ❌| ❌|
-| [DeleteBucketCors](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketCors.html)             | ✅ Implemented                      |  ❌|  ✅ | ❌| ✅ |
-| [GetBucketCors](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketCors.html)                | ✅ Implemented                      |  ❌ |  ✅ | ❌| ✅ |
-| [PutBucketCors](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketCors.html)                | ✅ Implemented                      | ❌|  ✅ | ❌| ✅ |
+| [DeleteBucketCors](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketCors.html)             | ✅ Implemented                      |  ❌| ❌| ❌| ✅ |
+| [GetBucketCors](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketCors.html)                | ✅ Implemented                      |  ❌ | ❌| ❌| ✅ |
+| [PutBucketCors](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketCors.html)                | ✅ Implemented                      | ❌| ❌| ❌| ✅ |

 **PutBucketWebsite:** Implemented, but only stores the index document suffix and the error document path. Redirects are not supported.

-*Note: Ceph radosgw has some support for static websites but it is different from the Amazon one. It also does not implement its configuration endpoints.*
+*Note: Ceph radosgw has some support for static websites but it is different from Amazon one plus it does not implement its configuration endpoints.*

 ### ACL, Policies endpoints

@@ -107,29 +81,29 @@ Amazon has 2 access control mechanisms in S3: ACL (legacy) and policies (new one
 Garage implements none of them, and has its own system instead, built around a per-access-key-per-bucket logic.
 See Garage CLI reference manual to learn how to use Garage's permission system.

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
-| [DeleteBucketPolicy](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketPolicy.html) | ❌ Missing | ❌|  ✅ | ✅ | ❌|
-| [GetBucketPolicy](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketPolicy.html) | ❌ Missing | ❌|  ✅ | ⚠ | ❌|
-| [GetBucketPolicyStatus](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketPolicyStatus.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
-| [PutBucketPolicy](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketPolicy.html) | ❌ Missing | ❌|  ✅ | ⚠ | ❌|
+| [DeleteBucketPolicy](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketPolicy.html) | ❌ Missing | ❌| ❌| ✅ | ❌|
+| [GetBucketPolicy](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketPolicy.html) | ❌ Missing | ❌| ❌| ⚠ | ❌|
+| [GetBucketPolicyStatus](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketPolicyStatus.html) | ❌ Missing | ❌| ❌| ❌| ❌|
+| [PutBucketPolicy](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketPolicy.html) | ❌ Missing | ❌| ❌| ⚠ | ❌|
 | [GetBucketAcl](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketAcl.html) | ❌ Missing | ✅ | ✅ | ✅ | ✅ |
 | [PutBucketAcl](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketAcl.html) | ❌ Missing | ✅ | ✅ | ✅ | ✅ |
 | [GetObjectAcl](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectAcl.html) | ❌ Missing | ✅ | ✅ | ✅ | ✅ |
 | [PutObjectAcl](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectAcl.html) | ❌ Missing | ✅ | ✅ | ✅ | ✅ |

-*Notes:* Riak CS only supports a subset of the policy configuration.
+*Notes:* Ceph claims that it supports bucket policies but does not implement any Policy endpoints. They probably refer to their own permission system. Riak CS only supports a subset of the policy configuration.

 ### Versioning, Lifecycle endpoints

-Garage does not (yet) support object versioning.
+Garage does not support (yet) object versioning.
 If you need this feature, please [share your use case in our dedicated issue](https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/166).

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [DeleteBucketLifecycle](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketLifecycle.html) | ❌ Missing | ❌| ✅| ❌| ✅|
-| [GetBucketLifecycleConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketLifecycleConfiguration.html) | ❌ Missing | ❌| ✅ | ❌| ✅|
-| [PutBucketLifecycleConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketLifecycleConfiguration.html) | ❌ Missing | ❌| ✅ | ❌| ✅|
+| [GetBucketLifecycleConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketLifecycleConfiguration.html) | ❌ Missing | ❌| ⚠ | ❌| ✅|
+| [PutBucketLifecycleConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketLifecycleConfiguration.html) | ❌ Missing | ❌| ⚠ | ❌| ✅|
 | [GetBucketVersioning](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketVersioning.html)          | ❌ Stub (see below)       | ✅| ✅ | ❌| ✅|
 | [ListObjectVersions](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectVersions.html) | ❌ Missing | ❌| ✅ | ❌| ✅|
 | [PutBucketVersioning](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketVersioning.html) | ❌ Missing | ❌| ✅| ❌| ✅|
@@ -137,65 +111,64 @@ If you need this feature, please [share your use case in our dedicated issue](ht

 **GetBucketVersioning:** Stub implementation (Garage does not yet support versionning so this always returns "versionning not enabled").

+*Note: Ceph only supports `Expiration`, `NoncurrentVersionExpiration` and `AbortIncompleteMultipartUpload` on its Lifecycle endpoints.*
+ 
 ### Replication endpoints

 Please open an issue if you have a use case for replication.

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [DeleteBucketReplication](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketReplication.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
 | [GetBucketReplication](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketReplication.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
 | [PutBucketReplication](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketReplication.html) | ❌ Missing | ❌| ⚠ | ❌| ❌|

-*Note: Ceph documentation briefly says that Ceph supports
-[replication though the S3 API](https://docs.ceph.com/en/latest/radosgw/multisite-sync-policy/#s3-replication-api)
-but with some limitations.
-Additionaly, replication endpoints are not documented in the S3 compatibility page so I don't know what kind of support we can expect.*
+*Note: Ceph documentation briefly says that Ceph supports [replication though the S3 API](https://docs.ceph.com/en/latest/radosgw/multisite-sync-policy/#s3-replication-api) but with some limitations. Additionaly, replication endpoints are not documented in the S3 compatibility page so I don't know what kind of support we can expect.*

 ### Locking objects

 Amazon defines a concept of [object locking](https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-lock.html) that can be achieved either through a Retention period or a Legal hold.

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [GetObjectLegalHold](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectLegalHold.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
 | [PutObjectLegalHold](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectLegalHold.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
 | [GetObjectRetention](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectRetention.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
 | [PutObjectRetention](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectRetention.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
-| [GetObjectLockConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectLockConfiguration.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
-| [PutObjectLockConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectLockConfiguration.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
+| [GetObjectLockConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectLockConfiguration.html) | ❌ Missing | ❌| ❌| ❌| ❌|
+| [PutObjectLockConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectLockConfiguration.html) | ❌ Missing | ❌| ❌| ❌| ❌|

 ### (Server-side) encryption

 We think that you can either encrypt your server partition or do client-side encryption, so we did not implement server-side encryption for Garage.
 Please open an issue if you have a use case.

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
-| [DeleteBucketEncryption](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketEncryption.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
-| [GetBucketEncryption](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketEncryption.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
-| [PutBucketEncryption](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketEncryption.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
+| [DeleteBucketEncryption](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketEncryption.html) | ❌ Missing | ❌| ❌| ❌| ❌|
+| [GetBucketEncryption](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketEncryption.html) | ❌ Missing | ❌| ❌| ❌| ❌|
+| [PutBucketEncryption](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketEncryption.html) | ❌ Missing | ❌| ❌| ❌| ❌|

 ### Misc endpoints

-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [GetBucketNotificationConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketNotificationConfiguration.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
 | [PutBucketNotificationConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketNotificationConfiguration.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
-| [DeleteBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketTagging.html) | ❌ Missing | ❌| ✅ | ❌| ✅ |
-| [GetBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketTagging.html) | ❌ Missing | ❌| ✅ | ❌| ✅ |
-| [PutBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketTagging.html) | ❌ Missing | ❌| ✅ | ❌| ✅ |
-| [DeleteObjectTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjectTagging.html) | ❌ Missing | ❌| ✅ | ❌| ✅ |
-| [GetObjectTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html) | ❌ Missing | ❌| ✅ | ❌| ✅ |
-| [PutObjectTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectTagging.html) | ❌ Missing | ❌| ✅ | ❌| ✅ |
-| [GetObjectTorrent](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTorrent.html) | ❌ Missing | ❌| ✅ | ❌| ❌|
+| [DeleteBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketTagging.html) | ❌ Missing | ❌| ❌| ❌| ✅ |
+| [GetBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketTagging.html) | ❌ Missing | ❌| ❌| ❌| ✅ |
+| [PutBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketTagging.html) | ❌ Missing | ❌| ❌| ❌| ✅ |
+| [DeleteObjectTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjectTagging.html) | ❌ Missing | ❌| ❌| ❌| ✅ |
+| [GetObjectTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html) | ❌ Missing | ❌| ❌| ❌| ✅ |
+| [PutObjectTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectTagging.html) | ❌ Missing | ❌| ❌| ❌| ✅ |
+| [GetObjectTorrent](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTorrent.html) | ❌ Missing | ❌| ❌| ❌| ❌|

 ### Vendor specific endpoints

 <details><summary>Display Amazon specifc endpoints</summary>


-| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
+| Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |  
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
 | [DeleteBucketAnalyticsConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketAnalyticsConfiguration.html) | ❌ Missing | ❌| ❌| ❌| ❌|
 | [DeleteBucketIntelligentTieringConfiguration](https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketIntelligentTieringConfiguration.html) | ❌ Missing | ❌| ❌| ❌| ❌|
@@ -1,53 +1,21 @@
-+++
-title = "Administration API"
-weight = 16
-+++
-
-The Garage administration API is accessible through a dedicated server whose
-listen address is specified in the `[admin]` section of the configuration
-file (see [configuration file
-reference](@/documentation/reference-manual/configuration.md))
-
-**WARNING.** At this point, there is no comittement to stability of the APIs described in this document.
-We will bump the version numbers prefixed to each API endpoint at each time the syntax
-or semantics change, meaning that code that relies on these endpoint will break
-when changes are introduced.
-
-The Garage administration API was introduced in version 0.7.2, this document
-does not apply to older versions of Garage.
-
-
-## Access control
+# Access control

 The admin API uses two different tokens for acces control, that are specified in the config file's `[admin]` section:

- `metrics_token`: the token for accessing the Metrics endpoint (if this token
-  is not set in the config file, the Metrics endpoint can be accessed without
-  access control);
+- `metrics_token`: the token for accessing the Metrics endpoint (if this token is not set in the config file, the Metrics endpoint can be accessed without access control);
+- `admin_token`: the token for accessing all of the other administration endpoints (if this token is not set in the config file, these endpoints can be accessed without access control).

- `admin_token`: the token for accessing all of the other administration
-  endpoints (if this token is not set in the config file, access to these
-  endpoints is disabled entirely).
+# Administration API endpoints

-These tokens are used as simple HTTP bearer tokens. In other words, to
-authenticate access to an admin API endpoint, add the following HTTP header
-to your request:
+## Metrics-related endpoints

-```
-Authorization: Bearer <token>
-```
-
-## Administration API endpoints
-
-### Metrics-related endpoints
-
-#### Metrics `GET /metrics`
+### Metrics `GET /metrics`

 Returns internal Garage metrics in Prometheus format.

-### Cluster operations
+## Cluster operations

-#### GetClusterStatus `GET /v0/status`
+### GetClusterStatus `GET /v0/status`

 Returns the cluster's current status in JSON, including:

@@ -126,7 +94,7 @@ Example response body:
 }
 ```

-#### ConnectClusterNodes `POST /v0/connect`
+### ConnectClusterNodes `POST /v0/connect`

 Instructs this Garage node to connect to other Garage nodes at specified addresses.

@@ -147,16 +115,16 @@ Example response:
 [
 	{
 		"success": true,
-		"error": null
+		"error": null,
 	},
 	{
 		"success": false,
-		"error": "Handshake error"
+		"error": "Handshake error",
 	}
 ]
 ```

-#### GetClusterLayout `GET /v0/layout`
+### GetClusterLayout `GET /v0/layout`

 Returns the cluster's current layout in JSON, including:

@@ -205,7 +173,7 @@ Example response body:
 }
 ```

-#### UpdateClusterLayout `POST /v0/layout`
+### UpdateClusterLayout `POST /v0/layout`

 Send modifications to the cluster layout. These modifications will
 be included in the staged role changes, visible in subsequent calls
@@ -236,7 +204,7 @@ Contrary to the CLI that may update only a subset of the fields
 values must be specified.


-#### ApplyClusterLayout `POST /v0/layout/apply`
+### ApplyClusterLayout `POST /v0/layout/apply`

 Applies to the cluster the layout changes currently registered as
 staged layout changes.
@@ -253,7 +221,7 @@ Similarly to the CLI, the body must include the version of the new layout
 that will be created, which MUST be 1 + the value of the currently
 existing layout in the cluster.

-#### RevertClusterLayout `POST /v0/layout/revert`
+### RevertClusterLayout `POST /v0/layout/revert`

 Clears all of the staged layout changes.

@@ -272,9 +240,9 @@ version number, which MUST be 1 + the value of the currently
 existing layout in the cluster.


-### Access key operations
+## Access key operations

-#### ListKeys `GET /v0/key`
+### ListKeys `GET /v0/key`

 Returns all API access keys in the cluster.

@@ -293,7 +261,7 @@ Example response:
 ]
 ```

-#### CreateKey `POST /v0/key`
+### CreateKey `POST /v0/key`

 Creates a new API access key.

@@ -305,7 +273,7 @@ Request body format:
 }
 ```

-#### ImportKey `POST /v0/key/import`
+### ImportKey `POST /v0/key/import`

 Imports an existing API key.

@@ -319,8 +287,8 @@ Request body format:
 }
 ```

-#### GetKeyInfo `GET /v0/key?id=<acces key id>`
-#### GetKeyInfo `GET /v0/key?search=<pattern>`
+### GetKeyInfo `GET /v0/key?id=<acces key id>`
+### GetKeyInfo `GET /v0/key?search=<pattern>`

 Returns information about the requested API access key.

@@ -391,11 +359,11 @@ Example response:
 }
 ```

-#### DeleteKey `DELETE /v0/key?id=<acces key id>`
+### DeleteKey `DELETE /v0/key?id=<acces key id>`

 Deletes an API access key.

-#### UpdateKey `POST /v0/key?id=<acces key id>`
+### UpdateKey `POST /v0/key?id=<acces key id>`

 Updates information about the specified API access key.

@@ -416,9 +384,9 @@ If they are present, the corresponding modifications are applied to the key, oth
 The possible flags in `allow` and `deny` are: `createBucket`.


-### Bucket operations
+## Bucket operations

-#### ListBuckets `GET /v0/bucket`
+### ListBuckets `GET /v0/bucket`

 Returns all storage buckets in the cluster.

@@ -460,8 +428,8 @@ Example response:
 ]
 ```

-#### GetBucketInfo `GET /v0/bucket?id=<bucket id>`
-#### GetBucketInfo `GET /v0/bucket?globalAlias=<alias>`
+### GetBucketInfo `GET /v0/bucket?id=<bucket id>`
+### GetBucketInfo `GET /v0/bucket?globalAlias=<alias>`

 Returns information about the requested storage bucket.

@@ -494,7 +462,7 @@ Example response:
 }
 ```

-#### CreateBucket `POST /v0/bucket`
+### CreateBucket `POST /v0/bucket`

 Creates a new storage bucket.

@@ -513,11 +481,7 @@ OR
 	"localAlias": {
 		"accessKeyId": "GK31c2f218a2e44f485b94239e",
 		"alias": "NameOfMyBucket",
-		"allow": {
-			"read": true,
-			"write": true,
-			"owner": false
-		}
+		"allPermissions": true
 	}
 }
 ```
@@ -531,16 +495,13 @@ OR
 Creates a new bucket, either with a global alias, a local one,
 or no alias at all.

-Technically, you can also specify both `globalAlias` and `localAlias` and that would create
-two aliases, but I don't see why you would want to do that.
-
-#### DeleteBucket `DELETE /v0/bucket?id=<bucket id>`
+### DeleteBucket `DELETE /v0/bucket?id=<bucket id>`

 Deletes a storage bucket. A bucket cannot be deleted if it is not empty.

 Warning: this will delete all aliases associated with the bucket!

-#### PutBucketWebsite `PUT /v0/bucket/website?id=<bucket id>`
+### PutBucketWebsite `PUT /v0/bucket/website?id=<bucket id>`

 Sets the website configuration for a bucket (this also enables website access for this bucket).

@@ -549,21 +510,21 @@ Request body format:
 ```json
 {
 	"indexDocument": "index.html",
-	"errorDocument": "404.html"
+	"errorDocument": "404.html",
 }
 ```

 The field `errorDocument` is optional, if no error document is set a generic error message is displayed when errors happen.


-#### DeleteBucketWebsite `DELETE /v0/bucket/website?id=<bucket id>`
+### DeleteBucketWebsite `DELETE /v0/bucket/website?id=<bucket id>`

 Deletes the website configuration for a bucket (disables website access for this bucket).


-### Operations on permissions for keys on buckets
+## Operations on permissions for keys on buckets

-#### BucketAllowKey `POST /v0/bucket/allow`
+### BucketAllowKey `POST /v0/bucket/allow`

 Allows a key to do read/write/owner operations on a bucket.

@@ -584,7 +545,7 @@ Request body format:
 Flags in `permissions` which have the value `true` will be activated.
 Other flags will remain unchanged.

-#### BucketDenyKey `POST /v0/bucket/deny`
+### BucketDenyKey `POST /v0/bucket/deny`

 Denies a key from doing read/write/owner operations on a bucket.

@@ -606,21 +567,21 @@ Flags in `permissions` which have the value `true` will be deactivated.
 Other flags will remain unchanged.


-### Operations on bucket aliases
+## Operations on bucket aliases

-#### GlobalAliasBucket `PUT /v0/bucket/alias/global?id=<bucket id>&alias=<global alias>`
+### GlobalAliasBucket `PUT /v0/bucket/alias/global?id=<bucket id>&alias=<global alias>`

 Empty body. Creates a global alias for a bucket.

-#### GlobalUnaliasBucket `DELETE /v0/bucket/alias/global?id=<bucket id>&alias=<global alias>`
+### GlobalUnaliasBucket `DELETE /v0/bucket/alias/global?id=<bucket id>&alias=<global alias>`

 Removes a global alias for a bucket.

-#### LocalAliasBucket `PUT /v0/bucket/alias/local?id=<bucket id>&accessKeyId=<access key ID>&alias=<local alias>`
+### LocalAliasBucket `PUT /v0/bucket/alias/local?id=<bucket id>&accessKeyId=<access key ID>&alias=<local alias>`

 Empty body. Creates a local alias for a bucket in the namespace of a specific access key.

-#### LocalUnaliasBucket `DELETE /v0/bucket/alias/local?id=<bucket id>&accessKeyId<access key ID>&alias=<local alias>`
+### LocalUnaliasBucket `DELETE /v0/bucket/alias/local?id=<bucket id>&accessKeyId<access key ID>&alias=<local alias>`

 Removes a local alias for a bucket in the namespace of a specific access key.

@@ -4,16 +4,18 @@ rec {
   */
  pkgsSrc = fetchTarball {
    # As of 2021-10-04
-    url = "https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
+    url ="https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
    sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
  };
  cargo2nixSrc = fetchGit {
    # As of 2022-03-17
    url = "https://github.com/superboum/cargo2nix";
-    ref = "dedup_propagate";
-    rev = "486675c67249e735dd7eb68e1b9feac9db102be7";
+    ref = "main";
+    rev = "bcbf3ba99e9e01a61eb83a24624419c2dd9dec64";
  };

+
+
  /*
   * Shared objects
   */
@@ -1,226 +0,0 @@
-{
-  system ? builtins.currentSystem,
-  target ? null,
-  compiler ? "rustc",
-  release ? false,
-  git_version ? null,
-}:
-
-with import ./common.nix;
-
-let
-  log = v: builtins.trace v v;
-
-  pkgs = import pkgsSrc {
-    inherit system; 
-    ${ if target == null then null else "crossSystem" } = { config = target; };
-    overlays = [ cargo2nixOverlay ];
-  };
-
-  /*
-   Rust and Nix triples are not the same. Cargo2nix has a dedicated library
-   to convert Nix triples to Rust ones. We need this conversion as we want to
-   set later options linked to our (rust) target in a generic way. Not only
-   the triple terminology is different, but also the "roles" are named differently.
-   Nix uses a build/host/target terminology where Nix's "host" maps to Cargo's "target".
-  */
-  rustTarget = log (pkgs.rustBuilder.rustLib.rustTriple pkgs.stdenv.hostPlatform);
-
-  /*
-   Cargo2nix is built for rustOverlay which installs Rust from Mozilla releases.
-   We want our own Rust to avoid incompatibilities, like we had with musl 1.2.0.
-   rustc was built with musl < 1.2.0 and nix shipped musl >= 1.2.0 which lead to compilation breakage.
-   So we want a Rust release that is bound to our Nix repository to avoid these problems.
-   See here for more info: https://musl.libc.org/time64.html
-   Because Cargo2nix does not support the Rust environment shipped by NixOS,
-   we emulate the structure of the Rust object created by rustOverlay.
-   In practise, rustOverlay ships rustc+cargo in a single derivation while
-   NixOS ships them in separate ones. We reunite them with symlinkJoin.
-   */
-  rustChannel = {
-    rustc = pkgs.symlinkJoin {
-      name = "rust-channel";
-      paths = [ 
-        pkgs.rustPlatform.rust.cargo
-        pkgs.rustPlatform.rust.rustc
-      ];
-    };
-    clippy = pkgs.symlinkJoin {
-      name = "clippy-channel";
-      paths = [ 
-        pkgs.rustPlatform.rust.cargo
-        pkgs.rustPlatform.rust.rustc
-        pkgs.clippy
-      ];
-    };
-  }.${compiler};
-
-  clippyBuilder = pkgs.writeScriptBin "clippy" ''
-    #!${pkgs.stdenv.shell}
-    . ${cargo2nixSrc + "/overlay/utils.sh"}
-    isBuildScript=
-    args=("$@")
-    for i in "''${!args[@]}"; do
-      if [ "xmetadata=" = "x''${args[$i]::9}" ]; then
-        args[$i]=metadata=$NIX_RUST_METADATA
-      elif [ "x--crate-name" = "x''${args[$i]}" ] && [ "xbuild_script_" = "x''${args[$i+1]::13}" ]; then
-        isBuildScript=1
-      fi
-    done
-    if [ "$isBuildScript" ]; then
-      args+=($NIX_RUST_BUILD_LINK_FLAGS)
-    else
-      args+=($NIX_RUST_LINK_FLAGS)
-    fi
-    touch invoke.log
-    echo "''${args[@]}" >>invoke.log
-
-    exec ${rustChannel}/bin/clippy-driver --deny warnings "''${args[@]}"
-  '';
-
-  buildEnv = (drv: {
-    rustc = drv.setBuildEnv;
-    clippy = ''
-      ${drv.setBuildEnv or "" }
-      echo
-      echo --- BUILDING WITH CLIPPY ---
-      echo 
-
-      export RUSTC=${clippyBuilder}/bin/clippy
-    '';
-  }.${compiler});
-
-  /*
-   Cargo2nix provides many overrides by default, you can take inspiration from them:
-   https://github.com/cargo2nix/cargo2nix/blob/master/overlay/overrides.nix
-
-   You can have a complete list of the available options by looking at the overriden object, mkcrate:
-   https://github.com/cargo2nix/cargo2nix/blob/master/overlay/mkcrate.nix
-  */
-  overrides = pkgs.rustBuilder.overrides.all ++ [
-    /*
-     [1] We add some logic to compile our crates with clippy, it provides us many additional lints
-
-     [2] We need to alter Nix hardening to make static binaries: PIE,
-     Position Independent Executables seems to be supported only on amd64. Having
-     this flag set either 1. make our executables crash or 2. compile as dynamic on some platforms.
-     Here, we deactivate it. Later (find `codegenOpts`), we reactivate it for supported targets
-     (only amd64 curently) through the `-static-pie` flag.
-     PIE is a feature used by ASLR, which helps mitigate security issues.
-     Learn more about Nix Hardening at: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/cc-wrapper/add-hardening.sh
-
-     [3] We want to inject the git version while keeping the build deterministic.
-     As we do not want to consider the .git folder as part of the input source,
-     we ask the user (the CI often) to pass the value to Nix.
-
-     [4] We ship some parts of the code disabled by default by putting them behind a flag.
-     It speeds up the compilation (when the feature is not required) and released crates have less dependency by default (less attack surface, disk space, etc.).
-     But we want to ship these additional features when we release Garage.
-     In the end, we chose to exclude all features from debug builds while putting (all of) them in the release builds.
-     Currently, the only feature of Garage is kubernetes-discovery from the garage_rpc crate.
-    */
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage";
-      overrideAttrs = drv: { 
-        /* [1] */ setBuildEnv = (buildEnv drv);
-        /* [2] */ hardeningDisable = [ "pie" ];
-      };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_rpc";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-      overrideArgs = old: {
-        /* [4] */ features = if release then [ "kubernetes-discovery" ] else [];
-      };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_db";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_util";
-      overrideAttrs = drv:
-        (if git_version != null then {
-          /* [3] */ preConfigure = ''
-            ${drv.preConfigure or ""}
-            export GIT_VERSION="${git_version}"
-          '';
-        } else {})
-        // 
-        { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_table";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_block";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_model";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_api";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "garage_web";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-
-    (pkgs.rustBuilder.rustLib.makeOverride {
-      name = "k2v-client";
-      overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); };
-    })
-  ];
-
-  packageFun = import ../Cargo.nix;
-
-  /*
-    We compile fully static binaries with musl to simplify deployment on most systems.
-    When possible, we reactivate PIE hardening (see above).
-
-    Also, if you set the RUSTFLAGS environment variable, the following parameters will
-    be ignored.
-
-    For more information on static builds, please refer to Rust's RFC 1721.
-    https://rust-lang.github.io/rfcs/1721-crt-static.html#specifying-dynamicstatic-c-runtime-linkage
-  */
-
-  codegenOpts = {
-   "armv6l-unknown-linux-musleabihf" = [ "target-feature=+crt-static" "link-arg=-static" ]; /* compile as dynamic with static-pie */
-   "aarch64-unknown-linux-musl" = [ "target-feature=+crt-static" "link-arg=-static" ]; /* segfault with static-pie */
-   "i686-unknown-linux-musl" = [ "target-feature=+crt-static" "link-arg=-static" ]; /* segfault with static-pie */
-   "x86_64-unknown-linux-musl" = [ "target-feature=+crt-static" "link-arg=-static-pie" ];
-  };
-
-in
-  /*
-   The following definition is not elegant as we use a low level function of Cargo2nix
-   that enables us to pass our custom rustChannel object. We need this low level definition
-   to pass Nix's Rust toolchains instead of Mozilla's one.
-
-   target is mandatory but must be kept to null to allow cargo2nix to set it to the appropriate value
-   for each crate.
-  */ 
-  pkgs.rustBuilder.makePackageSet {
-    inherit packageFun rustChannel release codegenOpts;
-    packageOverrides = overrides;
-    target = null;
-
-    buildRustPackages = pkgs.buildPackages.rustBuilder.makePackageSet {
-      inherit rustChannel packageFun codegenOpts;
-      packageOverrides = overrides;
-      target = null;
-    };
-  }
@@ -1,9 +1,4 @@
 substituters = https://cache.nixos.org https://nix.web.deuxfleurs.fr
 trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix.web.deuxfleurs.fr:eTGL6kvaQn6cDR/F9lDYUIP9nCVR/kkshYfLDJf1yKs=
 max-jobs = auto
-cores = 0
-log-lines = 200
-filter-syscalls = false
-sandbox = false
-keep-outputs = true
-keep-derivations = true
+cores = 4
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ "$#" -ne 1 ]; then
-    echo "[fail] usage: $0 binary"
-    exit 2
-fi
-
-if file $1 | grep 'dynamically linked' 2>&1; then
-    echo "[fail] $1 is dynamic"
-    exit 1
-fi
-echo "[ok] $1 is probably static"
@@ -1,5 +1,8 @@
 {
  system ? builtins.currentSystem,
+  rust ? true,
+  integration ? true,
+  release ? true,
 }:

 with import ./nix/common.nix;
@@ -13,59 +16,9 @@ let
  winscp = (import ./nix/winscp.nix) pkgs;

 in
-  {

-    /* --- Rust Shell ---
-     * Use it to compile Garage
-     */
-    rust = pkgs.mkShell {
-      shellHook = ''
-function refresh_toolchain {
-  nix copy \
-    --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/etc/nix/signing-key.sec' \
-    $(nix-store -qR \
-      $(nix-build --quiet --no-build-output --no-out-link nix/toolchain.nix))
-}
-      '';
-
-      nativeBuildInputs = [
-        #pkgs.rustPlatform.rust.rustc
-        pkgs.rustPlatform.rust.cargo
-        #pkgs.clippy
-        pkgs.rustfmt
-        #pkgs.perl
-        #pkgs.protobuf
-        #pkgs.pkg-config
-        #pkgs.openssl
-        pkgs.file
-        #cargo2nix.packages.x86_64-linux.cargo2nix
-      ];
-    };
-
-    /* --- Integration shell ---
-     * Use it to test Garage with common S3 clients
-     */
-    integration = pkgs.mkShell {
-      nativeBuildInputs = [
-        winscp
-        pkgs.s3cmd
-        pkgs.awscli2
-        pkgs.minio-client
-        pkgs.rclone
-        pkgs.socat
-        pkgs.psmisc
-        pkgs.which
-        pkgs.openssl
-        pkgs.curl
-        pkgs.jq
-      ];
-    };
-
-    /* --- Release shell ---
-     * A shell built to make releasing easier
-     */
-    release = pkgs.mkShell {
-      shellHook = ''
+pkgs.mkShell {
+  shellHook = ''
 function to_s3 {
  aws \
      --endpoint-url https://garage.deuxfleurs.fr \
@@ -109,12 +62,45 @@ function refresh_index {
      result/share/_releases.html \
      s3://garagehq.deuxfleurs.fr/
 }
-        '';
-      nativeBuildInputs = [
-        pkgs.awscli2
-        kaniko 
-      ];
-    };
-  }

+function refresh_toolchain {
+  nix copy \
+    --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=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.perl
+     pkgs.protobuf
+     pkgs.pkg-config
+     pkgs.openssl
+     cargo2nix.packages.x86_64-linux.cargo2nix
+    ] else [])
+   ++
+   (if integration then [
+     winscp
+     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 [])
+   ;
+}
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,11 +14,11 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_model = { version = "0.7.3", path = "../model" }
-garage_table = { version = "0.7.3", path = "../table" }
-garage_block = { version = "0.7.3", path = "../block" }
-garage_util = { version = "0.7.3", path = "../util" }
-garage_rpc = { version = "0.7.3", path = "../rpc" }
+garage_model = { version = "0.7.0", path = "../model" }
+garage_table = { version = "0.7.0", path = "../table" }
+garage_block = { version = "0.7.0", path = "../block" }
+garage_util = { version = "0.7.0", path = "../util" }
+garage_rpc = { version = "0.7.0", path = "../rpc" }

 async-trait = "0.1.7"
 base64 = "0.13"
@@ -107,27 +107,17 @@ impl ApiHandler for AdminApiServer {
 		req: Request<Body>,
 		endpoint: Endpoint,
 	) -> Result<Response<Body>, Error> {
-		let expected_auth_header =
-			match endpoint.authorization_type() {
-				Authorization::MetricsToken => self.metrics_token.as_ref(),
-				Authorization::AdminToken => match &self.admin_token {
-					None => return Err(Error::forbidden(
-						"Admin token isn't configured, admin API access is disabled for security.",
-					)),
-					Some(t) => Some(t),
-				},
-			};
+		let expected_auth_header = match endpoint.authorization_type() {
+			Authorization::MetricsToken => self.metrics_token.as_ref(),
+			Authorization::AdminToken => self.admin_token.as_ref(),
+		};

 		if let Some(h) = expected_auth_header {
 			match req.headers().get("Authorization") {
-				None => return Err(Error::forbidden("Authorization token must be provided")),
-				Some(v) => {
-					let authorized = v.to_str().map(|hv| hv.trim() == h).unwrap_or(false);
-					if !authorized {
-						return Err(Error::forbidden("Invalid authorization token provided"));
-					}
-				}
-			}
+				None => Err(Error::forbidden("Authorization token must be provided")),
+				Some(v) if v.to_str().map(|hv| hv == h).unwrap_or(false) => Ok(()),
+				_ => Err(Error::forbidden("Invalid authorization token provided")),
+			}?;
 		}

 		match endpoint {
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};

 use garage_util::crdt::*;
 use garage_util::data::*;
-use garage_util::time::*;
+use garage_util::error::Error as GarageError;

 use garage_table::*;

@@ -18,7 +18,7 @@ use garage_model::permission::*;
 use crate::admin::error::*;
 use crate::admin::key::ApiBucketKeyPerm;
 use crate::common_error::CommonError;
-use crate::helpers::{json_ok_response, parse_json_body};
+use crate::helpers::parse_json_body;

 pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let buckets = garage
@@ -59,7 +59,10 @@ pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>,
 		})
 		.collect::<Vec<_>>();

-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 #[derive(Serialize)]
@@ -193,7 +196,10 @@ async fn bucket_info_results(
 				.collect::<Vec<_>>(),
 		};

-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 #[derive(Serialize)]
@@ -277,19 +283,13 @@ pub async fn handle_create_bucket(
 			.bucket_helper()
 			.set_local_bucket_alias(bucket.id, &la.access_key_id, &la.alias)
 			.await?;
-
-		if la.allow.read || la.allow.write || la.allow.owner {
+		if la.all_permissions {
 			garage
 				.bucket_helper()
 				.set_bucket_key_permissions(
 					bucket.id,
 					&la.access_key_id,
-					BucketKeyPerm {
-						timestamp: now_msec(),
-						allow_read: la.allow.read,
-						allow_write: la.allow.write,
-						allow_owner: la.allow.owner,
-					},
+					BucketKeyPerm::ALL_PERMISSIONS,
 				)
 				.await?;
 		}
@@ -311,7 +311,7 @@ struct CreateBucketLocalAlias {
 	access_key_id: String,
 	alias: String,
 	#[serde(default)]
-	allow: ApiBucketKeyPerm,
+	all_permissions: bool,
 }

 pub async fn handle_delete_bucket(
@@ -7,13 +7,14 @@ use serde::{Deserialize, Serialize};

 use garage_util::crdt::*;
 use garage_util::data::*;
+use garage_util::error::Error as GarageError;

 use garage_rpc::layout::*;

 use garage_model::garage::Garage;

 use crate::admin::error::*;
-use crate::helpers::{json_ok_response, parse_json_body};
+use crate::helpers::parse_json_body;

 pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let res = GetClusterStatusResponse {
@@ -38,7 +39,10 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<
 		layout: get_cluster_layout(garage),
 	};

-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 pub async fn handle_connect_cluster_nodes(
@@ -62,13 +66,18 @@ pub async fn handle_connect_cluster_nodes(
 		})
 		.collect::<Vec<_>>();

-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 pub async fn handle_get_cluster_layout(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let res = get_cluster_layout(garage);
-
-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 fn get_cluster_layout(garage: &Arc<Garage>) -> GetClusterLayoutResponse {
@@ -72,9 +72,8 @@ impl ApiError for Error {
 		}
 	}

-	fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
-		use hyper::header;
-		header_map.append(header::CONTENT_TYPE, "application/json".parse().unwrap());
+	fn add_http_headers(&self, _header_map: &mut HeaderMap<HeaderValue>) {
+		// nothing
 	}

 	fn http_body(&self, garage_region: &str, path: &str) -> Body {
@@ -4,13 +4,15 @@ use std::sync::Arc;
 use hyper::{Body, Request, Response, StatusCode};
 use serde::{Deserialize, Serialize};

+use garage_util::error::Error as GarageError;
+
 use garage_table::*;

 use garage_model::garage::Garage;
 use garage_model::key_table::*;

 use crate::admin::error::*;
-use crate::helpers::{json_ok_response, parse_json_body};
+use crate::helpers::parse_json_body;

 pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
 	let res = garage
@@ -30,7 +32,10 @@ pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Er
 		})
 		.collect::<Vec<_>>();

-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 #[derive(Serialize)]
@@ -216,7 +221,10 @@ async fn key_info_results(garage: &Arc<Garage>, key: Key) -> Result<Response<Bod
 			.collect::<Vec<_>>(),
 	};

-	Ok(json_ok_response(&res)?)
+	let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
+	Ok(Response::builder()
+		.status(StatusCode::OK)
+		.body(Body::from(resp_json))?)
 }

 #[derive(Serialize)]
@@ -150,7 +150,9 @@ impl<A: ApiHandler> ApiServer<A> {
 			}
 			Err(e) => {
 				let body: Body = e.http_body(&self.region, uri.path());
-				let mut http_error_builder = Response::builder().status(e.http_status_code());
+				let mut http_error_builder = Response::builder()
+					.status(e.http_status_code())
+					.header("Content-Type", "application/xml");

 				if let Some(header_map) = http_error_builder.headers_mut() {
 					e.add_http_headers(header_map)
@@ -1,4 +1,4 @@
-use hyper::{Body, Request, Response};
+use hyper::{Body, Request};
 use idna::domain_to_unicode;
 use serde::{Deserialize, Serialize};

@@ -144,14 +144,6 @@ pub async fn parse_json_body<T: for<'de> Deserialize<'de>>(req: Request<Body>) -
 	Ok(resp)
 }

-pub fn json_ok_response<T: Serialize>(res: &T) -> Result<Response<Body>, Error> {
-	let resp_json = serde_json::to_string_pretty(res).map_err(garage_util::error::Error::from)?;
-	Ok(Response::builder()
-		.status(hyper::StatusCode::OK)
-		.header(http::header::CONTENT_TYPE, "application/json")
-		.body(Body::from(resp_json))?)
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -110,9 +110,8 @@ impl ApiError for Error {
 		}
 	}

-	fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
-		use hyper::header;
-		header_map.append(header::CONTENT_TYPE, "application/json".parse().unwrap());
+	fn add_http_headers(&self, _header_map: &mut HeaderMap<HeaderValue>) {
+		// nothing
 	}

 	fn http_body(&self, garage_region: &str, path: &str) -> Body {
@@ -172,9 +172,6 @@ impl ApiError for Error {

 	fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
 		use hyper::header;
-
-		header_map.append(header::CONTENT_TYPE, "application/xml".parse().unwrap());
-
 		#[allow(clippy::single_match)]
 		match self {
 			Error::InvalidRange((_, len)) => {
@@ -1,6 +1,6 @@
 [package]
 name = "garage_block"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,9 +14,9 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_rpc = { version = "0.7.3", path = "../rpc" }
-garage_util = { version = "0.7.3", path = "../util" }
-garage_table = { version = "0.7.3", path = "../table" }
+garage_rpc = { version = "0.7.0", path = "../rpc" }
+garage_util = { version = "0.7.0", path = "../util" }
+garage_table = { version = "0.7.0", path = "../table" }

 opentelemetry = "0.17"

@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -21,12 +21,12 @@ path = "tests/lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_api = { version = "0.7.3", path = "../api" }
-garage_model = { version = "0.7.3", path = "../model" }
-garage_rpc = { version = "0.7.3", path = "../rpc" }
-garage_table = { version = "0.7.3", path = "../table" }
-garage_util = { version = "0.7.3", path = "../util" }
-garage_web = { version = "0.7.3", path = "../web" }
+garage_api = { version = "0.7.0", path = "../api" }
+garage_model = { version = "0.7.0", path = "../model" }
+garage_rpc = { version = "0.7.0", path = "../rpc" }
+garage_table = { version = "0.7.0", path = "../table" }
+garage_util = { version = "0.7.0", path = "../util" }
+garage_web = { version = "0.7.0", path = "../web" }

 bytes = "1.0"
 hex = "0.4"
@@ -1,56 +1,55 @@
 use serde::{Deserialize, Serialize};

-use garage_util::version;
 use structopt::StructOpt;

 #[derive(StructOpt, Debug)]
 pub enum Command {
 	/// Run Garage server
-	#[structopt(name = "server", version = version::garage())]
+	#[structopt(name = "server")]
 	Server,

 	/// Get network status
-	#[structopt(name = "status", version = version::garage())]
+	#[structopt(name = "status")]
 	Status,

 	/// Operations on individual Garage nodes
-	#[structopt(name = "node", version = version::garage())]
+	#[structopt(name = "node")]
 	Node(NodeOperation),

 	/// Operations on the assignation of node roles in the cluster layout
-	#[structopt(name = "layout", version = version::garage())]
+	#[structopt(name = "layout")]
 	Layout(LayoutOperation),

 	/// Operations on buckets
-	#[structopt(name = "bucket", version = version::garage())]
+	#[structopt(name = "bucket")]
 	Bucket(BucketOperation),

 	/// Operations on S3 access keys
-	#[structopt(name = "key", version = version::garage())]
+	#[structopt(name = "key")]
 	Key(KeyOperation),

 	/// Run migrations from previous Garage version
 	/// (DO NOT USE WITHOUT READING FULL DOCUMENTATION)
-	#[structopt(name = "migrate", version = version::garage())]
+	#[structopt(name = "migrate")]
 	Migrate(MigrateOpt),

-	/// Start repair of node data on remote node
-	#[structopt(name = "repair", version = version::garage())]
+	/// Start repair of node data
+	#[structopt(name = "repair")]
 	Repair(RepairOpt),

 	/// Gather node statistics
-	#[structopt(name = "stats", version = version::garage())]
+	#[structopt(name = "stats")]
 	Stats(StatsOpt),
 }

 #[derive(StructOpt, Debug)]
 pub enum NodeOperation {
 	/// Print identifier (public key) of this Garage node
-	#[structopt(name = "id", version = version::garage())]
+	#[structopt(name = "id")]
 	NodeId(NodeIdOpt),

 	/// Connect to Garage node that is currently isolated from the system
-	#[structopt(name = "connect", version = version::garage())]
+	#[structopt(name = "connect")]
 	Connect(ConnectNodeOpt),
 }

@@ -71,23 +70,23 @@ pub struct ConnectNodeOpt {
 #[derive(StructOpt, Debug)]
 pub enum LayoutOperation {
 	/// Assign role to Garage node
-	#[structopt(name = "assign", version = version::garage())]
+	#[structopt(name = "assign")]
 	Assign(AssignRoleOpt),

 	/// Remove role from Garage cluster node
-	#[structopt(name = "remove", version = version::garage())]
+	#[structopt(name = "remove")]
 	Remove(RemoveRoleOpt),

 	/// Show roles currently assigned to nodes and changes staged for commit
-	#[structopt(name = "show", version = version::garage())]
+	#[structopt(name = "show")]
 	Show,

 	/// Apply staged changes to cluster layout
-	#[structopt(name = "apply", version = version::garage())]
+	#[structopt(name = "apply")]
 	Apply(ApplyLayoutOpt),

 	/// Revert staged changes to cluster layout
-	#[structopt(name = "revert", version = version::garage())]
+	#[structopt(name = "revert")]
 	Revert(RevertLayoutOpt),
 }

@@ -142,39 +141,39 @@ pub struct RevertLayoutOpt {
 #[derive(Serialize, Deserialize, StructOpt, Debug)]
 pub enum BucketOperation {
 	/// List buckets
-	#[structopt(name = "list", version = version::garage())]
+	#[structopt(name = "list")]
 	List,

 	/// Get bucket info
-	#[structopt(name = "info", version = version::garage())]
+	#[structopt(name = "info")]
 	Info(BucketOpt),

 	/// Create bucket
-	#[structopt(name = "create", version = version::garage())]
+	#[structopt(name = "create")]
 	Create(BucketOpt),

 	/// Delete bucket
-	#[structopt(name = "delete", version = version::garage())]
+	#[structopt(name = "delete")]
 	Delete(DeleteBucketOpt),

 	/// Alias bucket under new name
-	#[structopt(name = "alias", version = version::garage())]
+	#[structopt(name = "alias")]
 	Alias(AliasBucketOpt),

 	/// Remove bucket alias
-	#[structopt(name = "unalias", version = version::garage())]
+	#[structopt(name = "unalias")]
 	Unalias(UnaliasBucketOpt),

 	/// Allow key to read or write to bucket
-	#[structopt(name = "allow", version = version::garage())]
+	#[structopt(name = "allow")]
 	Allow(PermBucketOpt),

 	/// Deny key from reading or writing to bucket
-	#[structopt(name = "deny", version = version::garage())]
+	#[structopt(name = "deny")]
 	Deny(PermBucketOpt),

 	/// Expose as website or not
-	#[structopt(name = "website", version = version::garage())]
+	#[structopt(name = "website")]
 	Website(WebsiteOpt),
 }

@@ -265,35 +264,35 @@ pub struct PermBucketOpt {
 #[derive(Serialize, Deserialize, StructOpt, Debug)]
 pub enum KeyOperation {
 	/// List keys
-	#[structopt(name = "list", version = version::garage())]
+	#[structopt(name = "list")]
 	List,

 	/// Get key info
-	#[structopt(name = "info", version = version::garage())]
+	#[structopt(name = "info")]
 	Info(KeyOpt),

 	/// Create new key
-	#[structopt(name = "new", version = version::garage())]
+	#[structopt(name = "new")]
 	New(KeyNewOpt),

 	/// Rename key
-	#[structopt(name = "rename", version = version::garage())]
+	#[structopt(name = "rename")]
 	Rename(KeyRenameOpt),

 	/// Delete key
-	#[structopt(name = "delete", version = version::garage())]
+	#[structopt(name = "delete")]
 	Delete(KeyDeleteOpt),

 	/// Set permission flags for key
-	#[structopt(name = "allow", version = version::garage())]
+	#[structopt(name = "allow")]
 	Allow(KeyPermOpt),

 	/// Unset permission flags for key
-	#[structopt(name = "deny", version = version::garage())]
+	#[structopt(name = "deny")]
 	Deny(KeyPermOpt),

 	/// Import key
-	#[structopt(name = "import", version = version::garage())]
+	#[structopt(name = "import")]
 	Import(KeyImportOpt),
 }

@@ -365,7 +364,7 @@ pub struct MigrateOpt {
 #[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
 pub enum MigrateWhat {
 	/// Migrate buckets and permissions from v0.5.0
-	#[structopt(name = "buckets050", version = version::garage())]
+	#[structopt(name = "buckets050")]
 	Buckets050,
 }

@@ -386,19 +385,19 @@ pub struct RepairOpt {
 #[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
 pub enum RepairWhat {
 	/// Only do a full sync of metadata tables
-	#[structopt(name = "tables", version = version::garage())]
+	#[structopt(name = "tables")]
 	Tables,
 	/// Only repair (resync/rebalance) the set of stored blocks
-	#[structopt(name = "blocks", version = version::garage())]
+	#[structopt(name = "blocks")]
 	Blocks,
 	/// Only redo the propagation of object deletions to the version table (slow)
-	#[structopt(name = "versions", version = version::garage())]
+	#[structopt(name = "versions")]
 	Versions,
 	/// Only redo the propagation of version deletions to the block ref table (extremely slow)
-	#[structopt(name = "block_refs", version = version::garage())]
+	#[structopt(name = "block_refs")]
 	BlockRefs,
 	/// Verify integrity of all blocks on disc (extremely slow, i/o intensive)
-	#[structopt(name = "scrub", version = version::garage())]
+	#[structopt(name = "scrub")]
 	Scrub {
 		/// Tranquility factor (see tranquilizer documentation)
 		#[structopt(name = "tranquility", default_value = "2")]
@@ -22,7 +22,6 @@ use garage_util::error::*;

 use garage_rpc::system::*;
 use garage_rpc::*;
-use garage_util::version;

 use garage_model::helper::error::Error as HelperError;

@@ -30,7 +29,7 @@ use admin::*;
 use cli::*;

 #[derive(StructOpt, Debug)]
-#[structopt(name = "garage", version = version::garage(), about = "S3-compatible object store for self-hosted geo-distributed deployments")]
+#[structopt(name = "garage")]
 struct Opt {
 	/// Host to connect to for admin operations, in the format:
 	/// <public-key>@<ip>:<port>
@@ -6,7 +6,6 @@ edition = "2018"
 [dependencies]
 base64 = "0.13.0"
 http = "0.2.6"
-log = "0.4"
 rusoto_core = "0.48.0"
 rusoto_credential = "0.48.0"
 rusoto_signature = "0.48.0"
@@ -23,10 +22,6 @@ garage_util = { path = "../util", optional = true }
 [features]
 cli = ["clap", "tokio/fs", "tokio/io-std", "garage_util"]

-[lib]
-path = "lib.rs"
-
 [[bin]]
 name = "k2v-cli"
-path = "bin/k2v-cli.rs"
 required-features = ["cli"]
@@ -5,13 +5,6 @@ use thiserror::Error;
 /// Errors returned by this crate
 #[derive(Error, Debug)]
 pub enum Error {
-	#[error("{0}, {1}: {2} (path = {3})")]
-	Remote(
-		http::StatusCode,
-		Cow<'static, str>,
-		Cow<'static, str>,
-		Cow<'static, str>,
-	),
 	#[error("received invalid response: {0}")]
 	InvalidResponse(Cow<'static, str>),
 	#[error("not found")]
@@ -4,7 +4,6 @@ use std::time::Duration;
 use http::header::{ACCEPT, CONTENT_LENGTH, CONTENT_TYPE};
 use http::status::StatusCode;
 use http::HeaderMap;
-use log::{debug, error};

 use rusoto_core::{ByteStream, DispatchSignedRequest, HttpClient};
 use rusoto_credential::AwsCredentials;
@@ -311,47 +310,12 @@ impl K2vClient {
 			StatusCode::NO_CONTENT => Vec::new(),
 			StatusCode::NOT_FOUND => return Err(Error::NotFound),
 			StatusCode::NOT_MODIFIED => Vec::new(),
-			s => {
-				let err_body = read_body(&mut res.headers, res.body)
-					.await
-					.unwrap_or_default();
-				let err_body_str = std::str::from_utf8(&err_body)
-					.map(String::from)
-					.unwrap_or_else(|_| base64::encode(&err_body));
-
-				if s.is_client_error() || s.is_server_error() {
-					error!("Error response {}: {}", res.status, err_body_str);
-					let err = match serde_json::from_slice::<ErrorResponse>(&err_body) {
-						Ok(err) => Error::Remote(
-							res.status,
-							err.code.into(),
-							err.message.into(),
-							err.path.into(),
-						),
-						Err(_) => Error::Remote(
-							res.status,
-							"unknown".into(),
-							err_body_str.into(),
-							"?".into(),
-						),
-					};
-					return Err(err);
-				} else {
-					let msg = format!(
-						"Unexpected response code {}. Response body: {}",
-						res.status, err_body_str
-					);
-					error!("{}", msg);
-					return Err(Error::InvalidResponse(msg.into()));
-				}
+			_ => {
+				return Err(Error::InvalidResponse(
+					format!("invalid error code: {}", res.status).into(),
+				))
 			}
 		};
-		debug!(
-			"Response body: {}",
-			std::str::from_utf8(&body)
-				.map(String::from)
-				.unwrap_or_else(|_| base64::encode(&body))
-		);

 		Ok(Response {
 			body,
@@ -594,15 +558,6 @@ struct BatchDeleteResponse<'a> {
 	deleted_items: u64,
 }

-#[derive(Deserialize)]
-struct ErrorResponse {
-	code: String,
-	message: String,
-	#[allow(dead_code)]
-	region: String,
-	path: String,
-}
-
 struct Response {
 	body: Vec<u8>,
 	status: StatusCode,
@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,10 +14,10 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_rpc = { version = "0.7.3", path = "../rpc" }
-garage_table = { version = "0.7.3", path = "../table" }
-garage_block = { version = "0.7.3", path = "../block" }
-garage_util = { version = "0.7.3", path = "../util" }
+garage_rpc = { version = "0.7.0", path = "../rpc" }
+garage_table = { version = "0.7.0", path = "../table" }
+garage_block = { version = "0.7.0", path = "../block" }
+garage_util = { version = "0.7.0", path = "../util" }
 garage_model_050 = { package = "garage_model", version = "0.5.1" }

 async-trait = "0.1.7"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_rpc"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,11 +14,12 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_util = { version = "0.7.3", path = "../util" }
+garage_util = { version = "0.7.0", path = "../util" }

 arc-swap = "1.0"
 bytes = "1.0"
 gethostname = "0.2"
+git-version = "0.3.4"
 hex = "0.4"
 tracing = "0.1.30"
 rand = "0.8"
@@ -27,7 +27,6 @@ use garage_util::data::*;
 use garage_util::error::*;
 use garage_util::persister::Persister;
 use garage_util::time::*;
-use garage_util::version;

 use crate::consul::*;
 #[cfg(feature = "kubernetes-discovery")]
@@ -317,7 +316,11 @@ impl System {
 	//      also available through RPC) ----

 	pub fn garage_version(&self) -> &'static str {
-		version::garage()
+		option_env!("GIT_VERSION").unwrap_or(git_version::git_version!(
+			prefix = "git:",
+			cargo_prefix = "cargo:",
+			fallback = "unknown"
+		))
 	}

 	pub fn get_known_nodes(&self) -> Vec<KnownNodeInfo> {
@@ -1,6 +1,6 @@
 [package]
 name = "garage_table"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,8 +14,8 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_rpc = { version = "0.7.3", path = "../rpc" }
-garage_util = { version = "0.7.3", path = "../util" }
+garage_rpc = { version = "0.7.0", path = "../rpc" }
+garage_util = { version = "0.7.0", path = "../util" }

 opentelemetry = "0.17"

@@ -1,6 +1,6 @@
 [package]
 name = "garage_util"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -21,7 +21,6 @@ hex = "0.4"
 tracing = "0.1.30"
 rand = "0.8"
 sha2 = "0.9"
-git-version = "0.3.4"

 sled = "0.34"

@@ -43,6 +42,5 @@ hyper = "0.14"

 opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] }

-
 [features]
 k2v = []
@@ -15,4 +15,3 @@ pub mod sled_counter;
 pub mod time;
 pub mod token_bucket;
 pub mod tranquilizer;
-pub mod version;
@@ -1,7 +0,0 @@
-pub fn garage() -> &'static str {
-	option_env!("GIT_VERSION").unwrap_or(git_version::git_version!(
-		prefix = "git:",
-		cargo_prefix = "cargo:",
-		fallback = "unknown"
-	))
-}
@@ -1,6 +1,6 @@
 [package]
 name = "garage_web"
-version = "0.7.3"
+version = "0.7.0"
 authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,10 +14,10 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-garage_api = { version = "0.7.3", path = "../api" }
-garage_model = { version = "0.7.3", path = "../model" }
-garage_util = { version = "0.7.3", path = "../util" }
-garage_table = { version = "0.7.3", path = "../table" }
+garage_api = { version = "0.7.0", path = "../api" }
+garage_model = { version = "0.7.0", path = "../model" }
+garage_util = { version = "0.7.0", path = "../util" }
+garage_table = { version = "0.7.0", path = "../table" }

 err-derive = "0.3"
 tracing = "0.1.30"
Author	SHA1	Message	Date
Alex Auvolat	a63a51e032	Enable k2v feature flag in CI	2022-05-20 21:15:09 +02:00
Alex Auvolat	99976e11f8	Merge branch 'main' into admin-api	2022-05-18 22:35:49 +02:00
Alex Auvolat	5367f8adb2	Refactor bucket emptiness check and add k2v check	2022-05-18 10:09:51 +02:00
Alex Auvolat	30e393b439	Fix fmt	2022-05-18 00:32:51 +02:00
Alex Auvolat	926b3c0fad	Rename error varian for Clippy	2022-05-18 00:27:57 +02:00
Alex Auvolat	dcfa408887	Implement ImportKey	2022-05-17 19:02:13 +02:00
Alex Auvolat	70383b4363	Implement ConnectClusterNodes	2022-05-17 18:43:47 +02:00
Alex Auvolat	440a577563	Prefix all APIs with `v0/`	2022-05-17 17:51:38 +02:00
Alex Auvolat	5072dbd228	Add PutBucketWebsite and DeleteBucketWebsite to admin api	2022-05-17 17:44:00 +02:00
Alex Auvolat	2ce3513c10	Specify and implement {Global,Local}{Alias,Unalias}Bucket	2022-05-17 17:16:29 +02:00
Alex Auvolat	e92c52eb65	refactor	2022-05-17 17:02:38 +02:00
Alex Auvolat	8b1338ef2f	Fix error code	2022-05-17 16:48:23 +02:00
Alex Auvolat	8ff95f09c9	Return website config in GetBucketInfo, use serde(rename_all)	2022-05-17 16:42:13 +02:00
Alex Auvolat	86a3fe8ec5	Merge branch 'main' into admin-api	2022-05-17 13:10:53 +02:00
Alex Auvolat	ec50ffac42	Remove useless string conversions	2022-05-13 19:49:04 +02:00
Alex Auvolat	d7736cb614	Revert useless thing	2022-05-13 19:43:40 +02:00
Alex Auvolat	8033bdb0b4	More precisions in errors & small refactoring	2022-05-13 19:36:17 +02:00
Alex Auvolat	5a535788fc	Json body for custom errors	2022-05-13 19:28:23 +02:00
Alex Auvolat	ea325d78d3	More error refactoring	2022-05-13 19:18:51 +02:00
Alex Auvolat	ec16d166f9	Separate error types for k2v and signature	2022-05-13 15:43:44 +02:00
Alex Auvolat	7a5d329e49	More error refactoring	2022-05-13 15:21:32 +02:00
Alex Auvolat	f82b938033	Rename error::Error to s3::error::Error	2022-05-13 15:10:52 +02:00
Alex Auvolat	96b11524d5	Error refactoring	2022-05-13 15:04:53 +02:00
Alex Auvolat	c0fb9fd0fe	Common error type and admin error type that uses it	2022-05-13 14:30:30 +02:00
Alex Auvolat	983037d965	Possibility of different error types for different APIs	2022-05-13 13:51:34 +02:00
Alex Auvolat	e4e1f8f0d6	Fix clippy	2022-05-12 17:11:45 +02:00
Alex Auvolat	e7ddba53e3	Slightly more detailed error reporting from helper	2022-05-12 17:10:25 +02:00
Alex Auvolat	ed76893581	Simplify	2022-05-12 11:21:23 +02:00
Alex Auvolat	fc2f73ddb5	BucketAllowKey and BucketDenyKey	2022-05-12 11:19:41 +02:00
Alex Auvolat	fe399a3265	DeleteBucket	2022-05-12 11:02:36 +02:00
Alex Auvolat	de1a5b87b6	CreateBucket	2022-05-12 10:45:09 +02:00
Alex Auvolat	2b93a01d2b	ListBucket and GetBucketInfo	2022-05-12 10:20:34 +02:00
Alex Auvolat	aeb978552a	Short doc on UpdateKey	2022-05-11 11:51:11 +02:00
Alex Auvolat	393b76ecba	Implement CreateKey, DeleteKey and rudimentary UpdateKey	2022-05-11 11:40:26 +02:00
Alex Auvolat	5c00c9fb46	First key endpoints: ListKeys and GetKeyInfo	2022-05-11 11:10:28 +02:00
Alex Auvolat	f97a7845e9	Add API access key admin endpoints	2022-05-11 10:27:40 +02:00
Alex Auvolat	bb6ec9ebd9	Update Cargo.nix and improve log message	2022-05-10 13:36:35 +02:00
Alex Auvolat	dd54d0b2b1	Refactor code for apply/revert, implement Update/Apply/RevertLayout	2022-05-10 13:25:10 +02:00
Alex Auvolat	01c4876fb4	Specify remaining cluster-related endpoints	2022-05-10 13:25:10 +02:00
Alex Auvolat	e4c61124d8	Add first draft of admin api	2022-05-10 13:25:10 +02:00
Alex Auvolat	ec03e3d16c	Fmt & cleanup	2022-05-10 13:25:10 +02:00
Alex Auvolat	7a19daafbd	Implement /status Admin endpoint	2022-05-10 13:25:10 +02:00
Alex Auvolat	99fcfa3844	Make background runner terminate correctly	2022-05-10 13:25:10 +02:00
Alex Auvolat	633958c7b1	Refactor admin API to be in api/admin and use common code	2022-05-10 13:25:06 +02:00