style: fix formatting

This commit is contained in:
2026-01-30 23:29:34 +00:00
parent b29a0309d4
commit bbdefff07c
3 changed files with 30 additions and 11 deletions

View File

@@ -50,18 +50,36 @@ pub fn routes() -> Router<Arc<AppState>> {
// Single-segment name routes (e.g., /v2/alpine/...) // Single-segment name routes (e.g., /v2/alpine/...)
.route("/v2/{name}/blobs/{digest}", head(check_blob)) .route("/v2/{name}/blobs/{digest}", head(check_blob))
.route("/v2/{name}/blobs/{digest}", get(download_blob)) .route("/v2/{name}/blobs/{digest}", get(download_blob))
.route("/v2/{name}/blobs/uploads/", axum::routing::post(start_upload)) .route(
.route("/v2/{name}/blobs/uploads/{uuid}", patch(patch_blob).put(upload_blob)) "/v2/{name}/blobs/uploads/",
axum::routing::post(start_upload),
)
.route(
"/v2/{name}/blobs/uploads/{uuid}",
patch(patch_blob).put(upload_blob),
)
.route("/v2/{name}/manifests/{reference}", get(get_manifest)) .route("/v2/{name}/manifests/{reference}", get(get_manifest))
.route("/v2/{name}/manifests/{reference}", put(put_manifest)) .route("/v2/{name}/manifests/{reference}", put(put_manifest))
.route("/v2/{name}/tags/list", get(list_tags)) .route("/v2/{name}/tags/list", get(list_tags))
// Two-segment name routes (e.g., /v2/library/alpine/...) // Two-segment name routes (e.g., /v2/library/alpine/...)
.route("/v2/{ns}/{name}/blobs/{digest}", head(check_blob_ns)) .route("/v2/{ns}/{name}/blobs/{digest}", head(check_blob_ns))
.route("/v2/{ns}/{name}/blobs/{digest}", get(download_blob_ns)) .route("/v2/{ns}/{name}/blobs/{digest}", get(download_blob_ns))
.route("/v2/{ns}/{name}/blobs/uploads/", axum::routing::post(start_upload_ns)) .route(
.route("/v2/{ns}/{name}/blobs/uploads/{uuid}", patch(patch_blob_ns).put(upload_blob_ns)) "/v2/{ns}/{name}/blobs/uploads/",
.route("/v2/{ns}/{name}/manifests/{reference}", get(get_manifest_ns)) axum::routing::post(start_upload_ns),
.route("/v2/{ns}/{name}/manifests/{reference}", put(put_manifest_ns)) )
.route(
"/v2/{ns}/{name}/blobs/uploads/{uuid}",
patch(patch_blob_ns).put(upload_blob_ns),
)
.route(
"/v2/{ns}/{name}/manifests/{reference}",
get(get_manifest_ns),
)
.route(
"/v2/{ns}/{name}/manifests/{reference}",
put(put_manifest_ns),
)
.route("/v2/{ns}/{name}/tags/list", get(list_tags_ns)) .route("/v2/{ns}/{name}/tags/list", get(list_tags_ns))
} }

View File

@@ -67,7 +67,9 @@ impl Storage {
secret_key: Option<&str>, secret_key: Option<&str>,
) -> Self { ) -> Self {
Self { Self {
inner: Arc::new(S3Storage::new(s3_url, bucket, region, access_key, secret_key)), inner: Arc::new(S3Storage::new(
s3_url, bucket, region, access_key, secret_key,
)),
} }
} }

View File

@@ -122,7 +122,8 @@ impl S3Storage {
.header("x-amz-date", &timestamp) .header("x-amz-date", &timestamp)
.header("x-amz-content-sha256", &payload_hash); .header("x-amz-content-sha256", &payload_hash);
if let Some(auth) = self.sign_request(method.as_str(), key, &payload_hash, &timestamp, &date) if let Some(auth) =
self.sign_request(method.as_str(), key, &payload_hash, &timestamp, &date)
{ {
request = request.header("Authorization", auth); request = request.header("Authorization", auth);
} }
@@ -186,9 +187,7 @@ impl StorageBackend for S3Storage {
} }
async fn get(&self, key: &str) -> Result<Bytes> { async fn get(&self, key: &str) -> Result<Bytes> {
let response = self let response = self.signed_request(reqwest::Method::GET, key, None).await?;
.signed_request(reqwest::Method::GET, key, None)
.await?;
if response.status().is_success() { if response.status().is_success() {
response response