Skip to content

Commit 6ee9d24

Browse files
Merge master into datadog-api-spec/test/d.marin/oncall-api
2 parents ba9cb05 + 345fb9c commit 6ee9d24

File tree

30 files changed

+151
-68
lines changed

30 files changed

+151
-68
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2025-04-03 16:27:50.158184",
8-
"spec_repo_commit": "4468962d"
7+
"regenerated": "2025-04-04 20:19:30.053070",
8+
"spec_repo_commit": "3909ab62"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2025-04-03 16:27:50.174263",
13-
"spec_repo_commit": "4468962d"
12+
"regenerated": "2025-04-04 20:19:30.068607",
13+
"spec_repo_commit": "3909ab62"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,8 @@ components:
654654
type: string
655655
ResourceID:
656656
description: 'Identifier, formatted as `type:id`. Supported types: `connection`,
657-
`dashboard`, `notebook`, `reference-table`, `security-rule`, `slo`, `workflow`,
658-
`app-builder-app`, `connection`, `connection-group`.'
657+
`dashboard`, `integration-account`, `integration-webhook`, `notebook`, `reference-table`,
658+
`security-rule`, `slo`, `workflow`, `app-builder-app`, `connection`, `connection-group`.'
659659
example: dashboard:abc-def-ghi
660660
in: path
661661
name: resource_id
@@ -2864,13 +2864,13 @@ components:
28642864
enum:
28652865
- attack_attempt
28662866
- business_logic
2867-
- security_responses
2867+
- security_response
28682868
example: business_logic
28692869
type: string
28702870
x-enum-varnames:
28712871
- ATTACK_ATTEMPT
28722872
- BUSINESS_LOGIC
2873-
- SECURITY_RESPONSES
2873+
- SECURITY_RESPONSE
28742874
ApplicationSecurityWafCustomRuleType:
28752875
default: custom_rule
28762876
description: The type of the resource. The value should always be `custom_rule`.
@@ -45734,6 +45734,10 @@ paths:
4573445734

4573545735
- Dashboards: `dashboard`
4573645736

45737+
- Integration Accounts: `integration-account`
45738+
45739+
- Integration Webhooks: `integration-webhook`
45740+
4573745741
- Notebooks: `notebook`
4573845742

4573945743
- Powerpacks: `powerpack`
@@ -45769,6 +45773,10 @@ paths:
4576945773

4577045774
Dashboards | `viewer`, `editor`
4577145775

45776+
Integration Accounts | `viewer`, `editor`
45777+
45778+
Integration Webhooks | `viewer`, `editor`
45779+
4577245780
Notebooks | `viewer`, `editor`
4577345781

4577445782
Powerpacks | `viewer`, `editor`

LICENSE-3rdparty.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ deranged,https://github.com/jhpratt/deranged,MIT OR Apache-2.0,Jacob Pratt <jaco
2121
displaydoc,https://github.com/yaahc/displaydoc,MIT OR Apache-2.0,Jane Lusby <[email protected]>
2222
encoding_rs,https://github.com/hsivonen/encoding_rs,(Apache-2.0 OR MIT) AND BSD-3-Clause,Henri Sivonen <[email protected]>
2323
equivalent,https://github.com/indexmap-rs/equivalent,Apache-2.0 OR MIT,The equivalent Authors
24-
errno,https://github.com/lambda-fairy/rust-errno,MIT OR Apache-2.0,Chris Wong <[email protected]>
24+
errno,https://github.com/lambda-fairy/rust-errno,MIT OR Apache-2.0,"Chris Wong <[email protected]>, Dan Gohman <[email protected]>"
2525
fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina <[email protected]>
2626
flate2,https://github.com/rust-lang/flate2-rs,MIT OR Apache-2.0,"Alex Crichton <[email protected]>, Josh Triplett <[email protected]>"
2727
fnv,https://github.com/servo/rust-fnv,Apache-2.0 OR MIT,Alex Crichton <[email protected]>

examples/v2_action-connection_CreateActionConnection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ async fn main() {
2525
))),
2626
AWSIntegrationType::AWS,
2727
))),
28-
"Cassette Connection DELETE_ME".to_string(),
28+
"Cassette Connection exampleactionconnection".to_string(),
2929
),
3030
ActionConnectionDataType::ACTION_CONNECTION,
3131
));

examples/v2_action-connection_DeleteActionConnection.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ use datadog_api_client::datadogV2::api_action_connection::ActionConnectionAPI;
55

66
#[tokio::main]
77
async fn main() {
8+
// there is a valid "action_connection" in the system
9+
let action_connection_data_id = std::env::var("ACTION_CONNECTION_DATA_ID").unwrap();
810
let configuration = datadog::Configuration::new();
911
let api = ActionConnectionAPI::with_config(configuration);
1012
let resp = api
11-
.delete_action_connection("connection_id".to_string())
13+
.delete_action_connection(action_connection_data_id.clone())
1214
.await;
1315
if let Ok(value) = resp {
1416
println!("{:#?}", value);

examples/v2_action-connection_DeleteActionConnection_2142905164.rs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/datadogV2/api/api_restriction_policies.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ impl RestrictionPoliciesAPI {
325325
/// #### Supported resources
326326
/// Restriction policies can be applied to the following resources:
327327
/// - Dashboards: `dashboard`
328+
/// - Integration Accounts: `integration-account`
329+
/// - Integration Webhooks: `integration-webhook`
328330
/// - Notebooks: `notebook`
329331
/// - Powerpacks: `powerpack`
330332
/// - Reference Tables: `reference-table`
@@ -343,6 +345,8 @@ impl RestrictionPoliciesAPI {
343345
/// Resource Type | Supported Relations
344346
/// ----------------------------|--------------------------
345347
/// Dashboards | `viewer`, `editor`
348+
/// Integration Accounts | `viewer`, `editor`
349+
/// Integration Webhooks | `viewer`, `editor`
346350
/// Notebooks | `viewer`, `editor`
347351
/// Powerpacks | `viewer`, `editor`
348352
/// Security Rules | `viewer`, `editor`
@@ -387,6 +391,8 @@ impl RestrictionPoliciesAPI {
387391
/// #### Supported resources
388392
/// Restriction policies can be applied to the following resources:
389393
/// - Dashboards: `dashboard`
394+
/// - Integration Accounts: `integration-account`
395+
/// - Integration Webhooks: `integration-webhook`
390396
/// - Notebooks: `notebook`
391397
/// - Powerpacks: `powerpack`
392398
/// - Reference Tables: `reference-table`
@@ -405,6 +411,8 @@ impl RestrictionPoliciesAPI {
405411
/// Resource Type | Supported Relations
406412
/// ----------------------------|--------------------------
407413
/// Dashboards | `viewer`, `editor`
414+
/// Integration Accounts | `viewer`, `editor`
415+
/// Integration Webhooks | `viewer`, `editor`
408416
/// Notebooks | `viewer`, `editor`
409417
/// Powerpacks | `viewer`, `editor`
410418
/// Security Rules | `viewer`, `editor`

src/datadogV2/model/model_application_security_waf_custom_rule_tags_category.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
99
pub enum ApplicationSecurityWafCustomRuleTagsCategory {
1010
ATTACK_ATTEMPT,
1111
BUSINESS_LOGIC,
12-
SECURITY_RESPONSES,
12+
SECURITY_RESPONSE,
1313
UnparsedObject(crate::datadog::UnparsedObject),
1414
}
1515

@@ -18,7 +18,7 @@ impl ToString for ApplicationSecurityWafCustomRuleTagsCategory {
1818
match self {
1919
Self::ATTACK_ATTEMPT => String::from("attack_attempt"),
2020
Self::BUSINESS_LOGIC => String::from("business_logic"),
21-
Self::SECURITY_RESPONSES => String::from("security_responses"),
21+
Self::SECURITY_RESPONSE => String::from("security_response"),
2222
Self::UnparsedObject(v) => v.value.to_string(),
2323
}
2424
}
@@ -45,7 +45,7 @@ impl<'de> Deserialize<'de> for ApplicationSecurityWafCustomRuleTagsCategory {
4545
Ok(match s.as_str() {
4646
"attack_attempt" => Self::ATTACK_ATTEMPT,
4747
"business_logic" => Self::BUSINESS_LOGIC,
48-
"security_responses" => Self::SECURITY_RESPONSES,
48+
"security_response" => Self::SECURITY_RESPONSE,
4949
_ => Self::UnparsedObject(crate::datadog::UnparsedObject {
5050
value: serde_json::Value::String(s.into()),
5151
}),
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025-01-06T22:02:35.383Z
1+
2025-03-26T20:24:59.622Z

tests/scenarios/cassettes/v2/action_connection/Create-a-new-Action-Connection-returns-Bad-Request-response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"message": "Bad Request"
3333
}
3434
},
35-
"recorded_at": "Mon, 06 Jan 2025 22:02:35 GMT"
35+
"recorded_at": "Wed, 26 Mar 2025 20:24:59 GMT"
3636
}
3737
],
3838
"recorded_with": "VCR 6.0.0"

0 commit comments

Comments
 (0)