Skip to content

Commit f2a2eae

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Revert - Update specs for AWS account updates and creation for CCM configs (DataDog#3579)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 5838037 commit f2a2eae

22 files changed

Lines changed: 34 additions & 564 deletions

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,8 +1485,6 @@ components:
14851485
$ref: '#/components/schemas/AWSAccountPartition'
14861486
aws_regions:
14871487
$ref: '#/components/schemas/AWSRegions'
1488-
ccm_config:
1489-
$ref: '#/components/schemas/AWSCCMConfig'
14901488
logs_config:
14911489
$ref: '#/components/schemas/AWSLogsConfig'
14921490
metrics_config:
@@ -1552,8 +1550,6 @@ components:
15521550
$ref: '#/components/schemas/AWSAccountPartition'
15531551
aws_regions:
15541552
$ref: '#/components/schemas/AWSRegions'
1555-
ccm_config:
1556-
$ref: '#/components/schemas/AWSCCMConfig'
15571553
created_at:
15581554
description: Timestamp of when the account integration was created.
15591555
format: date-time
@@ -1627,8 +1623,6 @@ components:
16271623
$ref: '#/components/schemas/AWSAccountPartition'
16281624
aws_regions:
16291625
$ref: '#/components/schemas/AWSRegions'
1630-
ccm_config:
1631-
$ref: '#/components/schemas/AWSCCMConfig'
16321626
logs_config:
16331627
$ref: '#/components/schemas/AWSLogsConfig'
16341628
metrics_config:
@@ -1760,15 +1754,6 @@ components:
17601754
required:
17611755
- role_name
17621756
type: object
1763-
AWSCCMConfig:
1764-
description: AWS Cloud Cost Management config.
1765-
properties:
1766-
data_export_configs:
1767-
description: List of data export configurations for Cost and Usage Reports.
1768-
items:
1769-
$ref: '#/components/schemas/DataExportConfig'
1770-
type: array
1771-
type: object
17721757
AWSCredentials:
17731758
description: The definition of `AWSCredentials` object.
17741759
oneOf:
@@ -16814,30 +16799,6 @@ components:
1681416799
example: canceled
1681516800
type: string
1681616801
type: object
16817-
DataExportConfig:
16818-
description: AWS Cost and Usage Report data export configuration.
16819-
properties:
16820-
bucket_name:
16821-
description: Name of the S3 bucket where the Cost and Usage Report is stored.
16822-
example: billing
16823-
type: string
16824-
bucket_region:
16825-
description: AWS region of the S3 bucket.
16826-
example: us-east-1
16827-
type: string
16828-
report_name:
16829-
description: Name of the Cost and Usage Report.
16830-
example: cost-and-usage-report
16831-
type: string
16832-
report_prefix:
16833-
description: S3 prefix where the Cost and Usage Report is stored.
16834-
example: reports
16835-
type: string
16836-
report_type:
16837-
description: Type of the Cost and Usage Report.
16838-
example: CUR2.0
16839-
type: string
16840-
type: object
1684116802
DataRelationshipsTeams:
1684216803
description: Associates teams with this schedule in a data structure.
1684316804
properties:

‎api/datadogV2/model_aws_account_create_request_attributes.go‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ type AWSAccountCreateRequestAttributes struct {
2424
AwsPartition AWSAccountPartition `json:"aws_partition"`
2525
// AWS Regions to collect data from. Defaults to `include_all`.
2626
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
27-
// AWS Cloud Cost Management config.
28-
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
2927
// AWS Logs Collection config.
3028
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
3129
// AWS Metrics Collection config.
@@ -195,34 +193,6 @@ func (o *AWSAccountCreateRequestAttributes) SetAwsRegions(v AWSRegions) {
195193
o.AwsRegions = &v
196194
}
197195

198-
// GetCcmConfig returns the CcmConfig field value if set, zero value otherwise.
199-
func (o *AWSAccountCreateRequestAttributes) GetCcmConfig() AWSCCMConfig {
200-
if o == nil || o.CcmConfig == nil {
201-
var ret AWSCCMConfig
202-
return ret
203-
}
204-
return *o.CcmConfig
205-
}
206-
207-
// GetCcmConfigOk returns a tuple with the CcmConfig field value if set, nil otherwise
208-
// and a boolean to check if the value has been set.
209-
func (o *AWSAccountCreateRequestAttributes) GetCcmConfigOk() (*AWSCCMConfig, bool) {
210-
if o == nil || o.CcmConfig == nil {
211-
return nil, false
212-
}
213-
return o.CcmConfig, true
214-
}
215-
216-
// HasCcmConfig returns a boolean if a field has been set.
217-
func (o *AWSAccountCreateRequestAttributes) HasCcmConfig() bool {
218-
return o != nil && o.CcmConfig != nil
219-
}
220-
221-
// SetCcmConfig gets a reference to the given AWSCCMConfig and assigns it to the CcmConfig field.
222-
func (o *AWSAccountCreateRequestAttributes) SetCcmConfig(v AWSCCMConfig) {
223-
o.CcmConfig = &v
224-
}
225-
226196
// GetLogsConfig returns the LogsConfig field value if set, zero value otherwise.
227197
func (o *AWSAccountCreateRequestAttributes) GetLogsConfig() AWSLogsConfig {
228198
if o == nil || o.LogsConfig == nil {
@@ -350,9 +320,6 @@ func (o AWSAccountCreateRequestAttributes) MarshalJSON() ([]byte, error) {
350320
if o.AwsRegions != nil {
351321
toSerialize["aws_regions"] = o.AwsRegions
352322
}
353-
if o.CcmConfig != nil {
354-
toSerialize["ccm_config"] = o.CcmConfig
355-
}
356323
if o.LogsConfig != nil {
357324
toSerialize["logs_config"] = o.LogsConfig
358325
}
@@ -380,7 +347,6 @@ func (o *AWSAccountCreateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
380347
AwsAccountId *string `json:"aws_account_id"`
381348
AwsPartition *AWSAccountPartition `json:"aws_partition"`
382349
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
383-
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
384350
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
385351
MetricsConfig *AWSMetricsConfig `json:"metrics_config,omitempty"`
386352
ResourcesConfig *AWSResourcesConfig `json:"resources_config,omitempty"`
@@ -400,7 +366,7 @@ func (o *AWSAccountCreateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
400366
}
401367
additionalProperties := make(map[string]interface{})
402368
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
403-
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "ccm_config", "logs_config", "metrics_config", "resources_config", "traces_config"})
369+
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "logs_config", "metrics_config", "resources_config", "traces_config"})
404370
} else {
405371
return err
406372
}
@@ -415,10 +381,6 @@ func (o *AWSAccountCreateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
415381
o.AwsPartition = *all.AwsPartition
416382
}
417383
o.AwsRegions = all.AwsRegions
418-
if all.CcmConfig != nil && all.CcmConfig.UnparsedObject != nil && o.UnparsedObject == nil {
419-
hasInvalidField = true
420-
}
421-
o.CcmConfig = all.CcmConfig
422384
if all.LogsConfig != nil && all.LogsConfig.UnparsedObject != nil && o.UnparsedObject == nil {
423385
hasInvalidField = true
424386
}

‎api/datadogV2/model_aws_account_response_attributes.go‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ type AWSAccountResponseAttributes struct {
2525
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
2626
// AWS Regions to collect data from. Defaults to `include_all`.
2727
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
28-
// AWS Cloud Cost Management config.
29-
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
3028
// Timestamp of when the account integration was created.
3129
CreatedAt *time.Time `json:"created_at,omitempty"`
3230
// AWS Logs Collection config.
@@ -208,34 +206,6 @@ func (o *AWSAccountResponseAttributes) SetAwsRegions(v AWSRegions) {
208206
o.AwsRegions = &v
209207
}
210208

211-
// GetCcmConfig returns the CcmConfig field value if set, zero value otherwise.
212-
func (o *AWSAccountResponseAttributes) GetCcmConfig() AWSCCMConfig {
213-
if o == nil || o.CcmConfig == nil {
214-
var ret AWSCCMConfig
215-
return ret
216-
}
217-
return *o.CcmConfig
218-
}
219-
220-
// GetCcmConfigOk returns a tuple with the CcmConfig field value if set, nil otherwise
221-
// and a boolean to check if the value has been set.
222-
func (o *AWSAccountResponseAttributes) GetCcmConfigOk() (*AWSCCMConfig, bool) {
223-
if o == nil || o.CcmConfig == nil {
224-
return nil, false
225-
}
226-
return o.CcmConfig, true
227-
}
228-
229-
// HasCcmConfig returns a boolean if a field has been set.
230-
func (o *AWSAccountResponseAttributes) HasCcmConfig() bool {
231-
return o != nil && o.CcmConfig != nil
232-
}
233-
234-
// SetCcmConfig gets a reference to the given AWSCCMConfig and assigns it to the CcmConfig field.
235-
func (o *AWSAccountResponseAttributes) SetCcmConfig(v AWSCCMConfig) {
236-
o.CcmConfig = &v
237-
}
238-
239209
// GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
240210
func (o *AWSAccountResponseAttributes) GetCreatedAt() time.Time {
241211
if o == nil || o.CreatedAt == nil {
@@ -423,9 +393,6 @@ func (o AWSAccountResponseAttributes) MarshalJSON() ([]byte, error) {
423393
if o.AwsRegions != nil {
424394
toSerialize["aws_regions"] = o.AwsRegions
425395
}
426-
if o.CcmConfig != nil {
427-
toSerialize["ccm_config"] = o.CcmConfig
428-
}
429396
if o.CreatedAt != nil {
430397
if o.CreatedAt.Nanosecond() == 0 {
431398
toSerialize["created_at"] = o.CreatedAt.Format("2006-01-02T15:04:05Z07:00")
@@ -467,7 +434,6 @@ func (o *AWSAccountResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
467434
AwsAccountId *string `json:"aws_account_id"`
468435
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
469436
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
470-
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
471437
CreatedAt *time.Time `json:"created_at,omitempty"`
472438
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
473439
MetricsConfig *AWSMetricsConfig `json:"metrics_config,omitempty"`
@@ -483,7 +449,7 @@ func (o *AWSAccountResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
483449
}
484450
additionalProperties := make(map[string]interface{})
485451
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
486-
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "ccm_config", "created_at", "logs_config", "metrics_config", "modified_at", "resources_config", "traces_config"})
452+
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "created_at", "logs_config", "metrics_config", "modified_at", "resources_config", "traces_config"})
487453
} else {
488454
return err
489455
}
@@ -498,10 +464,6 @@ func (o *AWSAccountResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
498464
o.AwsPartition = all.AwsPartition
499465
}
500466
o.AwsRegions = all.AwsRegions
501-
if all.CcmConfig != nil && all.CcmConfig.UnparsedObject != nil && o.UnparsedObject == nil {
502-
hasInvalidField = true
503-
}
504-
o.CcmConfig = all.CcmConfig
505467
o.CreatedAt = all.CreatedAt
506468
if all.LogsConfig != nil && all.LogsConfig.UnparsedObject != nil && o.UnparsedObject == nil {
507469
hasInvalidField = true

‎api/datadogV2/model_aws_account_update_request_attributes.go‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ type AWSAccountUpdateRequestAttributes struct {
2424
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
2525
// AWS Regions to collect data from. Defaults to `include_all`.
2626
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
27-
// AWS Cloud Cost Management config.
28-
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
2927
// AWS Logs Collection config.
3028
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
3129
// AWS Metrics Collection config.
@@ -203,34 +201,6 @@ func (o *AWSAccountUpdateRequestAttributes) SetAwsRegions(v AWSRegions) {
203201
o.AwsRegions = &v
204202
}
205203

206-
// GetCcmConfig returns the CcmConfig field value if set, zero value otherwise.
207-
func (o *AWSAccountUpdateRequestAttributes) GetCcmConfig() AWSCCMConfig {
208-
if o == nil || o.CcmConfig == nil {
209-
var ret AWSCCMConfig
210-
return ret
211-
}
212-
return *o.CcmConfig
213-
}
214-
215-
// GetCcmConfigOk returns a tuple with the CcmConfig field value if set, nil otherwise
216-
// and a boolean to check if the value has been set.
217-
func (o *AWSAccountUpdateRequestAttributes) GetCcmConfigOk() (*AWSCCMConfig, bool) {
218-
if o == nil || o.CcmConfig == nil {
219-
return nil, false
220-
}
221-
return o.CcmConfig, true
222-
}
223-
224-
// HasCcmConfig returns a boolean if a field has been set.
225-
func (o *AWSAccountUpdateRequestAttributes) HasCcmConfig() bool {
226-
return o != nil && o.CcmConfig != nil
227-
}
228-
229-
// SetCcmConfig gets a reference to the given AWSCCMConfig and assigns it to the CcmConfig field.
230-
func (o *AWSAccountUpdateRequestAttributes) SetCcmConfig(v AWSCCMConfig) {
231-
o.CcmConfig = &v
232-
}
233-
234204
// GetLogsConfig returns the LogsConfig field value if set, zero value otherwise.
235205
func (o *AWSAccountUpdateRequestAttributes) GetLogsConfig() AWSLogsConfig {
236206
if o == nil || o.LogsConfig == nil {
@@ -362,9 +332,6 @@ func (o AWSAccountUpdateRequestAttributes) MarshalJSON() ([]byte, error) {
362332
if o.AwsRegions != nil {
363333
toSerialize["aws_regions"] = o.AwsRegions
364334
}
365-
if o.CcmConfig != nil {
366-
toSerialize["ccm_config"] = o.CcmConfig
367-
}
368335
if o.LogsConfig != nil {
369336
toSerialize["logs_config"] = o.LogsConfig
370337
}
@@ -392,7 +359,6 @@ func (o *AWSAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
392359
AwsAccountId *string `json:"aws_account_id"`
393360
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
394361
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
395-
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
396362
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
397363
MetricsConfig *AWSMetricsConfig `json:"metrics_config,omitempty"`
398364
ResourcesConfig *AWSResourcesConfig `json:"resources_config,omitempty"`
@@ -406,7 +372,7 @@ func (o *AWSAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
406372
}
407373
additionalProperties := make(map[string]interface{})
408374
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
409-
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "ccm_config", "logs_config", "metrics_config", "resources_config", "traces_config"})
375+
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "logs_config", "metrics_config", "resources_config", "traces_config"})
410376
} else {
411377
return err
412378
}
@@ -421,10 +387,6 @@ func (o *AWSAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
421387
o.AwsPartition = all.AwsPartition
422388
}
423389
o.AwsRegions = all.AwsRegions
424-
if all.CcmConfig != nil && all.CcmConfig.UnparsedObject != nil && o.UnparsedObject == nil {
425-
hasInvalidField = true
426-
}
427-
o.CcmConfig = all.CcmConfig
428390
if all.LogsConfig != nil && all.LogsConfig.UnparsedObject != nil && o.UnparsedObject == nil {
429391
hasInvalidField = true
430392
}

0 commit comments

Comments
 (0)