Revert "trait implementation"

Author: chlowell

sdk/identity/azure_identity/src/azure_pipelines_credential.rs

@@ -226,7 +226,7 @@ impl fmt::Display for ErrorHeaders {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{env::Env, TroubleshootingGuide, TSG_LINK_ERROR_TEXT};
+    use crate::{env::Env, TSG_LINK_ERROR_TEXT};
     use azure_core::{
         http::{BufResponse, ClientOptions, Transport},
         Bytes,
@@ -300,10 +300,8 @@ mod tests {
                     err.to_string().contains("bar"),
         ));
         assert!(
-            err.to_string().contains(&format!(
-                "{TSG_LINK_ERROR_TEXT}{}",
-                AzurePipelinesCredential::FRAGMENT
-            )),
+            err.to_string()
+                .contains(&format!("{TSG_LINK_ERROR_TEXT}#apc")),
             "expected error to contain a link to the troubleshooting guide, got '{err}'",
         );
     }

sdk/identity/azure_identity/src/client_secret_credential.rs

@@ -167,7 +167,7 @@ impl TokenCredential for ClientSecretCredential {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{tests::*, TroubleshootingGuide, TSG_LINK_ERROR_TEXT};
+    use crate::{tests::*, TSG_LINK_ERROR_TEXT};
     use azure_core::{
         http::{headers::Headers, BufResponse, StatusCode, Transport},
         Bytes, Result,
@@ -257,10 +257,8 @@ mod tests {
             err
         );
         assert!(
-            err.to_string().contains(&format!(
-                "{TSG_LINK_ERROR_TEXT}{}",
-                ClientSecretCredential::FRAGMENT
-            )),
+            err.to_string()
+                .contains(&format!("{TSG_LINK_ERROR_TEXT}#client-secret")),
             "expected error to contain a link to the troubleshooting guide, got '{err}'",
         );
     }

sdk/identity/azure_identity/src/lib.rs

@@ -136,72 +136,24 @@ fn get_authority_host(env: Option<Env>, cloud: Option<&CloudConfiguration>) -> R
 const TSG_LINK_ERROR_TEXT: &str =
     ". To troubleshoot, visit https://aka.ms/azsdk/rust/identity/troubleshoot";
 
-/// A troubleshooting guide entry.
-#[doc(hidden)]
-pub trait TroubleshootingGuide: private::Sealed {
-    /// The URL fragment (leading '#' and an anchor) for this type's entry in the troubleshooting guide.
-    const FRAGMENT: &'static str;
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-impl TroubleshootingGuide for AzureCliCredential {
-    const FRAGMENT: &'static str = "#azure-cli";
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-impl TroubleshootingGuide for AzureDeveloperCliCredential {
-    const FRAGMENT: &'static str = "#azd";
-}
-
-impl TroubleshootingGuide for AzurePipelinesCredential {
-    const FRAGMENT: &'static str = "#apc";
-}
-
-#[cfg(feature = "client_certificate")]
-impl TroubleshootingGuide for ClientCertificateCredential {
-    const FRAGMENT: &'static str = "#client-cert";
-}
-
-impl TroubleshootingGuide for ClientSecretCredential {
-    const FRAGMENT: &'static str = "#client-secret";
-}
-
-impl TroubleshootingGuide for ManagedIdentityCredential {
-    const FRAGMENT: &'static str = "#managed-id";
-}
-
-impl TroubleshootingGuide for WorkloadIdentityCredential {
-    const FRAGMENT: &'static str = "#workload";
-}
-
-mod private {
-    pub trait Sealed {}
-    #[cfg(not(target_arch = "wasm32"))]
-    impl Sealed for super::AzureCliCredential {}
-    #[cfg(not(target_arch = "wasm32"))]
-    impl Sealed for super::AzureDeveloperCliCredential {}
-    impl Sealed for super::AzurePipelinesCredential {}
-    #[cfg(feature = "client_certificate")]
-    impl Sealed for super::ClientCertificateCredential {}
-    impl Sealed for super::ClientSecretCredential {}
-    impl Sealed for super::ManagedIdentityCredential {}
-    impl Sealed for super::WorkloadIdentityCredential {}
-}
-
 /// Map an error from a credential's get_token() method to an ErrorKind::Credential error, appending
 /// a link to the troubleshooting guide entry for that credential, if it has one.
 ///
 /// TODO: decide whether to map to ErrorKind::Credential here (https://github.com/Azure/azure-sdk-for-rust/issues/3127)
-fn authentication_error<T: TroubleshootingGuide + 'static>(
-    e: azure_core::Error,
-) -> azure_core::Error {
+fn authentication_error<T: 'static>(e: azure_core::Error) -> azure_core::Error {
     azure_core::Error::with_message_fn(e.kind().clone(), || {
         let type_name = std::any::type_name::<T>();
-        let short_name = type_name.rsplit("::").next().unwrap_or(type_name);
-        let link = if T::FRAGMENT.is_empty() {
-            String::new()
-        } else {
-            format!("{TSG_LINK_ERROR_TEXT}{}", T::FRAGMENT)
+        let short_name = type_name.rsplit("::").next().unwrap_or(type_name); // cspell:ignore rsplit
+        let link = match short_name {
+            "AzureCliCredential" => format!("{TSG_LINK_ERROR_TEXT}#azure-cli"),
+            "AzureDeveloperCliCredential" => format!("{TSG_LINK_ERROR_TEXT}#azd"),
+            "AzurePipelinesCredential" => format!("{TSG_LINK_ERROR_TEXT}#apc"),
+            #[cfg(feature = "client_certificate")]
+            "ClientCertificateCredential" => format!("{TSG_LINK_ERROR_TEXT}#client-cert"),
+            "ClientSecretCredential" => format!("{TSG_LINK_ERROR_TEXT}#client-secret"),
+            "ManagedIdentityCredential" => format!("{TSG_LINK_ERROR_TEXT}#managed-id"),
+            "WorkloadIdentityCredential" => format!("{TSG_LINK_ERROR_TEXT}#workload"),
+            _ => "".to_string(),
         };
 
         format!("{short_name} authentication failed: {e}{link}")

sdk/identity/azure_identity/src/managed_identity_credential.rs

@@ -168,7 +168,7 @@ mod tests {
     use crate::{
         env::Env,
         tests::{LIVE_TEST_RESOURCE, LIVE_TEST_SCOPES},
-        TroubleshootingGuide, TSG_LINK_ERROR_TEXT,
+        TSG_LINK_ERROR_TEXT,
     };
     use azure_core::http::headers::Headers;
     use azure_core::http::{BufResponse, Method, Request, StatusCode, Transport, Url};
@@ -462,10 +462,8 @@ mod tests {
             .to_string()
             .contains("the requested identity has not been assigned to this resource"));
         assert!(
-            err.to_string().contains(&format!(
-                "{TSG_LINK_ERROR_TEXT}{}",
-                ManagedIdentityCredential::FRAGMENT
-            )),
+            err.to_string()
+                .contains(&format!("{TSG_LINK_ERROR_TEXT}#managed-id")),
             "expected error to contain a link to the troubleshooting guide, got '{err}'",
         );
     }

sdk/identity/azure_identity/src/workload_identity_credential.rs

@@ -191,7 +191,7 @@ mod tests {
         client_assertion_credential::tests::{is_valid_request, FAKE_ASSERTION},
         env::Env,
         tests::*,
-        TroubleshootingGuide, TSG_LINK_ERROR_TEXT,
+        TSG_LINK_ERROR_TEXT,
     };
     use azure_core::{
         http::{
@@ -318,10 +318,8 @@ mod tests {
         ));
         assert!(err.to_string().contains(description));
         assert!(
-            err.to_string().contains(&format!(
-                "{TSG_LINK_ERROR_TEXT}{}",
-                WorkloadIdentityCredential::FRAGMENT
-            )),
+            err.to_string()
+                .contains(&format!("{TSG_LINK_ERROR_TEXT}#workload")),
             "expected error to contain a link to the troubleshooting guide, got '{err}'",
         );
     }