Skip to content

[pull] master from DataDog:master #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 12, 2026
Merged

[pull] master from DataDog:master #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,8 +1485,6 @@ components:
$ref: '#/components/schemas/AWSAccountPartition'
aws_regions:
$ref: '#/components/schemas/AWSRegions'
ccm_config:
$ref: '#/components/schemas/AWSCCMConfig'
logs_config:
$ref: '#/components/schemas/AWSLogsConfig'
metrics_config:
Expand Down Expand Up @@ -1552,8 +1550,6 @@ components:
$ref: '#/components/schemas/AWSAccountPartition'
aws_regions:
$ref: '#/components/schemas/AWSRegions'
ccm_config:
$ref: '#/components/schemas/AWSCCMConfig'
created_at:
description: Timestamp of when the account integration was created.
format: date-time
Expand Down Expand Up @@ -1627,8 +1623,6 @@ components:
$ref: '#/components/schemas/AWSAccountPartition'
aws_regions:
$ref: '#/components/schemas/AWSRegions'
ccm_config:
$ref: '#/components/schemas/AWSCCMConfig'
logs_config:
$ref: '#/components/schemas/AWSLogsConfig'
metrics_config:
Expand Down Expand Up @@ -1760,15 +1754,6 @@ components:
required:
- role_name
type: object
AWSCCMConfig:
description: AWS Cloud Cost Management config.
properties:
data_export_configs:
description: List of data export configurations for Cost and Usage Reports.
items:
$ref: '#/components/schemas/DataExportConfig'
type: array
type: object
AWSCredentials:
description: The definition of `AWSCredentials` object.
oneOf:
Expand Down Expand Up @@ -16814,30 +16799,6 @@ components:
example: canceled
type: string
type: object
DataExportConfig:
description: AWS Cost and Usage Report data export configuration.
properties:
bucket_name:
description: Name of the S3 bucket where the Cost and Usage Report is stored.
example: billing
type: string
bucket_region:
description: AWS region of the S3 bucket.
example: us-east-1
type: string
report_name:
description: Name of the Cost and Usage Report.
example: cost-and-usage-report
type: string
report_prefix:
description: S3 prefix where the Cost and Usage Report is stored.
example: reports
type: string
report_type:
description: Type of the Cost and Usage Report.
example: CUR2.0
type: string
type: object
DataRelationshipsTeams:
description: Associates teams with this schedule in a data structure.
properties:
Expand Down
40 changes: 1 addition & 39 deletions api/datadogV2/model_aws_account_create_request_attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ type AWSAccountCreateRequestAttributes struct {
AwsPartition AWSAccountPartition `json:"aws_partition"`
// AWS Regions to collect data from. Defaults to `include_all`.
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
// AWS Cloud Cost Management config.
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
// AWS Logs Collection config.
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
// AWS Metrics Collection config.
Expand Down Expand Up @@ -195,34 +193,6 @@ func (o *AWSAccountCreateRequestAttributes) SetAwsRegions(v AWSRegions) {
o.AwsRegions = &v
}

// GetCcmConfig returns the CcmConfig field value if set, zero value otherwise.
func (o *AWSAccountCreateRequestAttributes) GetCcmConfig() AWSCCMConfig {
if o == nil || o.CcmConfig == nil {
var ret AWSCCMConfig
return ret
}
return *o.CcmConfig
}

// GetCcmConfigOk returns a tuple with the CcmConfig field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *AWSAccountCreateRequestAttributes) GetCcmConfigOk() (*AWSCCMConfig, bool) {
if o == nil || o.CcmConfig == nil {
return nil, false
}
return o.CcmConfig, true
}

// HasCcmConfig returns a boolean if a field has been set.
func (o *AWSAccountCreateRequestAttributes) HasCcmConfig() bool {
return o != nil && o.CcmConfig != nil
}

// SetCcmConfig gets a reference to the given AWSCCMConfig and assigns it to the CcmConfig field.
func (o *AWSAccountCreateRequestAttributes) SetCcmConfig(v AWSCCMConfig) {
o.CcmConfig = &v
}

// GetLogsConfig returns the LogsConfig field value if set, zero value otherwise.
func (o *AWSAccountCreateRequestAttributes) GetLogsConfig() AWSLogsConfig {
if o == nil || o.LogsConfig == nil {
Expand Down Expand Up @@ -350,9 +320,6 @@ func (o AWSAccountCreateRequestAttributes) MarshalJSON() ([]byte, error) {
if o.AwsRegions != nil {
toSerialize["aws_regions"] = o.AwsRegions
}
if o.CcmConfig != nil {
toSerialize["ccm_config"] = o.CcmConfig
}
if o.LogsConfig != nil {
toSerialize["logs_config"] = o.LogsConfig
}
Expand Down Expand Up @@ -380,7 +347,6 @@ func (o *AWSAccountCreateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
AwsAccountId *string `json:"aws_account_id"`
AwsPartition *AWSAccountPartition `json:"aws_partition"`
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
MetricsConfig *AWSMetricsConfig `json:"metrics_config,omitempty"`
ResourcesConfig *AWSResourcesConfig `json:"resources_config,omitempty"`
Expand All @@ -400,7 +366,7 @@ func (o *AWSAccountCreateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
}
additionalProperties := make(map[string]interface{})
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
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"})
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "logs_config", "metrics_config", "resources_config", "traces_config"})
} else {
return err
}
Expand All @@ -415,10 +381,6 @@ func (o *AWSAccountCreateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
o.AwsPartition = *all.AwsPartition
}
o.AwsRegions = all.AwsRegions
if all.CcmConfig != nil && all.CcmConfig.UnparsedObject != nil && o.UnparsedObject == nil {
hasInvalidField = true
}
o.CcmConfig = all.CcmConfig
if all.LogsConfig != nil && all.LogsConfig.UnparsedObject != nil && o.UnparsedObject == nil {
hasInvalidField = true
}
Expand Down
40 changes: 1 addition & 39 deletions api/datadogV2/model_aws_account_response_attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ type AWSAccountResponseAttributes struct {
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
// AWS Regions to collect data from. Defaults to `include_all`.
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
// AWS Cloud Cost Management config.
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
// Timestamp of when the account integration was created.
CreatedAt *time.Time `json:"created_at,omitempty"`
// AWS Logs Collection config.
Expand Down Expand Up @@ -208,34 +206,6 @@ func (o *AWSAccountResponseAttributes) SetAwsRegions(v AWSRegions) {
o.AwsRegions = &v
}

// GetCcmConfig returns the CcmConfig field value if set, zero value otherwise.
func (o *AWSAccountResponseAttributes) GetCcmConfig() AWSCCMConfig {
if o == nil || o.CcmConfig == nil {
var ret AWSCCMConfig
return ret
}
return *o.CcmConfig
}

// GetCcmConfigOk returns a tuple with the CcmConfig field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *AWSAccountResponseAttributes) GetCcmConfigOk() (*AWSCCMConfig, bool) {
if o == nil || o.CcmConfig == nil {
return nil, false
}
return o.CcmConfig, true
}

// HasCcmConfig returns a boolean if a field has been set.
func (o *AWSAccountResponseAttributes) HasCcmConfig() bool {
return o != nil && o.CcmConfig != nil
}

// SetCcmConfig gets a reference to the given AWSCCMConfig and assigns it to the CcmConfig field.
func (o *AWSAccountResponseAttributes) SetCcmConfig(v AWSCCMConfig) {
o.CcmConfig = &v
}

// GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
func (o *AWSAccountResponseAttributes) GetCreatedAt() time.Time {
if o == nil || o.CreatedAt == nil {
Expand Down Expand Up @@ -423,9 +393,6 @@ func (o AWSAccountResponseAttributes) MarshalJSON() ([]byte, error) {
if o.AwsRegions != nil {
toSerialize["aws_regions"] = o.AwsRegions
}
if o.CcmConfig != nil {
toSerialize["ccm_config"] = o.CcmConfig
}
if o.CreatedAt != nil {
if o.CreatedAt.Nanosecond() == 0 {
toSerialize["created_at"] = o.CreatedAt.Format("2006-01-02T15:04:05Z07:00")
Expand Down Expand Up @@ -467,7 +434,6 @@ func (o *AWSAccountResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
AwsAccountId *string `json:"aws_account_id"`
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
CreatedAt *time.Time `json:"created_at,omitempty"`
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
MetricsConfig *AWSMetricsConfig `json:"metrics_config,omitempty"`
Expand All @@ -483,7 +449,7 @@ func (o *AWSAccountResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
}
additionalProperties := make(map[string]interface{})
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
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"})
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"})
} else {
return err
}
Expand All @@ -498,10 +464,6 @@ func (o *AWSAccountResponseAttributes) UnmarshalJSON(bytes []byte) (err error) {
o.AwsPartition = all.AwsPartition
}
o.AwsRegions = all.AwsRegions
if all.CcmConfig != nil && all.CcmConfig.UnparsedObject != nil && o.UnparsedObject == nil {
hasInvalidField = true
}
o.CcmConfig = all.CcmConfig
o.CreatedAt = all.CreatedAt
if all.LogsConfig != nil && all.LogsConfig.UnparsedObject != nil && o.UnparsedObject == nil {
hasInvalidField = true
Expand Down
40 changes: 1 addition & 39 deletions api/datadogV2/model_aws_account_update_request_attributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ type AWSAccountUpdateRequestAttributes struct {
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
// AWS Regions to collect data from. Defaults to `include_all`.
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
// AWS Cloud Cost Management config.
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
// AWS Logs Collection config.
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
// AWS Metrics Collection config.
Expand Down Expand Up @@ -203,34 +201,6 @@ func (o *AWSAccountUpdateRequestAttributes) SetAwsRegions(v AWSRegions) {
o.AwsRegions = &v
}

// GetCcmConfig returns the CcmConfig field value if set, zero value otherwise.
func (o *AWSAccountUpdateRequestAttributes) GetCcmConfig() AWSCCMConfig {
if o == nil || o.CcmConfig == nil {
var ret AWSCCMConfig
return ret
}
return *o.CcmConfig
}

// GetCcmConfigOk returns a tuple with the CcmConfig field value if set, nil otherwise
// and a boolean to check if the value has been set.
func (o *AWSAccountUpdateRequestAttributes) GetCcmConfigOk() (*AWSCCMConfig, bool) {
if o == nil || o.CcmConfig == nil {
return nil, false
}
return o.CcmConfig, true
}

// HasCcmConfig returns a boolean if a field has been set.
func (o *AWSAccountUpdateRequestAttributes) HasCcmConfig() bool {
return o != nil && o.CcmConfig != nil
}

// SetCcmConfig gets a reference to the given AWSCCMConfig and assigns it to the CcmConfig field.
func (o *AWSAccountUpdateRequestAttributes) SetCcmConfig(v AWSCCMConfig) {
o.CcmConfig = &v
}

// GetLogsConfig returns the LogsConfig field value if set, zero value otherwise.
func (o *AWSAccountUpdateRequestAttributes) GetLogsConfig() AWSLogsConfig {
if o == nil || o.LogsConfig == nil {
Expand Down Expand Up @@ -362,9 +332,6 @@ func (o AWSAccountUpdateRequestAttributes) MarshalJSON() ([]byte, error) {
if o.AwsRegions != nil {
toSerialize["aws_regions"] = o.AwsRegions
}
if o.CcmConfig != nil {
toSerialize["ccm_config"] = o.CcmConfig
}
if o.LogsConfig != nil {
toSerialize["logs_config"] = o.LogsConfig
}
Expand Down Expand Up @@ -392,7 +359,6 @@ func (o *AWSAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
AwsAccountId *string `json:"aws_account_id"`
AwsPartition *AWSAccountPartition `json:"aws_partition,omitempty"`
AwsRegions *AWSRegions `json:"aws_regions,omitempty"`
CcmConfig *AWSCCMConfig `json:"ccm_config,omitempty"`
LogsConfig *AWSLogsConfig `json:"logs_config,omitempty"`
MetricsConfig *AWSMetricsConfig `json:"metrics_config,omitempty"`
ResourcesConfig *AWSResourcesConfig `json:"resources_config,omitempty"`
Expand All @@ -406,7 +372,7 @@ func (o *AWSAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
}
additionalProperties := make(map[string]interface{})
if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
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"})
datadog.DeleteKeys(additionalProperties, &[]string{"account_tags", "auth_config", "aws_account_id", "aws_partition", "aws_regions", "logs_config", "metrics_config", "resources_config", "traces_config"})
} else {
return err
}
Expand All @@ -421,10 +387,6 @@ func (o *AWSAccountUpdateRequestAttributes) UnmarshalJSON(bytes []byte) (err err
o.AwsPartition = all.AwsPartition
}
o.AwsRegions = all.AwsRegions
if all.CcmConfig != nil && all.CcmConfig.UnparsedObject != nil && o.UnparsedObject == nil {
hasInvalidField = true
}
o.CcmConfig = all.CcmConfig
if all.LogsConfig != nil && all.LogsConfig.UnparsedObject != nil && o.UnparsedObject == nil {
hasInvalidField = true
}
Expand Down
Loading
Loading