Use internal Retry consistently

Also fixes up one paragraph in Secrets' README.md to be consistent with the others'.

Author: heaths

sdk/keyvault/azure_security_keyvault_certificates/tests/readme.rs

@@ -1,14 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-use azure_core::{
-    error::{ErrorKind, Result},
-    http::StatusCode,
-    time::Duration,
-};
+use azure_core::{error::Result, http::StatusCode};
 use azure_core_test::{recorded, TestContext, TestMode};
 use azure_security_keyvault_certificates::{CertificateClient, CertificateClientOptions};
 use azure_security_keyvault_keys::{KeyClient, KeyClientOptions};
+use azure_security_keyvault_test::Retry;
 use include_file::include_markdown;
 
 #[recorded::test]
@@ -55,17 +52,22 @@ async fn readme(ctx: TestContext) -> Result<()> {
     println!("Delete a certificate");
     include_markdown!("README.md", "delete_certificate", scope);
 
-    // Make sure the certificate gets purged (may not take immediate effect).
     println!("Purge a certificate");
-    for _ in 0..5 {
+    // Because deletes may not happen right away, try purging in a loop.
+    let mut retry = match recording.test_mode() {
+        TestMode::Playback => Retry::immediate(),
+        _ => Retry::progressive(None),
+    };
+
+    loop {
         match client
             .purge_deleted_certificate("certificate-name", None)
             .await
         {
             Ok(_) => break,
-            Err(err) if matches!(err.kind(), ErrorKind::HttpResponse { status, .. } if *status == StatusCode::Conflict) => {
-                if recording.test_mode() != TestMode::Playback {
-                    azure_core::sleep(Duration::seconds(1)).await;
+            Err(err) if matches!(err.http_status(), Some(StatusCode::Conflict)) => {
+                if retry.next().await.is_none() {
+                    return Err(err);
                 }
             }
             Err(err) => return Err(err),

sdk/keyvault/azure_security_keyvault_keys/tests/readme.rs

@@ -1,17 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-use azure_core::{
-    error::{ErrorKind, Result},
-    http::StatusCode,
-    time::Duration,
-};
+use azure_core::{error::Result, http::StatusCode};
 use azure_core_test::{recorded, TestContext, TestMode};
 use azure_security_keyvault_keys::{KeyClient, KeyClientOptions};
 use include_file::include_markdown;
 
 #[recorded::test]
 async fn readme(ctx: TestContext) -> Result<()> {
+    use azure_security_keyvault_test::Retry;
+
     let recording = ctx.recording();
 
     let mut options = KeyClientOptions::default();
@@ -46,14 +44,19 @@ async fn readme(ctx: TestContext) -> Result<()> {
     println!("Delete a key");
     include_markdown!("README.md", "delete_key", scope);
 
-    // Make sure the key gets purged (may not take immediate effect).
     println!("Purge a key");
-    for _ in 0..5 {
+    // Because deletes may not happen right away, try purging in a loop.
+    let mut retry = match recording.test_mode() {
+        TestMode::Playback => Retry::immediate(),
+        _ => Retry::progressive(None),
+    };
+
+    loop {
         match client.purge_deleted_key("key-name", None).await {
             Ok(_) => break,
-            Err(err) if matches!(err.kind(), ErrorKind::HttpResponse { status, .. } if *status == StatusCode::Conflict) => {
-                if recording.test_mode() != TestMode::Playback {
-                    azure_core::sleep(Duration::seconds(1)).await;
+            Err(err) if matches!(err.http_status(), Some(StatusCode::Conflict)) => {
+                if retry.next().await.is_none() {
+                    return Err(err);
                 }
             }
             Err(err) => return Err(err),

sdk/keyvault/azure_security_keyvault_secrets/README.md

@@ -40,7 +40,7 @@ cargo add azure_identity tokio
 
 In order to interact with the Azure Key Vault service, you'll need to create an instance of the `SecretClient`. You need a **vault url**, which you may see as "DNS Name" in the portal, and credentials to instantiate a client object.
 
-The example shown below use a `DeveloperToolsCredential`, which is appropriate for most local development environments. Additionally, we recommend using a managed identity for authentication in production environments. You can find more information on different ways of authenticating and their corresponding credential types in the [Azure Identity] documentation.
+The example shown below uses a `DeveloperToolsCredential`, which is appropriate for local development environments. We recommend using a managed identity for authentication in production environments. You can find more information on different ways of authenticating and their corresponding credential types in the [Azure Identity] documentation.
 
 The `DeveloperToolsCredential` will automatically pick up on an Azure CLI authentication. Ensure you are logged in with the Azure CLI:
 

sdk/keyvault/azure_security_keyvault_secrets/tests/readme.rs

@@ -1,17 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-use azure_core::{
-    error::{ErrorKind, Result},
-    http::StatusCode,
-    time::Duration,
-};
+use azure_core::{error::Result, http::StatusCode};
 use azure_core_test::{recorded, TestContext, TestMode};
 use azure_security_keyvault_secrets::{SecretClient, SecretClientOptions};
 use include_file::include_markdown;
 
 #[recorded::test]
 async fn readme(ctx: TestContext) -> Result<()> {
+    use azure_security_keyvault_test::Retry;
+
     let recording = ctx.recording();
 
     let mut options = SecretClientOptions::default();
@@ -42,14 +40,19 @@ async fn readme(ctx: TestContext) -> Result<()> {
     println!("Delete a secret");
     include_markdown!("README.md", "delete_secret", scope);
 
-    // Make sure the secret gets purged (may not take immediate effect).
     println!("Purge a secret");
-    for _ in 0..5 {
+    // Because deletes may not happen right away, try purging in a loop.
+    let mut retry = match recording.test_mode() {
+        TestMode::Playback => Retry::immediate(),
+        _ => Retry::progressive(None),
+    };
+
+    loop {
         match client.purge_deleted_secret("secret-name", None).await {
             Ok(_) => break,
-            Err(err) if matches!(err.kind(), ErrorKind::HttpResponse { status, .. } if *status == StatusCode::Conflict) => {
-                if recording.test_mode() != TestMode::Playback {
-                    azure_core::sleep(Duration::seconds(1)).await;
+            Err(err) if matches!(err.http_status(), Some(StatusCode::Conflict)) => {
+                if retry.next().await.is_none() {
+                    return Err(err);
                 }
             }
             Err(err) => return Err(err),