@@ -29,6 +29,9 @@ pub struct AWSAccount {
2929/// to exclude from metrics collection.
3030#[ serde( rename = "excluded_regions" ) ]
3131 pub excluded_regions : Option < Vec < String > > ,
32+ /// Whether Datadog collects additional attributes and configuration information about the resources in your AWS account. Required for `cspm_resource_collection`.
33+ #[ serde( rename = "extended_resource_collection_enabled" ) ]
34+ pub extended_resource_collection_enabled : Option < bool > ,
3235 /// The array of EC2 tags (in the form `key:value`) defines a filter that Datadog uses when collecting metrics from EC2.
3336/// Wildcards, such as `?` (for single characters) and `*` (for multiple characters) can also be used.
3437/// Only hosts that match one of the defined tags
@@ -44,7 +47,8 @@ pub struct AWSAccount {
4447 /// Whether Datadog collects metrics for this AWS account.
4548#[ serde( rename = "metrics_collection_enabled" ) ]
4649 pub metrics_collection_enabled : Option < bool > ,
47- /// Whether Datadog collects a standard set of resources from your AWS account.
50+ /// Deprecated in favor of 'extended_resource_collection_enabled'. Whether Datadog collects a standard set of resources from your AWS account.
51+ #[ deprecated]
4852 #[ serde( rename = "resource_collection_enabled" ) ]
4953 pub resource_collection_enabled : Option < bool > ,
5054 /// Your Datadog role delegation name.
@@ -60,12 +64,14 @@ pub struct AWSAccount {
6064
6165impl AWSAccount {
6266 pub fn new ( ) -> AWSAccount {
67+ #[ allow( deprecated) ]
6368 AWSAccount {
6469 access_key_id : None ,
6570 account_id : None ,
6671 account_specific_namespace_rules : None ,
6772 cspm_resource_collection_enabled : None ,
6873 excluded_regions : None ,
74+ extended_resource_collection_enabled : None ,
6975 filter_tags : None ,
7076 host_tags : None ,
7177 metrics_collection_enabled : None ,
@@ -76,16 +82,19 @@ impl AWSAccount {
7682 }
7783 }
7884
85+ #[ allow( deprecated) ]
7986 pub fn access_key_id ( mut self , value : String ) -> Self {
8087 self . access_key_id = Some ( value) ;
8188 self
8289 }
8390
91+ #[ allow( deprecated) ]
8492 pub fn account_id ( mut self , value : String ) -> Self {
8593 self . account_id = Some ( value) ;
8694 self
8795 }
8896
97+ #[ allow( deprecated) ]
8998 pub fn account_specific_namespace_rules (
9099 mut self ,
91100 value : std:: collections:: BTreeMap < String , bool > ,
@@ -94,41 +103,55 @@ impl AWSAccount {
94103 self
95104 }
96105
106+ #[ allow( deprecated) ]
97107 pub fn cspm_resource_collection_enabled ( mut self , value : bool ) -> Self {
98108 self . cspm_resource_collection_enabled = Some ( value) ;
99109 self
100110 }
101111
112+ #[ allow( deprecated) ]
102113 pub fn excluded_regions ( mut self , value : Vec < String > ) -> Self {
103114 self . excluded_regions = Some ( value) ;
104115 self
105116 }
106117
118+ #[ allow( deprecated) ]
119+ pub fn extended_resource_collection_enabled ( mut self , value : bool ) -> Self {
120+ self . extended_resource_collection_enabled = Some ( value) ;
121+ self
122+ }
123+
124+ #[ allow( deprecated) ]
107125 pub fn filter_tags ( mut self , value : Vec < String > ) -> Self {
108126 self . filter_tags = Some ( value) ;
109127 self
110128 }
111129
130+ #[ allow( deprecated) ]
112131 pub fn host_tags ( mut self , value : Vec < String > ) -> Self {
113132 self . host_tags = Some ( value) ;
114133 self
115134 }
116135
136+ #[ allow( deprecated) ]
117137 pub fn metrics_collection_enabled ( mut self , value : bool ) -> Self {
118138 self . metrics_collection_enabled = Some ( value) ;
119139 self
120140 }
121141
142+ #[ allow( deprecated) ]
122143 pub fn resource_collection_enabled ( mut self , value : bool ) -> Self {
123144 self . resource_collection_enabled = Some ( value) ;
124145 self
125146 }
126147
148+ #[ allow( deprecated) ]
127149 pub fn role_name ( mut self , value : String ) -> Self {
128150 self . role_name = Some ( value) ;
129151 self
130152 }
131153
154+ #[ allow( deprecated) ]
132155 pub fn secret_access_key ( mut self , value : String ) -> Self {
133156 self . secret_access_key = Some ( value) ;
134157 self
@@ -165,6 +188,7 @@ impl<'de> Deserialize<'de> for AWSAccount {
165188 > = None ;
166189 let mut cspm_resource_collection_enabled: Option < bool > = None ;
167190 let mut excluded_regions: Option < Vec < String > > = None ;
191+ let mut extended_resource_collection_enabled: Option < bool > = None ;
168192 let mut filter_tags: Option < Vec < String > > = None ;
169193 let mut host_tags: Option < Vec < String > > = None ;
170194 let mut metrics_collection_enabled: Option < bool > = None ;
@@ -209,6 +233,13 @@ impl<'de> Deserialize<'de> for AWSAccount {
209233 excluded_regions =
210234 Some ( serde_json:: from_value ( v) . map_err ( M :: Error :: custom) ?) ;
211235 }
236+ "extended_resource_collection_enabled" => {
237+ if v. is_null ( ) {
238+ continue ;
239+ }
240+ extended_resource_collection_enabled =
241+ Some ( serde_json:: from_value ( v) . map_err ( M :: Error :: custom) ?) ;
242+ }
212243 "filter_tags" => {
213244 if v. is_null ( ) {
214245 continue ;
@@ -253,12 +284,14 @@ impl<'de> Deserialize<'de> for AWSAccount {
253284 }
254285 }
255286
287+ #[ allow( deprecated) ]
256288 let content = AWSAccount {
257289 access_key_id,
258290 account_id,
259291 account_specific_namespace_rules,
260292 cspm_resource_collection_enabled,
261293 excluded_regions,
294+ extended_resource_collection_enabled,
262295 filter_tags,
263296 host_tags,
264297 metrics_collection_enabled,
0 commit comments