address clippy warnings for azure_identity (#1403)

Author: demoray

sdk/identity/examples/client_certificate_credentials.rs

@@ -43,7 +43,7 @@ async fn main() -> azure_core::Result<()> {
         tenant_id,
         client_id,
         base64::encode(cert),
-        "".to_string(),
+        String::new(),
         options,
     );
 

sdk/identity/src/client_credentials_flow/login_response.rs

@@ -1,9 +1,9 @@
 use azure_core::auth::AccessToken;
-use serde::{de, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer};
 use time::OffsetDateTime;
 
 #[derive(Debug, Clone, Deserialize)]
-struct _LoginResponse {
+struct RawLogResponse {
     token_type: String,
     expires_in: u64,
     ext_expires_in: u64,
@@ -29,8 +29,8 @@ impl<'de> Deserialize<'de> for LoginResponse {
     where
         D: Deserializer<'de>,
     {
-        let resp = _LoginResponse::deserialize(deserializer)?;
-        LoginResponse::from_base_response(resp).map_err(de::Error::custom)
+        let resp = RawLogResponse::deserialize(deserializer)?;
+        Ok(LoginResponse::from_base_response(resp))
     }
 }
 
@@ -39,7 +39,7 @@ impl LoginResponse {
         &self.access_token
     }
 
-    fn from_base_response(r: _LoginResponse) -> Result<LoginResponse, std::num::ParseIntError> {
+    fn from_base_response(r: RawLogResponse) -> LoginResponse {
         let expires_on: Option<OffsetDateTime> = r.expires_on.map(|d| {
             OffsetDateTime::from_unix_timestamp(d.parse::<i64>().unwrap_or(0))
                 .unwrap_or(OffsetDateTime::UNIX_EPOCH)
@@ -49,14 +49,14 @@ impl LoginResponse {
                 .unwrap_or(OffsetDateTime::UNIX_EPOCH)
         });
 
-        Ok(LoginResponse {
+        LoginResponse {
             token_type: r.token_type,
             expires_in: r.expires_in,
             ext_expires_in: r.ext_expires_in,
             expires_on,
             not_before,
             resource: r.resource,
             access_token: AccessToken::new(r.access_token),
-        })
+        }
     }
 }

sdk/identity/src/development.rs

@@ -28,13 +28,10 @@ pub fn naive_redirect_server(
         let mut request_line = String::new();
         reader.read_line(&mut request_line).unwrap();
 
-        let redirect_url = match request_line.split_whitespace().nth(1) {
-            Some(redirect_url) => redirect_url,
-            None => {
-                return Err(Error::with_message(ErrorKind::Credential, || {
-                    format!("unexpected redirect url: {request_line}")
-                }))
-            }
+        let Some(redirect_url) = request_line.split_whitespace().nth(1) else {
+            return Err(Error::with_message(ErrorKind::Credential, || {
+                format!("unexpected redirect url: {request_line}")
+            }));
         };
         let url = Url::parse(&("http://localhost".to_string() + redirect_url)).unwrap();
 

sdk/identity/src/federated_credentials_flow/login_response.rs

@@ -1,9 +1,9 @@
 use azure_core::auth::AccessToken;
-use serde::{de, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer};
 use time::OffsetDateTime;
 
 #[derive(Debug, Clone, Deserialize)]
-struct _LoginResponse {
+struct RawLoginResponse {
     token_type: String,
     expires_in: u64,
     ext_expires_in: u64,
@@ -29,8 +29,8 @@ impl<'de> Deserialize<'de> for LoginResponse {
     where
         D: Deserializer<'de>,
     {
-        let resp = _LoginResponse::deserialize(deserializer)?;
-        LoginResponse::from_base_response(resp).map_err(de::Error::custom)
+        let resp = RawLoginResponse::deserialize(deserializer)?;
+        Ok(LoginResponse::from_base_response(resp))
     }
 }
 
@@ -39,7 +39,7 @@ impl LoginResponse {
         &self.access_token
     }
 
-    fn from_base_response(r: _LoginResponse) -> Result<LoginResponse, std::num::ParseIntError> {
+    fn from_base_response(r: RawLoginResponse) -> LoginResponse {
         let expires_on: Option<OffsetDateTime> = r.expires_on.map(|d| {
             OffsetDateTime::from_unix_timestamp(d.parse::<i64>().unwrap_or(0))
                 .unwrap_or(OffsetDateTime::UNIX_EPOCH)
@@ -49,14 +49,14 @@ impl LoginResponse {
                 .unwrap_or(OffsetDateTime::UNIX_EPOCH)
         });
 
-        Ok(LoginResponse {
+        LoginResponse {
             token_type: r.token_type,
             expires_in: r.expires_in,
             ext_expires_in: r.ext_expires_in,
             expires_on,
             not_before,
             resource: r.resource,
             access_token: AccessToken::new(r.access_token),
-        })
+        }
     }
 }

sdk/identity/src/oauth2_http_client.rs

@@ -87,15 +87,14 @@ fn to_headers(map: &oauth2::http::header::HeaderMap) -> azure_core::headers::Hea
         .iter()
         .filter_map(|(k, v)| {
             let key = k.as_str();
-            match std::str::from_utf8(v.as_bytes()) {
-                Ok(value) => Some((
+            if let Ok(value) = v.to_str() {
+                Some((
                     azure_core::headers::HeaderName::from(key.to_owned()),
                     azure_core::headers::HeaderValue::from(value.to_owned()),
-                )),
-                Err(_) => {
-                    log::warn!("header value for `{key}` is not utf8");
-                    None
-                }
+                ))
+            } else {
+                log::warn!("header value for `{key}` is not utf8");
+                None
             }
         })
         .collect::<HashMap<_, _>>();

sdk/identity/src/refresh_token.rs

@@ -53,9 +53,8 @@ pub async fn exchange(
     if !rsp_status.is_success() {
         if let Ok(token_error) = serde_json::from_slice::<RefreshTokenError>(&rsp_body) {
             return Err(Error::new(ErrorKind::Credential, token_error));
-        } else {
-            return Err(ErrorKind::http_response_from_body(rsp_status, &rsp_body).into_error());
         }
+        return Err(ErrorKind::http_response_from_body(rsp_status, &rsp_body).into_error());
     }
 
     serde_json::from_slice::<RefreshTokenResponse>(&rsp_body).map_kind(ErrorKind::Credential)
@@ -107,7 +106,7 @@ mod deserialize {
         D: Deserializer<'de>,
     {
         let string: String = serde::Deserialize::deserialize(scope)?;
-        Ok(string.split(' ').map(|s| s.to_owned()).collect())
+        Ok(string.split(' ').map(ToOwned::to_owned).collect())
     }
 }
 

sdk/identity/src/token_credentials/default_credentials.rs

@@ -52,9 +52,9 @@ impl DefaultAzureCredentialBuilder {
 
     /// Create a `DefaultAzureCredential` from this builder.
     pub fn build(&self) -> DefaultAzureCredential {
-        let source_count = self.include_azure_cli_credential as usize
-            + self.include_azure_cli_credential as usize
-            + self.include_managed_identity_credential as usize;
+        let source_count = usize::from(self.include_azure_cli_credential)
+            + usize::from(self.include_azure_cli_credential)
+            + usize::from(self.include_managed_identity_credential);
         let mut sources = Vec::<DefaultAzureCredentialEnum>::with_capacity(source_count);
         if self.include_environment_credential {
             sources.push(DefaultAzureCredentialEnum::Environment(
@@ -173,7 +173,7 @@ impl TokenCredential for DefaultAzureCredential {
 fn format_aggregate_error(errors: &[Error]) -> String {
     errors
         .iter()
-        .map(|error| error.to_string())
+        .map(ToString::to_string)
         .collect::<Vec<String>>()
         .join("\n")
 }

sdk/identity/src/token_credentials/environment_credentials.rs

@@ -14,7 +14,7 @@ const AZURE_FEDERATED_TOKEN_FILE: &str = "AZURE_FEDERATED_TOKEN_FILE";
 const AZURE_FEDERATED_TOKEN: &str = "AZURE_FEDERATED_TOKEN";
 const AZURE_AUTHORITY_HOST: &str = "AZURE_AUTHORITY_HOST";
 
-/// Enables authentication with Workflows Identity if either AZURE_FEDERATED_TOKEN or AZURE_FEDERATED_TOKEN_FILE is set,
+/// Enables authentication with Workflows Identity if either `AZURE_FEDERATED_TOKEN` or `AZURE_FEDERATED_TOKEN_FILE` is set,
 /// otherwise enables authentication to Azure Active Directory using client secret, or a username and password.
 ///
 ///
@@ -26,7 +26,7 @@ const AZURE_AUTHORITY_HOST: &str = "AZURE_AUTHORITY_HOST";
 /// | `AZURE_CLIENT_ID`                   | The client(application) ID of an App Registration in the tenant. |
 /// | `AZURE_CLIENT_SECRET`               | A client secret that was generated for the App Registration. |
 /// | `AZURE_FEDERATED_TOKEN_FILE`        | Path to an federated token file. Variable is present in pods with aks workload identities. |
-/// | `AZURE_AUTHORITY_HOST`              | Url for the identity provider to exchange to federated token for an access_token. Variable is present in pods with aks workload identities. |
+/// | `AZURE_AUTHORITY_HOST`              | Url for the identity provider to exchange to federated token for an `access_token`. Variable is present in pods with aks workload identities. |
 ///
 /// This credential ultimately uses a or `WorkloadIdentityCredential` a`ClientSecretCredential` to perform the authentication using
 /// these details.

sdk/identity/src/token_credentials/imds_managed_identity_credentials.rs

@@ -49,6 +49,7 @@ impl ImdsManagedIdentityCredential {
     /// Specifies the object id associated with a user assigned managed service identity resource that should be used to retrieve the access token.
     ///
     /// The values of `client_id` and `msi_res_id` are discarded, as only one id parameter may be set when getting a token.
+    #[must_use]
     pub fn with_object_id<A>(mut self, object_id: A) -> Self
     where
         A: Into<String>,
@@ -62,6 +63,7 @@ impl ImdsManagedIdentityCredential {
     /// Specifies the application id (client id) associated with a user assigned managed service identity resource that should be used to retrieve the access token.
     ///
     /// The values of `object_id` and `msi_res_id` are discarded, as only one id parameter may be set when getting a token.
+    #[must_use]
     pub fn with_client_id<A>(mut self, client_id: A) -> Self
     where
         A: Into<String>,
@@ -75,6 +77,7 @@ impl ImdsManagedIdentityCredential {
     /// Specifies the ARM resource id of the user assigned managed service identity resource that should be used to retrieve the access token.
     ///
     /// The values of `object_id` and `client_id` are discarded, as only one id parameter may be set when getting a token.
+    #[must_use]
     pub fn with_identity<A>(mut self, msi_res_id: A) -> Self
     where
         A: Into<String>,

sdk/identity/src/token_credentials/workload_identity_credentials.rs

@@ -37,7 +37,7 @@ impl WorkloadIdentityCredential {
         }
     }
 
-    /// set TokenCredentialOptions
+    /// set `TokenCredentialOptions`
     pub fn set_options(&mut self, options: TokenCredentialOptions) {
         self.options = options;
     }