Skip to content

Commit 0c0d867

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Add a new includeDiscovered query parameter to Software Catalog APIs (#1094)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent 11b620d commit 0c0d867

File tree

3 files changed

+55
-0
lines changed

3 files changed

+55
-0
lines changed

.generator/schemas/v2/openapi.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63547,6 +63547,14 @@ paths:
6354763547
- $ref: '#/components/parameters/FilterByRelationType'
6354863548
- $ref: '#/components/parameters/FilterByExcludeSnapshot'
6354963549
- $ref: '#/components/parameters/Include'
63550+
- description: If true, includes discovered services from APM and USM that do
63551+
not have entity definitions.
63552+
in: query
63553+
name: includeDiscovered
63554+
required: false
63555+
schema:
63556+
default: false
63557+
type: boolean
6355063558
responses:
6355163559
'200':
6355263560
content:
@@ -63765,6 +63773,13 @@ paths:
6376563773
- $ref: '#/components/parameters/FilterRelationByFromRef'
6376663774
- $ref: '#/components/parameters/FilterRelationByToRef'
6376763775
- $ref: '#/components/parameters/RelationInclude'
63776+
- description: If true, includes relationships discovered by APM and USM.
63777+
in: query
63778+
name: includeDiscovered
63779+
required: false
63780+
schema:
63781+
default: false
63782+
type: boolean
6376863783
responses:
6376963784
'200':
6377063785
content:

src/datadogV2/api/api_software_catalog.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ pub struct ListCatalogEntityOptionalParams {
3636
pub filter_exclude_snapshot: Option<String>,
3737
/// Include relationship data.
3838
pub include: Option<crate::datadogV2::model::IncludeType>,
39+
/// If true, includes discovered services from APM and USM that do not have entity definitions.
40+
pub include_discovered: Option<bool>,
3941
}
4042

4143
impl ListCatalogEntityOptionalParams {
@@ -89,6 +91,11 @@ impl ListCatalogEntityOptionalParams {
8991
self.include = Some(value);
9092
self
9193
}
94+
/// If true, includes discovered services from APM and USM that do not have entity definitions.
95+
pub fn include_discovered(mut self, value: bool) -> Self {
96+
self.include_discovered = Some(value);
97+
self
98+
}
9299
}
93100

94101
/// ListCatalogKindOptionalParams is a struct for passing parameters to the method [`SoftwareCatalogAPI::list_catalog_kind`]
@@ -144,6 +151,8 @@ pub struct ListCatalogRelationOptionalParams {
144151
pub filter_to_ref: Option<String>,
145152
/// Include relationship data.
146153
pub include: Option<crate::datadogV2::model::RelationIncludeType>,
154+
/// If true, includes relationships discovered by APM and USM.
155+
pub include_discovered: Option<bool>,
147156
}
148157

149158
impl ListCatalogRelationOptionalParams {
@@ -177,6 +186,11 @@ impl ListCatalogRelationOptionalParams {
177186
self.include = Some(value);
178187
self
179188
}
189+
/// If true, includes relationships discovered by APM and USM.
190+
pub fn include_discovered(mut self, value: bool) -> Self {
191+
self.include_discovered = Some(value);
192+
self
193+
}
180194
}
181195

182196
/// DeleteCatalogEntityError is a struct for typed errors of method [`SoftwareCatalogAPI::delete_catalog_entity`]
@@ -563,6 +577,7 @@ impl SoftwareCatalogAPI {
563577
let filter_relation_type = params.filter_relation_type;
564578
let filter_exclude_snapshot = params.filter_exclude_snapshot;
565579
let include = params.include;
580+
let include_discovered = params.include_discovered;
566581

567582
let local_client = &self.client;
568583

@@ -613,6 +628,10 @@ impl SoftwareCatalogAPI {
613628
local_req_builder =
614629
local_req_builder.query(&[("include", &local_query_param.to_string())]);
615630
};
631+
if let Some(ref local_query_param) = include_discovered {
632+
local_req_builder =
633+
local_req_builder.query(&[("includeDiscovered", &local_query_param.to_string())]);
634+
};
616635

617636
// build headers
618637
let mut headers = HeaderMap::new();
@@ -924,6 +943,7 @@ impl SoftwareCatalogAPI {
924943
let filter_from_ref = params.filter_from_ref;
925944
let filter_to_ref = params.filter_to_ref;
926945
let include = params.include;
946+
let include_discovered = params.include_discovered;
927947

928948
let local_client = &self.client;
929949

@@ -958,6 +978,10 @@ impl SoftwareCatalogAPI {
958978
local_req_builder =
959979
local_req_builder.query(&[("include", &local_query_param.to_string())]);
960980
};
981+
if let Some(ref local_query_param) = include_discovered {
982+
local_req_builder =
983+
local_req_builder.query(&[("includeDiscovered", &local_query_param.to_string())]);
984+
};
961985

962986
// build headers
963987
let mut headers = HeaderMap::new();

tests/scenarios/function_mappings.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15593,6 +15593,9 @@ fn test_v2_list_catalog_entity(world: &mut DatadogWorld, _parameters: &HashMap<S
1559315593
let include = _parameters
1559415594
.get("include")
1559515595
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
15596+
let include_discovered = _parameters
15597+
.get("includeDiscovered")
15598+
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1559615599
let mut params = datadogV2::api_software_catalog::ListCatalogEntityOptionalParams::default();
1559715600
params.page_offset = page_offset;
1559815601
params.page_limit = page_limit;
@@ -15604,6 +15607,7 @@ fn test_v2_list_catalog_entity(world: &mut DatadogWorld, _parameters: &HashMap<S
1560415607
params.filter_relation_type = filter_relation_type;
1560515608
params.filter_exclude_snapshot = filter_exclude_snapshot;
1560615609
params.include = include;
15610+
params.include_discovered = include_discovered;
1560715611
let response = match block_on(api.list_catalog_entity_with_http_info(params)) {
1560815612
Ok(response) => response,
1560915613
Err(error) => {
@@ -15660,6 +15664,9 @@ fn test_v2_list_catalog_entity_with_pagination(
1566015664
let include = _parameters
1566115665
.get("include")
1566215666
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
15667+
let include_discovered = _parameters
15668+
.get("includeDiscovered")
15669+
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1566315670
let mut params = datadogV2::api_software_catalog::ListCatalogEntityOptionalParams::default();
1566415671
params.page_offset = page_offset;
1566515672
params.page_limit = page_limit;
@@ -15671,6 +15678,7 @@ fn test_v2_list_catalog_entity_with_pagination(
1567115678
params.filter_relation_type = filter_relation_type;
1567215679
params.filter_exclude_snapshot = filter_exclude_snapshot;
1567315680
params.include = include;
15681+
params.include_discovered = include_discovered;
1567415682
let response = api.list_catalog_entity_with_pagination(params);
1567515683
let mut result = Vec::new();
1567615684

@@ -15944,13 +15952,17 @@ fn test_v2_list_catalog_relation(world: &mut DatadogWorld, _parameters: &HashMap
1594415952
let include = _parameters
1594515953
.get("include")
1594615954
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
15955+
let include_discovered = _parameters
15956+
.get("includeDiscovered")
15957+
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1594715958
let mut params = datadogV2::api_software_catalog::ListCatalogRelationOptionalParams::default();
1594815959
params.page_offset = page_offset;
1594915960
params.page_limit = page_limit;
1595015961
params.filter_type = filter_type;
1595115962
params.filter_from_ref = filter_from_ref;
1595215963
params.filter_to_ref = filter_to_ref;
1595315964
params.include = include;
15965+
params.include_discovered = include_discovered;
1595415966
let response = match block_on(api.list_catalog_relation_with_http_info(params)) {
1595515967
Ok(response) => response,
1595615968
Err(error) => {
@@ -15995,13 +16007,17 @@ fn test_v2_list_catalog_relation_with_pagination(
1599516007
let include = _parameters
1599616008
.get("include")
1599716009
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
16010+
let include_discovered = _parameters
16011+
.get("includeDiscovered")
16012+
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1599816013
let mut params = datadogV2::api_software_catalog::ListCatalogRelationOptionalParams::default();
1599916014
params.page_offset = page_offset;
1600016015
params.page_limit = page_limit;
1600116016
params.filter_type = filter_type;
1600216017
params.filter_from_ref = filter_from_ref;
1600316018
params.filter_to_ref = filter_to_ref;
1600416019
params.include = include;
16020+
params.include_discovered = include_discovered;
1600516021
let response = api.list_catalog_relation_with_pagination(params);
1600616022
let mut result = Vec::new();
1600716023

0 commit comments

Comments
 (0)