Skip to content

Commit e762bd9

Browse files
committed
chore: upgrade reqwest to 0.12
- Bump reqwest 0.11.24 -> 0.12, reqwest-middleware 0.2.5 -> 0.4, reqwest-retry 0.3.0 -> 0.7 - Switch rvcr to whamcloud fork for reqwest 0.12 compatibility - Regenerate test cassettes to reflect updated header recording behavior
1 parent f47852d commit e762bd9

1,564 files changed

Lines changed: 5128 additions & 23577 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ form-data-builder = "1.0.1"
3737
futures-core = "0.3.30"
3838
lazy_static = "1.4.0"
3939
log = "0.4.20"
40-
reqwest = { version = "0.11.24", features = ["multipart"], default-features = false }
41-
reqwest-middleware = "0.2.5"
42-
reqwest-retry = "0.3.0"
40+
reqwest = { version = "0.12", features = ["multipart"], default-features = false }
41+
reqwest-middleware = "0.4"
42+
reqwest-retry = "0.7"
4343
serde = { version = "1.0.197", features = ["derive"] }
4444
serde_json = "1.0.114"
4545
serde_with = "3.6.1"
@@ -59,7 +59,7 @@ futures = "0.3.28"
5959
futures-util = "0.3.30"
6060
minijinja = "1.0.10"
6161
regex = "1.9.5"
62-
rvcr = { git = "https://github.com/nkzou/rvcr.git", rev = "cb6911dcd05300a95647ed915b94645679fd80eb" }
62+
rvcr = { git = "https://github.com/whamcloud/rvcr.git", rev = "2af5a6b7313c4ed89e6d7073779268b85d33d06d" }
6363
sha256 = "1.4.0"
6464
tokio = { version = "1.10", features = ["macros", "rt-multi-thread", "time"] }
6565
urlencoding = "2.1.3"

tests/scenarios/cassettes/v1/authentication/Validate-API-key-returns-Forbidden-response.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
{
44
"request": {
55
"body": "",
6-
"headers": {
7-
"Accept": [
8-
"application/json"
9-
]
10-
},
6+
"headers": {},
117
"method": "get",
128
"uri": "https://api.datadoghq.com/api/v1/validate"
139
},
@@ -30,4 +26,4 @@
3026
}
3127
],
3228
"recorded_with": "VCR 6.0.0"
33-
}
29+
}

tests/scenarios/cassettes/v1/authentication/Validate-API-key-returns-OK-response.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
{
44
"request": {
55
"body": "",
6-
"headers": {
7-
"Accept": [
8-
"application/json"
9-
]
10-
},
6+
"headers": {},
117
"method": "get",
128
"uri": "https://api.datadoghq.com/api/v1/validate"
139
},
@@ -30,4 +26,4 @@
3026
}
3127
],
3228
"recorded_with": "VCR 6.0.0"
33-
}
29+
}

tests/scenarios/cassettes/v1/aws_integration/Create-an-AWS-integration-returns-OK-response.json

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"account_id\":\"171234183000\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"extended_resource_collection_enabled\":true,\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"role_name\":\"DatadogAWSIntegrationRole\"}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
1912
},
@@ -40,14 +33,7 @@
4033
"string": "{\"account_id\":\"171234183000\",\"role_name\":\"DatadogAWSIntegrationRole\"}",
4134
"encoding": null
4235
},
43-
"headers": {
44-
"Accept": [
45-
"application/json"
46-
],
47-
"Content-Type": [
48-
"application/json"
49-
]
50-
},
36+
"headers": {},
5137
"method": "delete",
5238
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
5339
},
@@ -70,4 +56,4 @@
7056
}
7157
],
7258
"recorded_with": "VCR 6.0.0"
73-
}
59+
}

tests/scenarios/cassettes/v1/aws_integration/Delete-an-AWS-integration-returns-OK-response.json

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"account_id\":\"171234183200\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"extended_resource_collection_enabled\":true,\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"role_name\":\"DatadogAWSIntegrationRole\"}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
1912
},
@@ -40,14 +33,7 @@
4033
"string": "{\"account_id\":\"171234183200\",\"role_name\":\"DatadogAWSIntegrationRole\"}",
4134
"encoding": null
4235
},
43-
"headers": {
44-
"Accept": [
45-
"application/json"
46-
],
47-
"Content-Type": [
48-
"application/json"
49-
]
50-
},
36+
"headers": {},
5137
"method": "delete",
5238
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
5339
},
@@ -74,14 +60,7 @@
7460
"string": "{\"account_id\":\"171234183200\",\"role_name\":\"DatadogAWSIntegrationRole\"}",
7561
"encoding": null
7662
},
77-
"headers": {
78-
"Accept": [
79-
"application/json"
80-
],
81-
"Content-Type": [
82-
"application/json"
83-
]
84-
},
63+
"headers": {},
8564
"method": "delete",
8665
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
8766
},
@@ -104,4 +83,4 @@
10483
}
10584
],
10685
"recorded_with": "VCR 6.0.0"
107-
}
86+
}

tests/scenarios/cassettes/v1/aws_integration/Update-an-AWS-integration-returns-OK-response.json

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"account_id\":\"171234183400\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"extended_resource_collection_enabled\":true,\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"role_name\":\"DatadogAWSIntegrationRole\"}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
1912
},
@@ -40,14 +33,7 @@
4033
"string": "{\"account_id\":\"171234183400\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":false,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"extended_resource_collection_enabled\":true,\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}",
4134
"encoding": null
4235
},
43-
"headers": {
44-
"Accept": [
45-
"application/json"
46-
],
47-
"Content-Type": [
48-
"application/json"
49-
]
50-
},
36+
"headers": {},
5137
"method": "put",
5238
"uri": "https://api.datadoghq.com/api/v1/integration/aws?account_id=171234183400&role_name=DatadogAWSIntegrationRole"
5339
},
@@ -74,14 +60,7 @@
7460
"string": "{\"account_id\":\"171234183400\",\"role_name\":\"DatadogAWSIntegrationRole\"}",
7561
"encoding": null
7662
},
77-
"headers": {
78-
"Accept": [
79-
"application/json"
80-
],
81-
"Content-Type": [
82-
"application/json"
83-
]
84-
},
63+
"headers": {},
8564
"method": "delete",
8665
"uri": "https://api.datadoghq.com/api/v1/integration/aws"
8766
},
@@ -104,4 +83,4 @@
10483
}
10584
],
10685
"recorded_with": "VCR 6.0.0"
107-
}
86+
}

tests/scenarios/cassettes/v1/azure_integration/Create-an-Azure-integration-returns-OK-response.json

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17219332-0000-0000-0000-172193325500\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"new_client_id\":\"17219332-0000-0000-0000-172193325500\",\"new_tenant_name\":\"17219332-0000-0000-0000-172193325500\",\"resource_collection_enabled\":true,\"tenant_name\":\"17219332-0000-0000-0000-172193325500\"}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
1912
},
@@ -40,14 +33,7 @@
4033
"string": "{\"client_id\":\"17219332-0000-0000-0000-172193325500\",\"tenant_name\":\"17219332-0000-0000-0000-172193325500\"}",
4134
"encoding": null
4235
},
43-
"headers": {
44-
"Accept": [
45-
"application/json"
46-
],
47-
"Content-Type": [
48-
"application/json"
49-
]
50-
},
36+
"headers": {},
5137
"method": "delete",
5238
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
5339
},
@@ -70,4 +56,4 @@
7056
}
7157
],
7258
"recorded_with": "VCR 6.0.0"
73-
}
59+
}

tests/scenarios/cassettes/v1/azure_integration/Delete-an-Azure-integration-returns-OK-response.json

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178000\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"metrics_enabled\":true,\"metrics_enabled_default\":true,\"new_client_id\":\"17344717-0000-0000-0000-173447178000\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178000\",\"resource_collection_enabled\":true,\"resource_provider_configs\":[{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Compute\"},{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Web\"}],\"tenant_name\":\"17344717-0000-0000-0000-173447178000\",\"usage_metrics_enabled\":true}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
1912
},
@@ -40,14 +33,7 @@
4033
"string": "{\"client_id\":\"17344717-0000-0000-0000-173447178000\",\"tenant_name\":\"17344717-0000-0000-0000-173447178000\"}",
4134
"encoding": null
4235
},
43-
"headers": {
44-
"Accept": [
45-
"application/json"
46-
],
47-
"Content-Type": [
48-
"application/json"
49-
]
50-
},
36+
"headers": {},
5137
"method": "delete",
5238
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
5339
},
@@ -74,14 +60,7 @@
7460
"string": "{\"client_id\":\"17344717-0000-0000-0000-173447178000\",\"tenant_name\":\"17344717-0000-0000-0000-173447178000\"}",
7561
"encoding": null
7662
},
77-
"headers": {
78-
"Accept": [
79-
"application/json"
80-
],
81-
"Content-Type": [
82-
"application/json"
83-
]
84-
},
63+
"headers": {},
8564
"method": "delete",
8665
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
8766
},
@@ -104,4 +83,4 @@
10483
}
10584
],
10685
"recorded_with": "VCR 6.0.0"
107-
}
86+
}

tests/scenarios/cassettes/v1/azure_integration/Update-an-Azure-integration-returns-OK-response.json

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"metrics_enabled\":true,\"metrics_enabled_default\":true,\"new_client_id\":\"17344717-0000-0000-0000-173447178100\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"resource_collection_enabled\":true,\"resource_provider_configs\":[{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Compute\"},{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Web\"}],\"tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"usage_metrics_enabled\":true}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
1912
},
@@ -40,14 +33,7 @@
4033
"string": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"new_client_id\":\"17344717-0000-0000-0000-173447178100\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"resource_collection_enabled\":true,\"tenant_name\":\"17344717-0000-0000-0000-173447178100\"}",
4134
"encoding": null
4235
},
43-
"headers": {
44-
"Accept": [
45-
"application/json"
46-
],
47-
"Content-Type": [
48-
"application/json"
49-
]
50-
},
36+
"headers": {},
5137
"method": "put",
5238
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
5339
},
@@ -74,14 +60,7 @@
7460
"string": "{\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"tenant_name\":\"17344717-0000-0000-0000-173447178100\"}",
7561
"encoding": null
7662
},
77-
"headers": {
78-
"Accept": [
79-
"application/json"
80-
],
81-
"Content-Type": [
82-
"application/json"
83-
]
84-
},
63+
"headers": {},
8564
"method": "delete",
8665
"uri": "https://api.datadoghq.com/api/v1/integration/azure"
8766
},
@@ -104,4 +83,4 @@
10483
}
10584
],
10685
"recorded_with": "VCR 6.0.0"
107-
}
86+
}

tests/scenarios/cassettes/v1/dashboard_lists/Create-a-dashboard-list-returns-OK-response.json

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"string": "{\"name\":\"Test-Create_a_dashboard_list_returns_OK_response-1641430221\"}",
77
"encoding": null
88
},
9-
"headers": {
10-
"Accept": [
11-
"application/json"
12-
],
13-
"Content-Type": [
14-
"application/json"
15-
]
16-
},
9+
"headers": {},
1710
"method": "post",
1811
"uri": "https://api.datadoghq.com/api/v1/dashboard/lists/manual"
1912
},
@@ -37,11 +30,7 @@
3730
{
3831
"request": {
3932
"body": "",
40-
"headers": {
41-
"Accept": [
42-
"application/json"
43-
]
44-
},
33+
"headers": {},
4534
"method": "delete",
4635
"uri": "https://api.datadoghq.com/api/v1/dashboard/lists/manual/269879"
4736
},
@@ -64,4 +53,4 @@
6453
}
6554
],
6655
"recorded_with": "VCR 6.0.0"
67-
}
56+
}

0 commit comments

Comments
 (0)