address clippy warnings for azure_security_keyvault (#1401)

demoray · web-flow · commit 44e926f787ed · 2023-09-20T07:30:01.000-04:00
diff --git a/sdk/security_keyvault/src/account/operations/list_certificates.rs b/sdk/security_keyvault/src/account/operations/list_certificates.rs
@@ -25,12 +25,7 @@ impl ListCertificatesBuilder {
                 };
 
                 let headers = Headers::new();
-                let mut request = this.client.keyvault_client.finalize_request(
-                    url,
-                    Method::Get,
-                    headers,
-                    None,
-                )?;
+                let mut request = KeyvaultClient::finalize_request(url, Method::Get, headers, None);
 
                 let response = this.client.keyvault_client.send(&ctx, &mut request).await?;
 
diff --git a/sdk/security_keyvault/src/account/operations/list_secrets.rs b/sdk/security_keyvault/src/account/operations/list_secrets.rs
@@ -25,12 +25,7 @@ impl ListSecretsBuilder {
                 };
 
                 let headers = Headers::new();
-                let mut request = this.client.keyvault_client.finalize_request(
-                    url,
-                    Method::Get,
-                    headers,
-                    None,
-                )?;
+                let mut request = KeyvaultClient::finalize_request(url, Method::Get, headers, None);
 
                 let response = this.client.keyvault_client.send(&ctx, &mut request).await?;
 
diff --git a/sdk/security_keyvault/src/account/operations/restore_certificate.rs b/sdk/security_keyvault/src/account/operations/restore_certificate.rs
@@ -17,12 +17,12 @@ impl RestoreCertificateBuilder {
             request_body.insert("value".to_owned(), self.backup_blob.into());
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(serde_json::Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             self.client
                 .keyvault_client
diff --git a/sdk/security_keyvault/src/account/operations/restore_secret.rs b/sdk/security_keyvault/src/account/operations/restore_secret.rs
@@ -17,12 +17,12 @@ impl RestoreSecretBuilder {
             request_body.insert("value".to_owned(), self.backup_blob.into());
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(serde_json::Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             self.client
                 .keyvault_client
diff --git a/sdk/security_keyvault/src/certificates/operations/backup.rs b/sdk/security_keyvault/src/certificates/operations/backup.rs
@@ -14,10 +14,7 @@ impl CertificateBackupBuilder {
             uri.set_path(&format!("certificates/{}/backup", self.name));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Post, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Post, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/create.rs b/sdk/security_keyvault/src/certificates/operations/create.rs
@@ -130,12 +130,8 @@ impl CreateCertificateBuilder {
             let body = serde_json::to_string(&request)?;
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
-                uri,
-                Method::Post,
-                headers,
-                Some(body.into()),
-            )?;
+            let mut request =
+                KeyvaultClient::finalize_request(uri, Method::Post, headers, Some(body.into()));
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/delete.rs b/sdk/security_keyvault/src/certificates/operations/delete.rs
@@ -14,10 +14,7 @@ impl DeleteCertificateBuilder {
             uri.set_path(&format!("certificates/{}", self.name));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Delete, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Delete, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/delete_operation.rs b/sdk/security_keyvault/src/certificates/operations/delete_operation.rs
@@ -14,10 +14,7 @@ impl DeleteCertificateOperationBuilder {
             uri.set_path(&format!("certificates/{}/pending", self.name));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Delete, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Delete, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/get_certificate.rs b/sdk/security_keyvault/src/certificates/operations/get_certificate.rs
@@ -16,10 +16,7 @@ impl GetCertificateBuilder {
             uri.set_path(&format!("certificates/{}/{}", self.name, version));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Get, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Get, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/get_operation.rs b/sdk/security_keyvault/src/certificates/operations/get_operation.rs
@@ -14,10 +14,7 @@ impl GetCertificateOperationBuilder {
             uri.set_path(&format!("certificates/{}/pending", self.name));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Get, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Get, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/get_versions.rs b/sdk/security_keyvault/src/certificates/operations/get_versions.rs
@@ -23,12 +23,7 @@ impl GetCertificateVersionsBuilder {
                 }
 
                 let headers = Headers::new();
-                let mut request = this.client.keyvault_client.finalize_request(
-                    uri,
-                    Method::Get,
-                    headers,
-                    None,
-                )?;
+                let mut request = KeyvaultClient::finalize_request(uri, Method::Get, headers, None);
 
                 let response = this.client.keyvault_client.send(&ctx, &mut request).await?;
 
diff --git a/sdk/security_keyvault/src/certificates/operations/import.rs b/sdk/security_keyvault/src/certificates/operations/import.rs
@@ -55,12 +55,8 @@ impl ImportCertificateBuilder {
             let body = serde_json::to_string(&request)?;
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
-                uri,
-                Method::Post,
-                headers,
-                Some(body.into()),
-            )?;
+            let mut request =
+                KeyvaultClient::finalize_request(uri, Method::Post, headers, Some(body.into()));
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/merge.rs b/sdk/security_keyvault/src/certificates/operations/merge.rs
@@ -52,12 +52,8 @@ impl MergeCertificateBuilder {
             let body = serde_json::to_string(&request)?;
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
-                uri,
-                Method::Post,
-                headers,
-                Some(body.into()),
-            )?;
+            let mut request =
+                KeyvaultClient::finalize_request(uri, Method::Post, headers, Some(body.into()));
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/certificates/operations/update_properties.rs b/sdk/security_keyvault/src/certificates/operations/update_properties.rs
@@ -47,12 +47,8 @@ impl UpdateCertificatePropertiesBuilder {
             let body = serde_json::to_string(&request)?;
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
-                uri,
-                Method::Patch,
-                headers,
-                Some(body.into()),
-            )?;
+            let mut request =
+                KeyvaultClient::finalize_request(uri, Method::Patch, headers, Some(body.into()));
 
             self.client
                 .keyvault_client
diff --git a/sdk/security_keyvault/src/clients/keyvault_client.rs b/sdk/security_keyvault/src/clients/keyvault_client.rs
@@ -65,12 +65,11 @@ impl KeyvaultClient {
     }
 
     pub(crate) fn finalize_request(
-        &self,
         url: Url,
         method: Method,
         headers: Headers,
         request_body: Option<Body>,
-    ) -> azure_core::Result<Request> {
+    ) -> Request {
         let dt = OffsetDateTime::now_utc();
         let time = date::to_rfc1123(&dt);
 
@@ -103,7 +102,7 @@ impl KeyvaultClient {
             request.set_body(azure_core::EMPTY_BODY);
         };
 
-        Ok(request)
+        request
     }
 
     pub(crate) async fn send(
diff --git a/sdk/security_keyvault/src/keys/models.rs b/sdk/security_keyvault/src/keys/models.rs
@@ -231,7 +231,7 @@ pub enum SignatureAlgorithm {
 
 impl Default for SignatureAlgorithm {
     fn default() -> Self {
-        SignatureAlgorithm::Custom("".to_string())
+        SignatureAlgorithm::Custom(String::new())
     }
 }
 
diff --git a/sdk/security_keyvault/src/keys/operations/decrypt.rs b/sdk/security_keyvault/src/keys/operations/decrypt.rs
@@ -57,12 +57,12 @@ impl DecryptBuilder {
             };
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/keys/operations/encrypt.rs b/sdk/security_keyvault/src/keys/operations/encrypt.rs
@@ -57,12 +57,12 @@ impl EncryptBuilder {
             };
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/keys/operations/get_key.rs b/sdk/security_keyvault/src/keys/operations/get_key.rs
@@ -17,10 +17,7 @@ impl GetKeyBuilder {
             uri.set_path(&path);
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Get, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Get, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/keys/operations/get_random_bytes.rs b/sdk/security_keyvault/src/keys/operations/get_random_bytes.rs
@@ -23,12 +23,12 @@ impl GetRandomBytesBuilder {
             request_body.insert("count".to_owned(), Value::from(self.count));
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/keys/operations/sign.rs b/sdk/security_keyvault/src/keys/operations/sign.rs
@@ -21,15 +21,15 @@ impl SignBuilder {
 
             let mut request_body = Map::new();
             request_body.insert("alg".to_owned(), Value::String(self.algorithm.to_string()));
-            request_body.insert("value".to_owned(), Value::String(self.digest.to_owned()));
+            request_body.insert("value".to_owned(), Value::String(self.digest.clone()));
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/keys/operations/unwrap_key.rs b/sdk/security_keyvault/src/keys/operations/unwrap_key.rs
@@ -57,12 +57,12 @@ impl UnwrapKeyBuilder {
             };
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
+            let mut request = KeyvaultClient::finalize_request(
                 uri,
                 Method::Post,
                 headers,
                 Some(Value::Object(request_body).to_string().into()),
-            )?;
+            );
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/secrets/operations/backup_secret.rs b/sdk/security_keyvault/src/secrets/operations/backup_secret.rs
@@ -15,10 +15,7 @@ impl BackupSecretBuilder {
             uri.set_path(&format!("secrets/{}/backup", self.name));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Post, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Post, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/secrets/operations/delete_secret.rs b/sdk/security_keyvault/src/secrets/operations/delete_secret.rs
@@ -14,10 +14,7 @@ impl DeleteSecretBuilder {
             uri.set_path(&format!("secrets/{}", self.name));
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Delete, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Delete, headers, None);
 
             self.client
                 .keyvault_client
diff --git a/sdk/security_keyvault/src/secrets/operations/get_secret.rs b/sdk/security_keyvault/src/secrets/operations/get_secret.rs
@@ -16,10 +16,7 @@ impl GetSecretBuilder {
             uri.set_path(&format!("secrets/{}/{}", self.name, version));
             let headers = Headers::new();
 
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Get, headers, None)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Get, headers, None);
 
             let response = self
                 .client
diff --git a/sdk/security_keyvault/src/secrets/operations/get_versions.rs b/sdk/security_keyvault/src/secrets/operations/get_versions.rs
@@ -23,12 +23,7 @@ impl GetSecretVersionsBuilder {
                 }
 
                 let headers = Headers::new();
-                let mut request = this.client.keyvault_client.finalize_request(
-                    uri,
-                    Method::Get,
-                    headers,
-                    None,
-                )?;
+                let mut request = KeyvaultClient::finalize_request(uri, Method::Get, headers, None);
 
                 let response = this.client.keyvault_client.send(&ctx, &mut request).await?;
 
diff --git a/sdk/security_keyvault/src/secrets/operations/set_secret.rs b/sdk/security_keyvault/src/secrets/operations/set_secret.rs
@@ -22,10 +22,7 @@ impl SetSecretBuilder {
             let body = Some(Value::Object(request_body).to_string().into());
 
             let headers = Headers::new();
-            let mut request =
-                self.client
-                    .keyvault_client
-                    .finalize_request(uri, Method::Put, headers, body)?;
+            let mut request = KeyvaultClient::finalize_request(uri, Method::Put, headers, body);
 
             self.client
                 .keyvault_client
diff --git a/sdk/security_keyvault/src/secrets/operations/update_secret.rs b/sdk/security_keyvault/src/secrets/operations/update_secret.rs
@@ -58,12 +58,8 @@ impl UpdateSecretBuilder {
             let body = serde_json::to_string(&request)?;
 
             let headers = Headers::new();
-            let mut request = self.client.keyvault_client.finalize_request(
-                uri,
-                Method::Patch,
-                headers,
-                Some(body.into()),
-            )?;
+            let mut request =
+                KeyvaultClient::finalize_request(uri, Method::Patch, headers, Some(body.into()));
 
             self.client
                 .keyvault_client
