Refactor RequestContent conversion for Spector (Azure#2957)

Co-authored-by: Larry Osterman <[email protected]>

Author: heaths

sdk/core/azure_core/CHANGELOG.md

@@ -4,10 +4,17 @@
 
 ### Features Added
 
+- Added `RequestContent::from_slice()`.
+- Added `TryFrom<T> for RequestContent<T, JsonFormat>` for JSON primitives.
+- Added support for WASM to the `async_runtime` module.
 - Added logging policy to log HTTP requests and responses in the pipeline. As a part of this change, sanitization support was added to places which log HTTP headers and URLs. The `azure_core::http::ClientOptions` has been enhanced with a `LoggingOptions` which allows a user/service client to specify headers or URL query parameters which should be allowed. Note that the sanitization feature is disabled if you build with the `debug` feature enabled.
 
 ### Breaking Changes
 
+- Changed `FromStr for RequestContent<T, F>` to `RequestContent::from_str()`.
+- Changed `TryFrom<&'static str> for RequestContent<T, F>` to `RequestContent::from_static()`.
+- Changed `TryFrom<Bytes> for RequestContent<T, F>` to `From<Bytes> for RequestContent<T, F>` because it was already infallible.
+- Removed `TryFrom<Vec<u8>> for RequestContent<T, F>` since `RequestContent::from()` already exists.
 - Removed feature `reqwest_rustls_tls`. See [README.md](https://github.com/heaths/azure-sdk-for-rust/blob/main/sdk/core/azure_core/README.md) for alternative HTTP client configuration.
 - Removed the `fs` module including the `FileStream` and `FileStreamBuilder` types. Moved to `examples/` for `typespec_client_core` to copy if needed.
 - Removed the `setters` macro.

sdk/core/azure_core_test/src/proxy/models.rs

@@ -69,7 +69,7 @@ pub struct StartPayload {
 impl TryFrom<StartPayload> for RequestContent<StartPayload> {
     type Error = azure_core::Error;
     fn try_from(value: StartPayload) -> Result<Self, Self::Error> {
-        RequestContent::try_from(to_json(&value)?)
+        Ok(to_json(&value)?.into())
     }
 }
 
@@ -88,7 +88,7 @@ pub struct VariablePayload {
 impl TryFrom<VariablePayload> for RequestContent<VariablePayload> {
     type Error = azure_core::Error;
     fn try_from(value: VariablePayload) -> Result<Self, Self::Error> {
-        RequestContent::try_from(to_json(&value)?)
+        Ok(to_json(&value)?.into())
     }
 }
 
@@ -111,7 +111,7 @@ pub struct SanitizerList {
 impl TryFrom<SanitizerList> for RequestContent<SanitizerList> {
     type Error = azure_core::Error;
     fn try_from(value: SanitizerList) -> Result<Self, Self::Error> {
-        RequestContent::try_from(to_json(&value)?)
+        Ok(to_json(&value)?.into())
     }
 }
 

sdk/keyvault/azure_security_keyvault_certificates/src/generated/models/models_impl.rs

@@ -104,6 +104,8 @@ async fn update_key_properties(ctx: TestContext) -> Result<()> {
 
 #[recorded::test]
 async fn list_keys(ctx: TestContext) -> Result<()> {
+    use azure_core::http::RequestContent;
+
     let recording = ctx.recording();
 
     let mut options = KeyClientOptions::default();
@@ -120,7 +122,7 @@ async fn list_keys(ctx: TestContext) -> Result<()> {
     let secret1 = client
         .create_key(
             names[0],
-            r#"{"kty":"EC","curve":"P-384"}"#.try_into()?,
+            RequestContent::from_str(r#"{"kty":"EC","curve":"P-384"}"#),
             None,
         )
         .await?
@@ -131,7 +133,7 @@ async fn list_keys(ctx: TestContext) -> Result<()> {
     let secret2 = client
         .create_key(
             names[1],
-            r#"{"kty":"EC","curve":"P-384"}"#.try_into()?,
+            RequestContent::from_str(r#"{"kty":"EC","curve":"P-384"}"#),
             None,
         )
         .await?

sdk/keyvault/azure_security_keyvault_keys/src/generated/models/models_impl.rs

@@ -107,6 +107,8 @@ async fn update_secret_properties(ctx: TestContext) -> Result<()> {
 
 #[recorded::test]
 async fn list_secrets(ctx: TestContext) -> Result<()> {
+    use azure_core::http::RequestContent;
+
     let recording = ctx.recording();
 
     let mut options = SecretClientOptions::default();
@@ -121,14 +123,22 @@ async fn list_secrets(ctx: TestContext) -> Result<()> {
     // Create several secrets.
     let mut names = vec!["list-secrets-1", "list-secrets-2"];
     let secret1 = client
-        .set_secret(names[0], r#"{"value":"secret-value-1"}"#.try_into()?, None)
+        .set_secret(
+            names[0],
+            RequestContent::from_str(r#"{"value":"secret-value-1"}"#),
+            None,
+        )
         .await?
         .into_body()
         .await?;
     assert_eq!(secret1.value, Some("secret-value-1".into()));
 
     let secret2 = client
-        .set_secret(names[1], r#"{"value":"secret-value-2"}"#.try_into()?, None)
+        .set_secret(
+            names[1],
+            RequestContent::from_str(r#"{"value":"secret-value-2"}"#),
+            None,
+        )
         .await?
         .into_body()
         .await?;

sdk/keyvault/azure_security_keyvault_keys/tests/key_client.rs

@@ -4,10 +4,16 @@
 
 ### Features Added
 
+- Added `RequestContent::from_slice()`.
+- Added `TryFrom<T> for RequestContent<T, JsonFormat>` for JSON primitives.
 - Added support for WASM to the `async_runtime` module.
 
 ### Breaking Changes
 
+- Changed `FromStr for RequestContent<T, F>` to `RequestContent::from_str()`.
+- Changed `TryFrom<&'static str> for RequestContent<T, F>` to `RequestContent::from_static()`.
+- Changed `TryFrom<Bytes> for RequestContent<T, F>` to `From<Bytes> for RequestContent<T, F>` because it was already infallible.
+- Removed `TryFrom<Vec<u8>> for RequestContent<T, F>` since `RequestContent::from()` already exists.
 - Removed feature `reqwest_rustls_tls`. See [README.md](https://github.com/heaths/azure-sdk-for-rust/blob/main/sdk/typespec/typespec_client_core/README.md) for alternative HTTP client configuration.
 - Removed the `fs` module including the `FileStream` and `FileStreamBuilder` types. Moved to `examples/` to copy if needed.
 - Removed the `setters` macro.