Skip to content

Commit 20eb3c6

Browse files
Billy-SheppardBilly-Sheppard
committed
Revert "added in certificate client"
This reverts commit dc4c8bc.
1 parent dc4c8bc commit 20eb3c6

File tree

3 files changed

+17
-175
lines changed

3 files changed

+17
-175
lines changed

‎sdk/key_vault/src/certificate.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::client::API_VERSION_PARAM;
2-
use crate::CertificateClient;
32
use crate::Error;
3+
use crate::KeyClient;
44

55
use azure_core::TokenCredential;
66
use chrono::serde::{ts_seconds, ts_seconds_option};
@@ -154,20 +154,20 @@ pub struct CertificateBackupResult {
154154
pub backup: Vec<u8>,
155155
}
156156

157-
impl<'a, T: TokenCredential> CertificateClient<'a, T> {
157+
impl<'a, T: TokenCredential> KeyClient<'a, T> {
158158
/// Gets a certificate from the Key Vault.
159159
/// Note that the latest version is fetched. For a specific version, use `get_certificate_with_version`.
160160
///
161161
/// # Example
162162
///
163163
/// ```no_run
164-
/// use azure_key_vault::CertificateClient;
164+
/// use azure_key_vault::KeyClient;
165165
/// use azure_identity::token_credentials::DefaultCredential;
166166
/// use tokio::runtime::Runtime;
167167
///
168168
/// async fn example() {
169169
/// let creds = DefaultCredential::default();
170-
/// let mut client = CertificateClient::new(
170+
/// let mut client = KeyClient::new(
171171
/// &"KEYVAULT_URL",
172172
/// &creds,
173173
/// ).unwrap();
@@ -187,13 +187,13 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
187187
/// # Example
188188
///
189189
/// ```no_run
190-
/// use azure_key_vault::CertificateClient;
190+
/// use azure_key_vault::KeyClient;
191191
/// use azure_identity::token_credentials::DefaultCredential;
192192
/// use tokio::runtime::Runtime;
193193
///
194194
/// async fn example() {
195195
/// let creds = DefaultCredential::default();
196-
/// let mut client = CertificateClient::new(
196+
/// let mut client = KeyClient::new(
197197
/// &"KEYVAULT_URL",
198198
/// &creds,
199199
/// ).unwrap();
@@ -241,13 +241,13 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
241241
/// Lists all the certificates in the Key Vault.
242242
///
243243
/// ```no_run
244-
/// use azure_key_vault::CertificateClient;
244+
/// use azure_key_vault::KeyClient;
245245
/// use azure_identity::token_credentials::DefaultCredential;
246246
/// use tokio::runtime::Runtime;
247247
///
248248
/// async fn example() {
249249
/// let creds = DefaultCredential::default();
250-
/// let mut client = CertificateClient::new(
250+
/// let mut client = KeyClient::new(
251251
/// &"KEYVAULT_URL",
252252
/// &creds,
253253
/// ).unwrap();
@@ -309,13 +309,13 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
309309
/// # Example
310310
///
311311
/// ```no_run
312-
/// use azure_key_vault::CertificateClient;
312+
/// use azure_key_vault::KeyClient;
313313
/// use azure_identity::token_credentials::DefaultCredential;
314314
/// use tokio::runtime::Runtime;
315315
///
316316
/// async fn example() {
317317
/// let creds = DefaultCredential::default();
318-
/// let mut client = CertificateClient::new(
318+
/// let mut client = KeyClient::new(
319319
/// &"KEYVAULT_URL",
320320
/// &creds,
321321
/// ).unwrap();
@@ -429,13 +429,13 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
429429
/// # Example
430430
///
431431
/// ```no_run
432-
/// use azure_key_vault::CertificateClient;
432+
/// use azure_key_vault::KeyClient;
433433
/// use azure_identity::token_credentials::DefaultCredential;
434434
/// use tokio::runtime::Runtime;
435435
///
436436
/// async fn example() {
437437
/// let creds = DefaultCredential::default();
438-
/// let mut client = CertificateClient::new(
438+
/// let mut client = KeyClient::new(
439439
/// &"KEYVAULT_URL",
440440
/// &creds,
441441
/// ).unwrap();
@@ -467,13 +467,13 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
467467
/// # Example
468468
///
469469
/// ```no_run
470-
/// use azure_key_vault::CertificateClient;
470+
/// use azure_key_vault::KeyClient;
471471
/// use azure_identity::token_credentials::DefaultCredential;
472472
/// use tokio::runtime::Runtime;
473473
///
474474
/// async fn example() {
475475
/// let creds = DefaultCredential::default();
476-
/// let mut client = CertificateClient::new(
476+
/// let mut client = KeyClient::new(
477477
/// &"KEYVAULT_URL",
478478
/// &creds,
479479
/// ).unwrap();
@@ -514,13 +514,13 @@ impl<'a, T: TokenCredential> CertificateClient<'a, T> {
514514
/// # Example
515515
///
516516
/// ```no_run
517-
/// use azure_key_vault::{CertificateClient, RecoveryLevel};
517+
/// use azure_key_vault::{KeyClient, RecoveryLevel};
518518
/// use azure_identity::token_credentials::DefaultCredential;
519519
/// use tokio::runtime::Runtime;
520520
///
521521
/// async fn example() {
522522
/// let creds = DefaultCredential::default();
523-
/// let mut client = CertificateClient::new(
523+
/// let mut client = KeyClient::new(
524524
/// &"KEYVAULT_URL",
525525
/// &creds,
526526
/// ).unwrap();

‎sdk/key_vault/src/client.rs

Lines changed: 0 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -164,164 +164,6 @@ impl<'a, T: TokenCredential> KeyClient<'a, T> {
164164
}
165165
}
166166

167-
/// Client for Key Vault operations - getting a certificate, listing certificates, etc.
168-
///
169-
/// # Example
170-
///
171-
/// ```no_run
172-
/// use azure_key_vault::CertificateClient;
173-
/// use azure_identity::token_credentials::DefaultCredential;
174-
/// let creds = DefaultCredential::default();
175-
/// let client = CertificateClient::new(&"https://test-key-vault.vault.azure.net", &creds).unwrap();
176-
/// ```
177-
#[derive(Debug)]
178-
pub struct CertificateClient<'a, T> {
179-
pub(crate) vault_url: Url,
180-
pub(crate) endpoint: String,
181-
pub(crate) token_credential: &'a T,
182-
pub(crate) token: Option<TokenResponse>,
183-
}
184-
185-
impl<'a, T: TokenCredential> CertificateClient<'a, T> {
186-
/// Creates a new `CertificateClient`.
187-
///
188-
/// # Example
189-
///
190-
/// ```no_run
191-
/// use azure_key_vault::CertificateClient;
192-
/// use azure_identity::token_credentials::DefaultCredential;
193-
/// let creds = DefaultCredential::default();
194-
/// let client = CertificateClient::new("test-key-vault.vault.azure.net", &creds).unwrap();
195-
/// ```
196-
pub fn new(vault_url: &str, token_credential: &'a T) -> Result<Self, Error> {
197-
let vault_url = Url::parse(vault_url)?;
198-
let endpoint = extract_endpoint(&vault_url)?;
199-
let client = CertificateClient {
200-
vault_url,
201-
endpoint,
202-
token_credential,
203-
token: None,
204-
};
205-
Ok(client)
206-
}
207-
208-
pub(crate) async fn refresh_token(&mut self) -> Result<(), Error> {
209-
if matches!(&self.token, Some(token) if token.expires_on > chrono::Utc::now()) {
210-
// Token is valid, return it.
211-
return Ok(());
212-
}
213-
214-
let token = self
215-
.token_credential
216-
.get_token(&self.endpoint)
217-
.await
218-
.map_err(|_| Error::Authorization)?;
219-
self.token = Some(token);
220-
Ok(())
221-
}
222-
223-
pub(crate) async fn get_authed(&mut self, uri: String) -> Result<String, Error> {
224-
self.refresh_token().await?;
225-
226-
let resp = reqwest::Client::new()
227-
.get(&uri)
228-
.bearer_auth(self.token.as_ref().unwrap().token.secret())
229-
.send()
230-
.await
231-
.unwrap();
232-
let body = resp.text().await.unwrap();
233-
Ok(body)
234-
}
235-
236-
pub(crate) async fn _put_authed(&mut self, uri: String, body: String) -> Result<String, Error> {
237-
self.refresh_token().await?;
238-
239-
let resp = reqwest::Client::new()
240-
.put(&uri)
241-
.bearer_auth(self.token.as_ref().unwrap().token.secret())
242-
.header("Content-Type", "application/json")
243-
.body(body)
244-
.send()
245-
.await
246-
.unwrap();
247-
let body = resp.text().await?;
248-
Ok(body)
249-
}
250-
251-
pub(crate) async fn post_authed(
252-
&mut self,
253-
uri: String,
254-
json_body: Option<String>,
255-
) -> Result<String, Error> {
256-
self.refresh_token().await?;
257-
258-
let mut req = reqwest::Client::new()
259-
.post(&uri)
260-
.bearer_auth(self.token.as_ref().unwrap().token.secret());
261-
262-
if let Some(body) = json_body {
263-
req = req.header("Content-Type", "application/json").body(body);
264-
} else {
265-
req = req.header("Content-Length", 0);
266-
}
267-
268-
let resp = req.send().await?;
269-
270-
let body = resp.text().await?;
271-
272-
let body_serialized = serde_json::from_str::<serde_json::Value>(&body).unwrap();
273-
274-
if let Some(err) = body_serialized.get("error") {
275-
let msg = err.get("message").ok_or(Error::UnparsableError)?;
276-
Err(Error::General(msg.to_string()))
277-
} else {
278-
Ok(body)
279-
}
280-
}
281-
282-
pub(crate) async fn patch_authed(
283-
&mut self,
284-
uri: String,
285-
body: String,
286-
) -> Result<String, Error> {
287-
self.refresh_token().await?;
288-
289-
let resp = reqwest::Client::new()
290-
.patch(&uri)
291-
.bearer_auth(self.token.as_ref().unwrap().token.secret())
292-
.header("Content-Type", "application/json")
293-
.body(body)
294-
.send()
295-
.await
296-
.unwrap();
297-
298-
let body = resp.text().await.unwrap();
299-
300-
let body_serialized = serde_json::from_str::<serde_json::Value>(&body).unwrap();
301-
302-
if let Some(err) = body_serialized.get("error") {
303-
let msg = err.get("message").ok_or(Error::UnparsableError)?;
304-
Err(Error::General(msg.to_string()))
305-
} else {
306-
Ok(body)
307-
}
308-
}
309-
310-
pub(crate) async fn _delete_authed(&mut self, uri: String) -> Result<String, Error> {
311-
self.refresh_token().await?;
312-
313-
let resp = reqwest::Client::new()
314-
.delete(&uri)
315-
.bearer_auth(self.token.as_ref().unwrap().token.secret())
316-
.header("Content-Type", "application/json")
317-
.send()
318-
.await
319-
.unwrap();
320-
let body = resp.text().await.unwrap();
321-
Ok(body)
322-
}
323-
}
324-
325167
/// Helper to get vault endpoint with a scheme and a trailing slash
326168
/// ex. `https://vault.azure.net/` where the full client url is `https://myvault.vault.azure.net`
327169
fn extract_endpoint(url: &Url) -> Result<String, Error> {

‎sdk/key_vault/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mod client;
33
pub mod key;
44
pub mod secret;
55

6-
pub use client::{CertificateClient, KeyClient};
6+
pub use client::KeyClient;
77

88
use std::fmt;
99

0 commit comments

Comments
 (0)