Closes: #375, #366, #362, #351

Author: durch

aws-creds/Cargo.toml

@@ -2,7 +2,7 @@
 name = "aws-creds"
 version = "0.37.0"
 authors = ["Drazen Urch"]
-description = "Tiny Rust library for working with Amazon IAM credential,s, supports `s3` crate"
+description = "Rust library for working with Amazon IAM credential,s, supports `s3` crate"
 repository = "https://github.com/durch/rust-s3"
 readme = "README.md"
 keywords = ["AWS", "S3", "Wasabi", "Minio", "R2"]

aws-creds/src/credentials.rs

@@ -301,8 +301,8 @@ impl Credentials {
         Credentials::from_sts_env("aws-creds")
             .or_else(|_| Credentials::from_env())
             .or_else(|_| Credentials::from_profile(profile))
-            .or_else(|_| Credentials::from_instance_metadata_v2())
-            .or_else(|_| Credentials::from_instance_metadata())
+            .or_else(|_| Credentials::from_instance_metadata_v2(false))
+            .or_else(|_| Credentials::from_instance_metadata(false))
             .map_err(|_| CredentialsError::NoCredentials)
     }
 
@@ -331,7 +331,7 @@ impl Credentials {
     }
 
     #[cfg(feature = "http-credentials")]
-    pub fn from_instance_metadata() -> Result<Credentials, CredentialsError> {
+    pub fn from_instance_metadata(not_ec2: bool) -> Result<Credentials, CredentialsError> {
         let resp: CredentialsFromInstanceMetadata =
             match env::var("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI") {
                 Ok(credentials_path) => {
@@ -344,7 +344,7 @@ impl Credentials {
                     .json()?
                 }
                 Err(_) => {
-                    if !is_ec2() {
+                    if !not_ec2 && !is_ec2() {
                         return Err(CredentialsError::NotEc2);
                     }
 
@@ -373,8 +373,8 @@ impl Credentials {
     }
 
     #[cfg(feature = "http-credentials")]
-    pub fn from_instance_metadata_v2() -> Result<Credentials, CredentialsError> {
-        if !is_ec2() {
+    pub fn from_instance_metadata_v2(not_ec2: bool) -> Result<Credentials, CredentialsError> {
+        if !not_ec2 && !is_ec2() {
             return Err(CredentialsError::NotEc2);
         }
 

s3/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "rust-s3"
-version = "0.35.0-alpha.1"
+version = "0.35.0-alpha.2"
 authors = ["Drazen Urch"]
 description = "Rust library for working with AWS S3 and compatible object storage APIs"
 repository = "https://github.com/durch/rust-s3"
 readme = "README.md"
 keywords = ["S3", "Wasabi", "Minio", "GCP", "R2"]
 license = "MIT"
-documentation = "https://docs.rs/aws-creds/latest/awscreds/"
+documentation = "https://docs.rs/rust-s3/latest/s3/"
 edition = "2018"
 
 [lib]

s3/src/bucket.rs

@@ -111,11 +111,13 @@ pub struct Bucket {
 
 impl Bucket {
     #[maybe_async::async_impl]
+    /// Credential refreshing is done automatically, but can be manually triggered.
     pub async fn credentials_refresh(&self) -> Result<(), S3Error> {
         Ok(self.credentials.write().await.refresh()?)
     }
 
     #[maybe_async::sync_impl]
+    /// Credential refreshing is done automatically, but can be manually triggered.
     pub fn credentials_refresh(&self) -> Result<(), S3Error> {
         match self.credentials.write() {
             Ok(mut credentials) => Ok(credentials.refresh()?),
@@ -1477,7 +1479,7 @@ impl Bucket {
     #[maybe_async::sync_impl]
     pub fn put_multipart_chunk(
         &self,
-        chunk: Vec<u8>,
+        chunk: &[u8],
         path: &str,
         part_number: u32,
         upload_id: &str,