Commit ba1d4f7d authored by Nugine's avatar Nugine
Browse files

fix: typos

parent fe47f348

codegen/src/v1/ops.rs

+2 −2
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ fn codegen_op_http_call(op: &Operation) { 
    g!("}}");



    if op.name == "GetObject" {

        g!("let overrided_headers = super::get_object::extract_overrided_response_headers(&s3_req)?;");

        g!("let overridden_headers = super::get_object::extract_overridden_response_headers(&s3_req)?;");

    }



    if op.name == "CompleteMultipartUpload" {
@@ -699,7 +699,7 @@ fn codegen_op_http_call(op: &Operation) { 
        g!("let mut resp = Self::serialize_http(s3_resp.output)?;");



        if op.name == "GetObject" {

            g!("resp.headers.extend(overrided_headers);");

            g!("resp.headers.extend(overridden_headers);");

            g!("super::get_object::merge_custom_headers(&mut resp, s3_resp.headers);");

        } else {

            g!("resp.headers.extend(s3_resp.headers);");

crates/s3s/src/ops/generated.rs

+2 −2
Original line number Diff line number Diff line
@@ -3103,14 +3103,14 @@ impl super::Operation for GetObject { 
        if let Some(access) = ccx.access {

            access.get_object(&mut s3_req).await?;

        }

        let overrided_headers = super::get_object::extract_overrided_response_headers(&s3_req)?;

        let overridden_headers = super::get_object::extract_overridden_response_headers(&s3_req)?;

        let result = s3.get_object(s3_req).await;

        let s3_resp = match result {

            Ok(val) => val,

            Err(err) => return super::serialize_error(err, false),

        };

        let mut resp = Self::serialize_http(s3_resp.output)?;

        resp.headers.extend(overrided_headers);

        resp.headers.extend(overridden_headers);

        super::get_object::merge_custom_headers(&mut resp, s3_resp.headers);

        resp.extensions.extend(s3_resp.extensions);

        Ok(resp)

crates/s3s/src/ops/get_object.rs

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ use hyper::http::HeaderValue; 


use stdx::default::default;



pub fn extract_overrided_response_headers(req: &S3Request<GetObjectInput>) -> S3Result<HeaderMap<HeaderValue>> {

pub fn extract_overridden_response_headers(req: &S3Request<GetObjectInput>) -> S3Result<HeaderMap<HeaderValue>> {

    let mut map: HeaderMap<HeaderValue> = default();



    add(&mut map, header::CONTENT_TYPE, req.input.response_content_type.as_deref())?;
@@ -29,7 +29,7 @@ pub fn extract_overrided_response_headers(req: &S3Request<GetObjectInput>) -> S3 
}



fn add(map: &mut HeaderMap<HeaderValue>, name: HeaderName, value: Option<&str>) -> S3Result<()> {

    let error = |e| invalid_request!(e, "invalid overrided header: {name}: {value:?}");

    let error = |e| invalid_request!(e, "invalid overridden header: {name}: {value:?}");

    if let Some(value) = value {

        let value = value.parse().map_err(error)?;

        map.insert(name, value);
@@ -38,7 +38,7 @@ fn add(map: &mut HeaderMap<HeaderValue>, name: HeaderName, value: Option<&str>) 
}



fn add_ts(map: &mut HeaderMap<HeaderValue>, name: HeaderName, value: Option<&Timestamp>) -> S3Result<()> {

    let error = |e| invalid_request!(e, "invalid overrided header: {name}: {value:?}");

    let error = |e| invalid_request!(e, "invalid overridden header: {name}: {value:?}");

    if let Some(value) = value {

        let value = fmt_timestamp(value, TimestampFormat::HttpDate, HeaderValue::from_bytes).map_err(error)?;

        map.insert(name, value);

crates/s3s/src/path.rs

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
//! A path in the S3 storage.

//!

//! + [Request styles](https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAPI.html#virtual-hosted-path-style-requests)

//! + [Bucket nameing rules](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html)

//! + [Bucket naming rules](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html)



use std::net::IpAddr;
@@ -107,7 +107,7 @@ impl S3Path { 
    }

}



/// See [bucket nameing rules](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html)

/// See [bucket naming rules](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html)

#[must_use]

pub fn check_bucket_name(name: &str) -> bool {

    if !(3_usize..64).contains(&name.len()) {

crates/s3s/src/sig_v2/methods.rs

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ pub fn create_string_to_sign( 
    uri_path: &str,

    qs: Option<&OrderedQs>,

    headers: &OrderedHeaders<'_>,

    virual_host_bucket: Option<&str>,

    virtual_host_bucket: Option<&str>,

) -> String {

    let mut ans = String::with_capacity(256);
@@ -128,7 +128,7 @@ pub fn create_string_to_sign( 
    {

        // {CanonicalizedResource}



        if let Some(bucket) = virual_host_bucket {

        if let Some(bucket) = virtual_host_bucket {

            ans.push('/');

            ans.push_str(bucket);

        }