Redefine Method, StatusCode from http_types in typespec (#2331)

* Redefine Method, StatusCode from http_types in typespec

Resolves #1644 and replaces #2233. The latter PR was a good attempt but we decided internally we don't want to take a dependency on a different crate - `http` ; though, we do have a transitive dependency on it already - for something so simple.

This starts as a copy from http_types with appropriate attribution. We may want to remove a bunch of Methods we don't need, though, at some point.

* Change StatusCode to extensible enum

* Fix lint

* Remove unnecessary HTTP methods for Azure services

Author: heaths

Cargo.lock

@@ -89,7 +89,6 @@ flate2 = "1.1.0"
 futures = "0.3"
 getrandom = { version = "0.2", features = ["js"] }
 hmac = { version = "0.12" }
-http-types = { version = "2.12", default-features = false }
 litemap = "0.7.4"
 log = "0.4"
 oauth2 = { version = "5.0.0", default-features = false }

Cargo.toml

@@ -27,3 +27,31 @@ In the event that we accidentally failed to list a required notice, please
 bring it to our attention. Post an issue.
 
 The attached notices are provided for information only.
+
+License notice for `http_types::{Method, StatusCode}`
+------------------------------------------------------------------------------
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Yoshua Wuyts
+Copyright (c) 2017 http-rs authors
+Copyright (c) 2020 Jacob Brown
+Copyright (c) 2016-2018 Michael Tilli (Pyfisch) & `httpdate` contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

NOTICE.txt

@@ -137,12 +137,7 @@ impl TryFrom<fe2o3_amqp_management::error::Error> for AmqpError {
 
             fe2o3_amqp_management::error::Error::Status(s) => {
                 Ok(AmqpError::from(AmqpErrorKind::ManagementStatusCode(
-                    azure_core::StatusCode::try_from(s.code.0.get()).map_err(|_| {
-                        azure_core::Error::message(
-                            azure_core::error::ErrorKind::DataConversion,
-                            format!("invalid status code {s}"),
-                        )
-                    })?,
+                    azure_core::StatusCode::from(s.code.0.get()),
                     s.description.clone(),
                 )))
             }

sdk/core/azure_core_amqp/src/fe2o3/management.rs

@@ -54,9 +54,6 @@ impl<'a> SignatureTarget<'a> {
                 azure_core::Method::Post => "post",
                 azure_core::Method::Delete => "delete",
                 azure_core::Method::Head => "head",
-                azure_core::Method::Trace => "trace",
-                azure_core::Method::Options => "options",
-                azure_core::Method::Connect => "connect",
                 azure_core::Method::Patch => "patch",
                 _ => "extension",
             },

sdk/cosmos/azure_data_cosmos/src/pipeline/signature_target.rs

@@ -60,10 +60,7 @@ fn try_from_method(method: &oauth2::http::Method) -> azure_core::Result<azure_co
         oauth2::http::Method::PUT => Ok(azure_core::Method::Put),
         oauth2::http::Method::DELETE => Ok(azure_core::Method::Delete),
         oauth2::http::Method::HEAD => Ok(azure_core::Method::Head),
-        oauth2::http::Method::OPTIONS => Ok(azure_core::Method::Options),
-        oauth2::http::Method::CONNECT => Ok(azure_core::Method::Connect),
         oauth2::http::Method::PATCH => Ok(azure_core::Method::Patch),
-        oauth2::http::Method::TRACE => Ok(azure_core::Method::Trace),
         _ => Err(Error::with_message(ErrorKind::DataConversion, || {
             format!("unsupported oauth2::http::Method {method}")
         })),
@@ -93,7 +90,7 @@ fn try_from_headers(
 }
 
 fn try_from_status(status: azure_core::StatusCode) -> azure_core::Result<oauth2::http::StatusCode> {
-    oauth2::http::StatusCode::from_u16(status as u16).map_kind(ErrorKind::DataConversion)
+    oauth2::http::StatusCode::from_u16(*status).map_kind(ErrorKind::DataConversion)
 }
 
 fn to_headers(map: &oauth2::http::header::HeaderMap) -> azure_core::headers::Headers {

sdk/identity/azure_identity/src/oauth2_http_client.rs

@@ -13,7 +13,7 @@ keywords = ["typespec"]
 
 [dependencies]
 base64.workspace = true
-http-types = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 url.workspace = true
 
@@ -22,6 +22,6 @@ thiserror.workspace = true
 
 [features]
 default = ["http", "json"]
-http = ["dep:http-types"]
-json = ["dep:serde_json"]
+http = []
+json = ["dep:serde", "dep:serde_json"]
 amqp = []

sdk/typespec/Cargo.toml

@@ -4,8 +4,7 @@
 //! Interfaces for working with errors.
 
 #[cfg(feature = "http")]
-use http_types::StatusCode;
-
+use crate::http::StatusCode;
 use std::borrow::Cow;
 use std::fmt::{Debug, Display};
 

sdk/typespec/src/error/mod.rs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+mod status_code;
+
+pub use status_code::StatusCode;