update region

Author: HJLebbink

src/s3/builders/copy_object.rs

@@ -116,7 +116,7 @@ impl ToS3Request for UploadPartCopy {
             }
         }
 
-        let region: String = client.get_region_cached(&self.bucket, self.region.as_deref())?;
+        let region: String = client.get_region_cached(&self.bucket, &self.region)?;
 
         let mut headers: Multimap = self.extra_headers.unwrap_or_default();
         merge(&mut headers, self.headers.clone());
@@ -339,7 +339,7 @@ impl ToS3Request for CopyObjectInternal {
             }
         };
 
-        let region: String = client.get_region_cached(&self.bucket, self.region.as_deref())?;
+        let region: String = client.get_region_cached(&self.bucket, &self.region)?;
 
         Ok(S3Request::new(client, Method::PUT)
             .region(Some(region))

src/s3/builders/delete_object_tags.rs

@@ -17,21 +17,21 @@ use crate::s3::Client;
 use crate::s3::error::Error;
 use crate::s3::response::DeleteObjectTagsResponse;
 use crate::s3::types::{S3Api, S3Request, ToS3Request};
-use crate::s3::utils::{Multimap, check_bucket_name, insert};
+use crate::s3::utils::{Multimap, check_bucket_name, check_object_name, insert};
 use http::Method;
 
 /// Argument builder for [delete_object_tags()](Client::delete_object_tags) API
 #[derive(Clone, Debug, Default)]
 pub struct DeleteObjectTags {
-    pub(crate) client: Option<Client>,
+    client: Option<Client>,
 
-    pub(crate) extra_headers: Option<Multimap>,
-    pub(crate) extra_query_params: Option<Multimap>,
-    pub(crate) region: Option<String>,
-    pub(crate) bucket: String,
+    extra_headers: Option<Multimap>,
+    extra_query_params: Option<Multimap>,
+    region: Option<String>,
+    bucket: String,
 
-    pub(crate) object: String,
-    pub(crate) version_id: Option<String>,
+    object: String,
+    version_id: Option<String>,
 }
 
 impl DeleteObjectTags {
@@ -79,6 +79,7 @@ impl S3Api for DeleteObjectTags {
 impl ToS3Request for DeleteObjectTags {
     fn to_s3request(self) -> Result<S3Request, Error> {
         check_bucket_name(&self.bucket, true)?;
+        check_object_name(&self.object)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
         let mut query_params: Multimap = insert(self.extra_query_params, "tagging");

src/s3/builders/disable_object_legal_hold.rs

@@ -18,7 +18,7 @@ use crate::s3::error::Error;
 use crate::s3::response::DisableObjectLegalHoldResponse;
 use crate::s3::segmented_bytes::SegmentedBytes;
 use crate::s3::types::{S3Api, S3Request, ToS3Request};
-use crate::s3::utils::{Multimap, check_bucket_name, insert, md5sum_hash};
+use crate::s3::utils::{Multimap, check_bucket_name, check_object_name, insert, md5sum_hash};
 use bytes::Bytes;
 use http::Method;
 
@@ -77,6 +77,7 @@ impl S3Api for DisableObjectLegalHold {
 impl ToS3Request for DisableObjectLegalHold {
     fn to_s3request(self) -> Result<S3Request, Error> {
         check_bucket_name(&self.bucket, true)?;
+        check_object_name(&self.object)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
         let mut headers: Multimap = self.extra_headers.unwrap_or_default();

src/s3/builders/enable_object_legal_hold.rs

@@ -18,7 +18,7 @@ use crate::s3::error::Error;
 use crate::s3::response::EnableObjectLegalHoldResponse;
 use crate::s3::segmented_bytes::SegmentedBytes;
 use crate::s3::types::{S3Api, S3Request, ToS3Request};
-use crate::s3::utils::{Multimap, check_bucket_name, insert, md5sum_hash};
+use crate::s3::utils::{Multimap, check_bucket_name, check_object_name, insert, md5sum_hash};
 use bytes::Bytes;
 use http::Method;
 
@@ -77,6 +77,7 @@ impl S3Api for EnableObjectLegalHold {
 impl ToS3Request for EnableObjectLegalHold {
     fn to_s3request(self) -> Result<S3Request, Error> {
         check_bucket_name(&self.bucket, true)?;
+        check_object_name(&self.object)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
         let mut headers: Multimap = self.extra_headers.unwrap_or_default();

src/s3/builders/get_bucket_lifecycle.rs

@@ -36,7 +36,7 @@ impl ToS3Request for GetBucketLifecycle {
         check_bucket_name(&self.bucket, true)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
-        let region: String = client.get_region_cached(&self.bucket, self.region.as_deref())?;
+        let region: String = client.get_region_cached(&self.bucket, &self.region)?;
 
         Ok(S3Request::new(client, Method::GET)
             .region(Some(region))

src/s3/builders/get_object_retention.rs

@@ -17,7 +17,7 @@ use crate::s3::Client;
 use crate::s3::error::Error;
 use crate::s3::response::GetObjectRetentionResponse;
 use crate::s3::types::{S3Api, S3Request, ToS3Request};
-use crate::s3::utils::{Multimap, check_bucket_name, insert};
+use crate::s3::utils::{Multimap, check_bucket_name, check_object_name, insert};
 use http::Method;
 
 /// Argument builder for [get_object_retention()](Client::get_object_retention) API
@@ -79,6 +79,7 @@ impl S3Api for GetObjectRetention {
 impl ToS3Request for GetObjectRetention {
     fn to_s3request(self) -> Result<S3Request, Error> {
         check_bucket_name(&self.bucket, true)?;
+        check_object_name(&self.object)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
         let mut query_params: Multimap = insert(self.extra_query_params, "retention");

src/s3/builders/get_object_tags.rs

@@ -17,7 +17,7 @@ use crate::s3::Client;
 use crate::s3::error::Error;
 use crate::s3::response::GetObjectTagsResponse;
 use crate::s3::types::{S3Api, S3Request, ToS3Request};
-use crate::s3::utils::{Multimap, check_bucket_name, insert};
+use crate::s3::utils::{Multimap, check_bucket_name, check_object_name, insert};
 use http::Method;
 
 /// Argument builder for [get_object_tags()](Client::get_object_tags) API
@@ -79,6 +79,7 @@ impl S3Api for GetObjectTags {
 impl ToS3Request for GetObjectTags {
     fn to_s3request(self) -> Result<S3Request, Error> {
         check_bucket_name(&self.bucket, true)?;
+        check_object_name(&self.object)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
         let mut query_params: Multimap = insert(self.extra_query_params, "tagging");

src/s3/builders/get_presigned_object_url.rs

@@ -60,9 +60,7 @@ impl GetPresignedObjectUrl {
     }
 
     pub fn compute(self) -> Result<GetPresignedObjectUrlResponse, Error> {
-        let region: String = self
-            .client
-            .get_region_cached(&self.bucket, self.region.as_deref())?;
+        let region: String = self.client.get_region_cached(&self.bucket, &self.region)?;
 
         let mut query_params: Multimap = self.extra_query_params.unwrap_or_default();
         if let Some(v) = &self.version_id {

src/s3/builders/get_presigned_policy_form_data.rs

@@ -39,7 +39,7 @@ impl GetPresignedPolicyFormData {
     pub fn compute(&self) -> Result<HashMap<String, String>, Error> {
         let region: String = self
             .client
-            .get_region_cached(&self.policy.bucket, self.policy.region.as_deref())?;
+            .get_region_cached(&self.policy.bucket, &self.policy.region)?;
 
         let creds = self.client.provider.as_ref().unwrap().fetch();
         self.policy.form_data(

src/s3/builders/is_object_legal_hold_enabled.rs

@@ -17,7 +17,7 @@ use crate::s3::Client;
 use crate::s3::error::Error;
 use crate::s3::response::IsObjectLegalHoldEnabledResponse;
 use crate::s3::types::{S3Api, S3Request, ToS3Request};
-use crate::s3::utils::{Multimap, check_bucket_name, insert};
+use crate::s3::utils::{Multimap, check_bucket_name, check_object_name, insert};
 use http::Method;
 
 /// Argument builder for [is_object_legal_hold_enabled()](Client::is_object_legal_hold_enabled) API
@@ -75,6 +75,7 @@ impl S3Api for IsObjectLegalHoldEnabled {
 impl ToS3Request for IsObjectLegalHoldEnabled {
     fn to_s3request(self) -> Result<S3Request, Error> {
         check_bucket_name(&self.bucket, true)?;
+        check_object_name(&self.object)?;
         let client: Client = self.client.ok_or(Error::NoClientProvided)?;
 
         let mut query_params: Multimap = insert(self.extra_query_params, "legal-hold");