Fix http-credentials feature gate, closes #354

Author: durch

aws-creds/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-creds"
-version = "0.37.0"
+version = "0.38.0"
 authors = ["Drazen Urch"]
 description = "Rust library for working with Amazon IAM credential,s, supports `s3` crate"
 repository = "https://github.com/durch/rust-s3"

aws-creds/src/credentials.rs

@@ -26,15 +26,12 @@ use url::Url;
 /// use awscreds::Credentials;
 ///
 /// // Load credentials from `[default]` profile
-/// #[cfg(feature="http-credentials")]
 /// let credentials = Credentials::default();
 ///
 /// // Also loads credentials from `[default]` profile
-/// #[cfg(feature="http-credentials")]
 /// let credentials = Credentials::new(None, None, None, None, None);
 ///
 /// // Load credentials from `[my-profile]` profile
-/// #[cfg(feature="http-credentials")]
 /// let credentials = Credentials::new(None, None, None, None, Some("my-profile".into()));
 ///
 /// // Use anonymous credentials for public objects
@@ -56,14 +53,12 @@ use url::Url;
 /// // Load credentials directly
 /// let access_key = "AKIAIOSFODNN7EXAMPLE";
 /// let secret_key = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY";
-/// #[cfg(feature="http-credentials")]
 /// let credentials = Credentials::new(Some(access_key), Some(secret_key), None, None, None);
 ///
 /// // Load credentials from the environment
 /// use std::env;
 /// env::set_var("AWS_ACCESS_KEY_ID", "AKIAIOSFODNN7EXAMPLE");
 /// env::set_var("AWS_SECRET_ACCESS_KEY", "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY");
-/// #[cfg(feature="http-credentials")]
 /// let credentials = Credentials::new(None, None, None, None, None);
 /// ```
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
@@ -192,7 +187,6 @@ fn http_get(url: &str) -> attohttpc::Result<attohttpc::Response> {
 }
 
 impl Credentials {
-    #[cfg(feature = "http-credentials")]
     pub fn refresh(&mut self) -> Result<(), CredentialsError> {
         if let Some(expiration) = self.expiration {
             if expiration.0 <= OffsetDateTime::now_utc() {
@@ -262,7 +256,6 @@ impl Credentials {
         })
     }
 
-    #[cfg(feature = "http-credentials")]
     #[allow(clippy::should_implement_trait)]
     pub fn default() -> Result<Credentials, CredentialsError> {
         Credentials::new(None, None, None, None, None)
@@ -280,7 +273,6 @@ impl Credentials {
 
     /// Initialize Credentials directly with key ID, secret key, and optional
     /// token.
-    #[cfg(feature = "http-credentials")]
     pub fn new(
         access_key: Option<&str>,
         secret_key: Option<&str>,
@@ -298,12 +290,15 @@ impl Credentials {
             });
         }
 
-        Credentials::from_sts_env("aws-creds")
-            .or_else(|_| Credentials::from_env())
-            .or_else(|_| Credentials::from_profile(profile))
+        let credentials = Credentials::from_env().or_else(|_| Credentials::from_profile(profile));
+
+        #[cfg(feature = "http-credentials")]
+        let credentials = credentials
+            .or_else(|_| Credentials::from_sts_env("aws-creds"))
             .or_else(|_| Credentials::from_instance_metadata_v2(false))
-            .or_else(|_| Credentials::from_instance_metadata(false))
-            .map_err(|_| CredentialsError::NoCredentials)
+            .or_else(|_| Credentials::from_instance_metadata(false));
+
+        credentials.map_err(|_| CredentialsError::NoCredentials)
     }
 
     pub fn from_env_specific(