record/replay/passthrough functionality

DataDog · Oct 24, 2023 · 0b509cd · 0b509cd
1 parent 4aebe1a
commit 0b509cd
Show file tree

Hide file tree

Showing 17 changed files with 493 additions and 153 deletions.
diff --git a/.generator/src/generator/templates/api_mod.j2 b/.generator/src/generator/templates/api_mod.j2
diff --git a/.generator/src/generator/templates/common_mod.j2 b/.generator/src/generator/templates/common_mod.j2
@@ -11,6 +11,7 @@ pub struct ResponseContent<T> {
 #[derive(Debug)]
 pub enum Error<T> {
     Reqwest(reqwest::Error),
+    ReqwestMiddleware(reqwest_middleware::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
     ResponseError(ResponseContent<T>),
@@ -20,6 +21,7 @@ impl <T> fmt::Display for Error<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let (module, e) = match self {
             Error::Reqwest(e) => ("reqwest", e.to_string()),
+            Error::ReqwestMiddleware(e) => ("reqwest_middleware", e.to_string()),
             Error::Serde(e) => ("serde", e.to_string()),
             Error::Io(e) => ("IO", e.to_string()),
             Error::ResponseError(e) => ("response", format!("status code {}", e.status)),
@@ -32,6 +34,7 @@ impl <T: fmt::Debug> error::Error for Error<T> {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         Some(match self {
             Error::Reqwest(e) => e,
+            Error::ReqwestMiddleware(e) => e,
             Error::Serde(e) => e,
             Error::Io(e) => e,
             Error::ResponseError(_) => return None,
@@ -45,6 +48,12 @@ impl <T> From<reqwest::Error> for Error<T> {
     }
 }
 
+impl<T> From<reqwest_middleware::Error> for Error<T> {
+    fn from(e: reqwest_middleware::Error) -> Self {
+        Error::ReqwestMiddleware(e)
+    }
+}
+
 impl <T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)

diff --git a/.generator/src/generator/templates/configuration.j2 b/.generator/src/generator/templates/configuration.j2
@@ -6,7 +6,7 @@ use std::env;
 pub struct Configuration {
     pub base_path: String,
     pub user_agent: Option<String>,
-    pub client: reqwest::Client,
+    pub client: reqwest_middleware::ClientWithMiddleware,
     {%- set authMethods = openapi.security %}
 	{%- if authMethods %}
 	{%- for authMethod in authMethods %}
@@ -29,6 +29,7 @@ impl Configuration {
 
 impl Default for Configuration {
     fn default() -> Self {
+        let http_client = reqwest_middleware::ClientBuilder::new(reqwest::Client::new());
         Configuration {
             base_path: "https://api.datadoghq.com".to_owned(),
             user_agent: Some(format!(
@@ -38,7 +39,7 @@ impl Default for Configuration {
                 env::consts::OS,
                 env::consts::ARCH,
             )),
-            client: reqwest::Client::new(),
+            client: http_client.build(),
             {%- set authMethods = openapi.security %}
             {%- if authMethods %}
             {%- for authMethod in authMethods %}

diff --git a/.generator/src/generator/templates/function_mappings.j2 b/.generator/src/generator/templates/function_mappings.j2
@@ -75,10 +75,8 @@ fn test_{{ operation['operationId'] | snake_case }}(world: &mut DatadogWorld, _p
         Ok(response) => response,
         Err(error) => {
             return match error {
-                Error::Reqwest(e) => panic!("reqwest error: {}", e),
-                Error::Serde(e) => panic!("serde error: {}", e),
-                Error::Io(e) => panic!("io error: {}", e),
                 Error::ResponseError(e) => world.response.code = e.status.as_u16(),
+                _ => panic!("error parsing response: {}", error),
             };
         }
     };

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ url = "^2.2"
 uuid = { version = "^1.0", features = ["serde"] }
 rustc_version = "0.4.0"
 log = "0.4.20"
+reqwest-middleware = "0.1.6"
 [dependencies.reqwest]
 version = "^0.11"
 features = ["json", "multipart"]
@@ -28,6 +29,8 @@ handlebars = "4.4.0"
 regex = "1.9.5"
 sha256 = "1.4.0"
 futures = "0.3.28"
+rvcr = { git = "https://github.com/nkzou/rvcr.git", rev = "a3fc79e" }
+chrono = "0.4.31"
 
 [[test]]
 name = "main"

diff --git a/src/datadog/configuration.rs b/src/datadog/configuration.rs
@@ -8,7 +8,7 @@ use std::env;
 pub struct Configuration {
     pub base_path: String,
     pub user_agent: Option<String>,
-    pub client: reqwest::Client,
+    pub client: reqwest_middleware::ClientWithMiddleware,
     pub api_key_auth: Option<String>,
     pub app_key_auth: Option<String>,
 }
@@ -21,6 +21,7 @@ impl Configuration {
 
 impl Default for Configuration {
     fn default() -> Self {
+        let http_client = reqwest_middleware::ClientBuilder::new(reqwest::Client::new());
         Configuration {
             base_path: "https://api.datadoghq.com".to_owned(),
             user_agent: Some(format!(
@@ -30,7 +31,7 @@ impl Default for Configuration {
                 env::consts::OS,
                 env::consts::ARCH,
             )),
-            client: reqwest::Client::new(),
+            client: http_client.build(),
             api_key_auth: env::var("DD_API_KEY").ok(),
             app_key_auth: env::var("DD_APP_KEY").ok(),
         }

diff --git a/src/datadog/mod.rs b/src/datadog/mod.rs
@@ -11,6 +11,7 @@ pub struct ResponseContent<T> {
 #[derive(Debug)]
 pub enum Error<T> {
     Reqwest(reqwest::Error),
+    ReqwestMiddleware(reqwest_middleware::Error),
     Serde(serde_json::Error),
     Io(std::io::Error),
     ResponseError(ResponseContent<T>),
@@ -20,6 +21,7 @@ impl<T> fmt::Display for Error<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let (module, e) = match self {
             Error::Reqwest(e) => ("reqwest", e.to_string()),
+            Error::ReqwestMiddleware(e) => ("reqwest_middleware", e.to_string()),
             Error::Serde(e) => ("serde", e.to_string()),
             Error::Io(e) => ("IO", e.to_string()),
             Error::ResponseError(e) => ("response", format!("status code {}", e.status)),
@@ -32,6 +34,7 @@ impl<T: fmt::Debug> error::Error for Error<T> {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         Some(match self {
             Error::Reqwest(e) => e,
+            Error::ReqwestMiddleware(e) => e,
             Error::Serde(e) => e,
             Error::Io(e) => e,
             Error::ResponseError(_) => return None,
@@ -45,6 +48,12 @@ impl<T> From<reqwest::Error> for Error<T> {
     }
 }
 
+impl<T> From<reqwest_middleware::Error> for Error<T> {
+    fn from(e: reqwest_middleware::Error) -> Self {
+        Error::ReqwestMiddleware(e)
+    }
+}
+
 impl<T> From<serde_json::Error> for Error<T> {
     fn from(e: serde_json::Error) -> Self {
         Error::Serde(e)

diff --git a/...assettes/v2/Feature_Fastly_Integration/Add-Fastly-account-returns-CREATED-response.frozen b/...assettes/v2/Feature_Fastly_Integration/Add-Fastly-account-returns-CREATED-response.frozen
@@ -0,0 +1 @@
+2023-01-19T15:15:56.412Z
diff --git a/.../cassettes/v2/Feature_Fastly_Integration/Add-Fastly-account-returns-CREATED-response.json b/.../cassettes/v2/Feature_Fastly_Integration/Add-Fastly-account-returns-CREATED-response.json
@@ -0,0 +1,67 @@
+{
+  "http_interactions": [
+    {
+      "recorded_at": "Thu, 19 Jan 2023 15:15:56 GMT",
+      "request": {
+        "body": {
+          "encoding": null,
+          "string": "{\"data\":{\"attributes\":{\"api_key\":\"TestAddFastlyaccountreturnsCREATEDresponse1674141356\",\"name\":\"Test-Add_Fastly_account_returns_CREATED_response-1674141356\",\"services\":[]},\"type\":\"fastly-accounts\"}}"
+        },
+        "headers": {
+          "Accept": [
+            "application/json"
+          ],
+          "Content-Type": [
+            "application/json"
+          ]
+        },
+        "method": "post",
+        "uri": "https://api.datadoghq.com/api/v2/integrations/fastly/accounts"
+      },
+      "response": {
+        "body": {
+          "encoding": null,
+          "string": "{\"data\":{\"attributes\":{\"services\":[],\"name\":\"Test-Add_Fastly_account_returns_CREATED_response-1674141356\"},\"type\":\"fastly-accounts\",\"id\":\"0427b05b6f56f454ca1477aa8df5e75d\"}}\n"
+        },
+        "headers": {
+          "Content-Type": [
+            "application/json"
+          ]
+        },
+        "status": {
+          "code": 201,
+          "message": "Created"
+        }
+      }
+    },
+    {
+      "recorded_at": "Thu, 19 Jan 2023 15:15:56 GMT",
+      "request": {
+        "body": "",
+        "headers": {
+          "Accept": [
+            "*/*"
+          ]
+        },
+        "method": "delete",
+        "uri": "https://api.datadoghq.com/api/v2/integrations/fastly/accounts/0427b05b6f56f454ca1477aa8df5e75d"
+      },
+      "response": {
+        "body": {
+          "encoding": null,
+          "string": ""
+        },
+        "headers": {
+          "Content-Type": [
+            "text/html; charset=utf-8"
+          ]
+        },
+        "status": {
+          "code": 204,
+          "message": "No Content"
+        }
+      }
+    }
+  ],
+  "recorded_with": "VCR 6.0.0"
+}
diff --git a/...ios/cassettes/v2/Feature_Fastly_Integration/Get-Fastly-account-returns-OK-response.frozen b/...ios/cassettes/v2/Feature_Fastly_Integration/Get-Fastly-account-returns-OK-response.frozen
@@ -0,0 +1 @@
+2023-03-13T10:11:14.475Z