From 0e28851b45b8200ac8beabaa0c1a28cfb98039d4 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Tue, 9 Sep 2025 12:29:02 +0000 Subject: [PATCH] Regenerate client from commit 834034f of spec repo --- .generator/schemas/v1/openapi.yaml | 12 +++++ .generator/schemas/v2/openapi.yaml | 24 --------- .../v2/aws-integration/CreateAWSAccount.rb | 3 -- .../CreateAWSAccount_1716720881.rb | 3 -- .../aws-integration/CreateNewAWSExternalID.rb | 3 -- .../CreateNewAWSExternalID_364713854.rb | 3 -- .../v2/aws-integration/DeleteAWSAccount.rb | 3 -- examples/v2/aws-integration/GetAWSAccount.rb | 3 -- .../v2/aws-integration/ListAWSAccounts.rb | 3 -- .../v2/aws-integration/ListAWSNamespaces.rb | 3 -- .../ListAWSNamespaces_3031307873.rb | 3 -- .../v2/aws-integration/UpdateAWSAccount.rb | 3 -- .../ListAWSLogsServices.rb | 3 -- features/v2/aws_integration.feature | 54 +++++++------------ features/v2/aws_logs_integration.feature | 1 - lib/datadog_api_client/configuration.rb | 8 --- .../v1/api/aws_integration_api.rb | 27 ++++++++++ .../v1/api/aws_logs_integration_api.rb | 9 ++++ .../v2/api/aws_integration_api.rb | 42 --------------- .../v2/api/aws_logs_integration_api.rb | 6 --- 20 files changed, 66 insertions(+), 150 deletions(-) diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index f5051733337c..0f6baca4241b 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -27347,6 +27347,7 @@ paths: - hosts_read /api/v1/integration/aws: delete: + deprecated: true description: Delete a Datadog-AWS integration matching the specified `account_id` and `role_name parameters`. operationId: DeleteAWSAccount @@ -27393,6 +27394,7 @@ paths: permissions: - aws_configurations_manage get: + deprecated: true description: List all Datadog-AWS integrations available in your Datadog organization. operationId: ListAWSAccounts parameters: @@ -27443,6 +27445,7 @@ paths: permissions: - aws_configuration_read post: + deprecated: true description: 'Create a Datadog-Amazon Web Services integration. Using the `POST` method updates your integration configuration @@ -27494,6 +27497,7 @@ paths: permissions: - aws_configurations_manage put: + deprecated: true description: Update a Datadog-Amazon Web Services integration. operationId: UpdateAWSAccount parameters: @@ -27563,6 +27567,7 @@ paths: - aws_configuration_edit /api/v1/integration/aws/available_namespace_rules: get: + deprecated: true description: List all namespace rules for a given Datadog-AWS integration. This endpoint takes no arguments. operationId: ListAvailableAWSNamespaces @@ -27708,6 +27713,7 @@ paths: - manage_integrations /api/v1/integration/aws/filtering: delete: + deprecated: true description: Delete a tag filtering entry. operationId: DeleteAWSTagFilter requestBody: @@ -27749,6 +27755,7 @@ paths: permissions: - aws_configuration_edit get: + deprecated: true description: Get all AWS tag filters. operationId: ListAWSTagFilters parameters: @@ -27787,6 +27794,7 @@ paths: permissions: - aws_configuration_read post: + deprecated: true description: Set an AWS tag filter. operationId: CreateAWSTagFilter requestBody: @@ -27832,6 +27840,7 @@ paths: - aws_configuration_edit /api/v1/integration/aws/generate_new_external_id: put: + deprecated: true description: Generate a new AWS external ID for a given AWS account ID and role name pair. operationId: CreateNewAWSExternalID @@ -27917,6 +27926,7 @@ paths: permissions: - aws_configuration_edit get: + deprecated: true description: List all Datadog-AWS Logs integrations configured in your Datadog account. operationId: ListAWSLogsIntegrations @@ -28058,6 +28068,7 @@ paths: - aws_configuration_read /api/v1/integration/aws/logs/services: get: + deprecated: true description: Get the list of current AWS services that Datadog offers automatic log collection. Use returned service IDs with the services parameter for the Enable an AWS service log collection API endpoint. @@ -28100,6 +28111,7 @@ paths: permissions: - aws_configuration_read post: + deprecated: true description: Enable automatic log collection for a list of services. This should be run after running `CreateAWSLambdaARN` to save the configuration. operationId: EnableAWSLogServices diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 21a2d895b20c..f4b9ba788f10 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -55263,9 +55263,6 @@ paths: operator: OR permissions: - aws_configuration_read - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' post: description: Create a new AWS Account Integration Config. operationId: CreateAWSAccount @@ -55298,9 +55295,6 @@ paths: operator: OR permissions: - aws_configurations_manage - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' /api/v2/integration/aws/accounts/{aws_account_config_id}: delete: description: Delete an AWS Account Integration Config by config ID. @@ -55325,9 +55319,6 @@ paths: operator: OR permissions: - aws_configurations_manage - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' get: description: Get an AWS Account Integration Config by config ID. operationId: GetAWSAccount @@ -55355,9 +55346,6 @@ paths: operator: OR permissions: - aws_configuration_read - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' patch: description: Update an AWS Account Integration Config by config ID. operationId: UpdateAWSAccount @@ -55392,9 +55380,6 @@ paths: operator: OR permissions: - aws_configuration_edit - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' /api/v2/integration/aws/available_namespaces: get: description: Get a list of available AWS CloudWatch namespaces that can send @@ -55418,9 +55403,6 @@ paths: operator: OR permissions: - aws_configuration_read - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' /api/v2/integration/aws/generate_new_external_id: post: description: Generate a new external ID for AWS role-based authentication. @@ -55443,9 +55425,6 @@ paths: operator: OR permissions: - aws_configuration_edit - x-unstable: '**Note: This endpoint is in Preview. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' /api/v2/integration/aws/iam_permissions: get: description: Get all AWS IAM permissions required for the AWS integration. @@ -55484,9 +55463,6 @@ paths: operator: OR permissions: - aws_configuration_read - x-unstable: '**Note: This endpoint is in public beta. If you have any feedback, - - contact [Datadog support](https://docs.datadoghq.com/help/).**' /api/v2/integration/gcp/accounts: get: description: List all GCP STS-enabled service accounts configured in your Datadog diff --git a/examples/v2/aws-integration/CreateAWSAccount.rb b/examples/v2/aws-integration/CreateAWSAccount.rb index 0f20f690e279..0c3d16d03a13 100644 --- a/examples/v2/aws-integration/CreateAWSAccount.rb +++ b/examples/v2/aws-integration/CreateAWSAccount.rb @@ -1,9 +1,6 @@ # Create an AWS integration returns "AWS Account object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.create_aws_account".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new body = DatadogAPIClient::V2::AWSAccountCreateRequest.new({ diff --git a/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb b/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb index e821a96d0b80..5a4fa555447f 100644 --- a/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb +++ b/examples/v2/aws-integration/CreateAWSAccount_1716720881.rb @@ -1,9 +1,6 @@ # Create an AWS account returns "AWS Account object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.create_aws_account".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new body = DatadogAPIClient::V2::AWSAccountCreateRequest.new({ diff --git a/examples/v2/aws-integration/CreateNewAWSExternalID.rb b/examples/v2/aws-integration/CreateNewAWSExternalID.rb index a94f39812db7..0aeaf1353c80 100644 --- a/examples/v2/aws-integration/CreateNewAWSExternalID.rb +++ b/examples/v2/aws-integration/CreateNewAWSExternalID.rb @@ -1,8 +1,5 @@ # Generate a new external ID returns "AWS External ID object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.create_new_aws_external_id".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new p api_instance.create_new_aws_external_id() diff --git a/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.rb b/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.rb index dfc32788b330..32cc17873c4c 100644 --- a/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.rb +++ b/examples/v2/aws-integration/CreateNewAWSExternalID_364713854.rb @@ -1,8 +1,5 @@ # Generate new external ID returns "AWS External ID object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.create_new_aws_external_id".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new p api_instance.create_new_aws_external_id() diff --git a/examples/v2/aws-integration/DeleteAWSAccount.rb b/examples/v2/aws-integration/DeleteAWSAccount.rb index 932ea0a47382..3645c1aab0da 100644 --- a/examples/v2/aws-integration/DeleteAWSAccount.rb +++ b/examples/v2/aws-integration/DeleteAWSAccount.rb @@ -1,9 +1,6 @@ # Delete an AWS integration returns "No Content" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.delete_aws_account".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new # there is a valid "aws_account_v2" in the system diff --git a/examples/v2/aws-integration/GetAWSAccount.rb b/examples/v2/aws-integration/GetAWSAccount.rb index c1bcc43c0b99..84910548c94f 100644 --- a/examples/v2/aws-integration/GetAWSAccount.rb +++ b/examples/v2/aws-integration/GetAWSAccount.rb @@ -1,9 +1,6 @@ # Get an AWS integration by config ID returns "AWS Account object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.get_aws_account".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new # there is a valid "aws_account_v2" in the system diff --git a/examples/v2/aws-integration/ListAWSAccounts.rb b/examples/v2/aws-integration/ListAWSAccounts.rb index e853da50b507..218b14eb6e46 100644 --- a/examples/v2/aws-integration/ListAWSAccounts.rb +++ b/examples/v2/aws-integration/ListAWSAccounts.rb @@ -1,8 +1,5 @@ # List all AWS integrations returns "AWS Accounts List object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.list_aws_accounts".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new p api_instance.list_aws_accounts() diff --git a/examples/v2/aws-integration/ListAWSNamespaces.rb b/examples/v2/aws-integration/ListAWSNamespaces.rb index 8856f76b3017..bcc5bc31ceff 100644 --- a/examples/v2/aws-integration/ListAWSNamespaces.rb +++ b/examples/v2/aws-integration/ListAWSNamespaces.rb @@ -1,8 +1,5 @@ # List available namespaces returns "AWS Namespaces List object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.list_aws_namespaces".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new p api_instance.list_aws_namespaces() diff --git a/examples/v2/aws-integration/ListAWSNamespaces_3031307873.rb b/examples/v2/aws-integration/ListAWSNamespaces_3031307873.rb index f22d68203452..c1db8bf92d00 100644 --- a/examples/v2/aws-integration/ListAWSNamespaces_3031307873.rb +++ b/examples/v2/aws-integration/ListAWSNamespaces_3031307873.rb @@ -1,8 +1,5 @@ # List namespaces returns "AWS Namespaces List object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.list_aws_namespaces".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new p api_instance.list_aws_namespaces() diff --git a/examples/v2/aws-integration/UpdateAWSAccount.rb b/examples/v2/aws-integration/UpdateAWSAccount.rb index ad6270b1701b..1e7596a9e804 100644 --- a/examples/v2/aws-integration/UpdateAWSAccount.rb +++ b/examples/v2/aws-integration/UpdateAWSAccount.rb @@ -1,9 +1,6 @@ # Update an AWS integration returns "AWS Account object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.update_aws_account".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSIntegrationAPI.new # there is a valid "aws_account_v2" in the system diff --git a/examples/v2/aws-logs-integration/ListAWSLogsServices.rb b/examples/v2/aws-logs-integration/ListAWSLogsServices.rb index a6fc3e4e62a6..a2c9b592bf98 100644 --- a/examples/v2/aws-logs-integration/ListAWSLogsServices.rb +++ b/examples/v2/aws-logs-integration/ListAWSLogsServices.rb @@ -1,8 +1,5 @@ # Get list of AWS log ready services returns "AWS Logs Services List object" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.list_aws_logs_services".to_sym] = true -end api_instance = DatadogAPIClient::V2::AWSLogsIntegrationAPI.new p api_instance.list_aws_logs_services() diff --git a/features/v2/aws_integration.feature b/features/v2/aws_integration.feature index e0f1d4d7267c..a672cfebe7f8 100644 --- a/features/v2/aws_integration.feature +++ b/features/v2/aws_integration.feature @@ -11,32 +11,28 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Create an AWS account returns "AWS Account object" response - Given operation "CreateAWSAccount" enabled - And new "CreateAWSAccount" request + Given new "CreateAWSAccount" request And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} When the request is sent Then the response status is 200 AWS Account object @team:DataDog/aws-integrations Scenario: Create an AWS integration returns "AWS Account object" response - Given operation "CreateAWSAccount" enabled - And new "CreateAWSAccount" request + Given new "CreateAWSAccount" request And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} When the request is sent Then the response status is 200 AWS Account object @team:DataDog/aws-integrations Scenario: Create an AWS integration returns "Bad Request" response - Given operation "CreateAWSAccount" enabled - And new "CreateAWSAccount" request + Given new "CreateAWSAccount" request And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws-invalid", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} When the request is sent Then the response status is 400 Bad Request @team:DataDog/aws-integrations Scenario: Create an AWS integration returns "Conflict" response - Given operation "CreateAWSAccount" enabled - And there is a valid "aws_account_v2" in the system + Given there is a valid "aws_account_v2" in the system And new "CreateAWSAccount" request And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} When the request is sent @@ -44,16 +40,14 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Delete an AWS integration returns "Bad Request" response - Given operation "DeleteAWSAccount" enabled - And new "DeleteAWSAccount" request + Given new "DeleteAWSAccount" request And request contains "aws_account_config_id" parameter with value "not-a-uuid" When the request is sent Then the response status is 400 Bad Request @team:DataDog/aws-integrations Scenario: Delete an AWS integration returns "No Content" response - Given operation "DeleteAWSAccount" enabled - And there is a valid "aws_account_v2" in the system + Given there is a valid "aws_account_v2" in the system And new "DeleteAWSAccount" request And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id" When the request is sent @@ -61,8 +55,7 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Delete an AWS integration returns "Not Found" response - Given operation "DeleteAWSAccount" enabled - And there is a valid "aws_account_v2" in the system + Given there is a valid "aws_account_v2" in the system And new "DeleteAWSAccount" request And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a" When the request is sent @@ -70,15 +63,13 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Generate a new external ID returns "AWS External ID object" response - Given operation "CreateNewAWSExternalID" enabled - And new "CreateNewAWSExternalID" request + Given new "CreateNewAWSExternalID" request When the request is sent Then the response status is 200 AWS External ID object @team:DataDog/aws-integrations Scenario: Generate new external ID returns "AWS External ID object" response - Given operation "CreateNewAWSExternalID" enabled - And new "CreateNewAWSExternalID" request + Given new "CreateNewAWSExternalID" request When the request is sent Then the response status is 200 AWS External ID object @@ -90,8 +81,7 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Get an AWS integration by config ID returns "AWS Account object" response - Given operation "GetAWSAccount" enabled - And there is a valid "aws_account_v2" in the system + Given there is a valid "aws_account_v2" in the system And new "GetAWSAccount" request And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id" When the request is sent @@ -99,45 +89,39 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Get an AWS integration by config ID returns "Bad Request" response - Given operation "GetAWSAccount" enabled - And new "GetAWSAccount" request + Given new "GetAWSAccount" request And request contains "aws_account_config_id" parameter with value "not-a-uuid" When the request is sent Then the response status is 400 Bad Request @team:DataDog/aws-integrations Scenario: Get an AWS integration by config ID returns "Not Found" response - Given operation "GetAWSAccount" enabled - And new "GetAWSAccount" request + Given new "GetAWSAccount" request And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a" When the request is sent Then the response status is 404 Not Found @team:DataDog/aws-integrations Scenario: List all AWS integrations returns "AWS Accounts List object" response - Given operation "ListAWSAccounts" enabled - And new "ListAWSAccounts" request + Given new "ListAWSAccounts" request When the request is sent Then the response status is 200 AWS Accounts List object @team:DataDog/aws-integrations Scenario: List available namespaces returns "AWS Namespaces List object" response - Given operation "ListAWSNamespaces" enabled - And new "ListAWSNamespaces" request + Given new "ListAWSNamespaces" request When the request is sent Then the response status is 200 AWS Namespaces List object @team:DataDog/aws-integrations Scenario: List namespaces returns "AWS Namespaces List object" response - Given operation "ListAWSNamespaces" enabled - And new "ListAWSNamespaces" request + Given new "ListAWSNamespaces" request When the request is sent Then the response status is 200 AWS Namespaces List object @team:DataDog/aws-integrations Scenario: Update an AWS integration returns "AWS Account object" response - Given operation "UpdateAWSAccount" enabled - And there is a valid "aws_account_v2" in the system + Given there is a valid "aws_account_v2" in the system And new "UpdateAWSAccount" request And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id" And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} @@ -146,8 +130,7 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Update an AWS integration returns "Bad Request" response - Given operation "UpdateAWSAccount" enabled - And there is a valid "aws_account_v2" in the system + Given there is a valid "aws_account_v2" in the system And new "UpdateAWSAccount" request And request contains "aws_account_config_id" parameter from "aws_account_v2.data.id" And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"access_key_id": "AKIAIOSFODNN7EXAMPLE", "secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} @@ -156,8 +139,7 @@ Feature: AWS Integration @team:DataDog/aws-integrations Scenario: Update an AWS integration returns "Not Found" response - Given operation "UpdateAWSAccount" enabled - And new "UpdateAWSAccount" request + Given new "UpdateAWSAccount" request And request contains "aws_account_config_id" parameter with value "448169a8-251c-4344-abee-1c4edef39f7a" And body with value {"data": {"attributes": {"account_tags": ["key:value"], "auth_config": {"role_name": "DatadogIntegrationRole"}, "aws_account_id": "123456789012", "aws_partition": "aws", "logs_config": {"lambda_forwarder": {"lambdas": ["arn:aws:lambda:us-east-1:123456789012:function:DatadogLambdaLogForwarder"], "log_source_config": {"tag_filters": [{"source": "s3", "tags": ["test:test"]}]}, "sources": ["s3"]}}, "metrics_config": {"automute_enabled": true, "collect_cloudwatch_alarms": true, "collect_custom_metrics": true, "enabled": true, "tag_filters": [{"namespace": "AWS/EC2", "tags": ["key:value"]}]}, "resources_config": {"cloud_security_posture_management_collection": false, "extended_collection": false}, "traces_config": {}}, "type": "account"}} When the request is sent diff --git a/features/v2/aws_logs_integration.feature b/features/v2/aws_logs_integration.feature index 7dcfb894ae9d..0dc915e57948 100644 --- a/features/v2/aws_logs_integration.feature +++ b/features/v2/aws_logs_integration.feature @@ -10,7 +10,6 @@ Feature: AWS Logs Integration Given a valid "apiKeyAuth" key in the system And a valid "appKeyAuth" key in the system And an instance of "AWSLogsIntegration" API - And operation "ListAWSLogsServices" enabled And new "ListAWSLogsServices" request When the request is sent Then the response status is 200 AWS Logs Services List object diff --git a/lib/datadog_api_client/configuration.rb b/lib/datadog_api_client/configuration.rb index ea05f382d47e..85a3d5f1e1fe 100644 --- a/lib/datadog_api_client/configuration.rb +++ b/lib/datadog_api_client/configuration.rb @@ -248,14 +248,6 @@ def initialize "v2.update_incident_notification_template": false, "v2.update_incident_todo": false, "v2.update_incident_type": false, - "v2.create_aws_account": false, - "v2.create_new_aws_external_id": false, - "v2.delete_aws_account": false, - "v2.get_aws_account": false, - "v2.list_aws_accounts": false, - "v2.list_aws_namespaces": false, - "v2.update_aws_account": false, - "v2.list_aws_logs_services": false, "v2.create_monitor_user_template": false, "v2.delete_monitor_user_template": false, "v2.get_monitor_user_template": false, diff --git a/lib/datadog_api_client/v1/api/aws_integration_api.rb b/lib/datadog_api_client/v1/api/aws_integration_api.rb index 330db28f1594..d55c693983d3 100644 --- a/lib/datadog_api_client/v1/api/aws_integration_api.rb +++ b/lib/datadog_api_client/v1/api/aws_integration_api.rb @@ -38,10 +38,13 @@ def create_aws_account(body, opts = {}) # by adding your new configuration to the existing one in your Datadog organization. # A unique AWS Account ID for role based authentication. # + # @deprecated This API is deprecated. + # # @param body [AWSAccount] AWS Request Object # @param opts [Hash] the optional parameters # @return [Array<(AWSAccountCreateResponse, Integer, Hash)>] AWSAccountCreateResponse data, response status code and response headers def create_aws_account_with_http_info(body, opts = {}) + warn "[DEPRECATION] `CreateAWSAccount` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.create_aws_account ...' @@ -172,10 +175,13 @@ def create_aws_tag_filter(body, opts = {}) # # Set an AWS tag filter. # + # @deprecated This API is deprecated. + # # @param body [AWSTagFilterCreateRequest] Set an AWS tag filter using an `aws_account_identifier`, `namespace`, and filtering string. Namespace options are `application_elb`, `elb`, `lambda`, `network_elb`, `rds`, `sqs`, and `custom`. # @param opts [Hash] the optional parameters # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers def create_aws_tag_filter_with_http_info(body, opts = {}) + warn "[DEPRECATION] `CreateAWSTagFilter` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.create_aws_tag_filter ...' @@ -239,10 +245,13 @@ def create_new_aws_external_id(body, opts = {}) # # Generate a new AWS external ID for a given AWS account ID and role name pair. # + # @deprecated This API is deprecated. + # # @param body [AWSAccount] Your Datadog role delegation name. For more information about your AWS account Role name, see the [Datadog AWS integration configuration info](https://docs.datadoghq.com/integrations/amazon_web_services/#setup). # @param opts [Hash] the optional parameters # @return [Array<(AWSAccountCreateResponse, Integer, Hash)>] AWSAccountCreateResponse data, response status code and response headers def create_new_aws_external_id_with_http_info(body, opts = {}) + warn "[DEPRECATION] `CreateNewAWSExternalID` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.create_new_aws_external_id ...' @@ -306,10 +315,13 @@ def delete_aws_account(body, opts = {}) # # Delete a Datadog-AWS integration matching the specified `account_id` and `role_name parameters`. # + # @deprecated This API is deprecated. + # # @param body [AWSAccountDeleteRequest] AWS request object # @param opts [Hash] the optional parameters # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers def delete_aws_account_with_http_info(body, opts = {}) + warn "[DEPRECATION] `DeleteAWSAccount` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.delete_aws_account ...' @@ -440,10 +452,13 @@ def delete_aws_tag_filter(body, opts = {}) # # Delete a tag filtering entry. # + # @deprecated This API is deprecated. + # # @param body [AWSTagFilterDeleteRequest] Delete a tag filtering entry for a given AWS account and `dd-aws` namespace. # @param opts [Hash] the optional parameters # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers def delete_aws_tag_filter_with_http_info(body, opts = {}) + warn "[DEPRECATION] `DeleteAWSTagFilter` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.delete_aws_tag_filter ...' @@ -507,9 +522,12 @@ def list_available_aws_namespaces(opts = {}) # # List all namespace rules for a given Datadog-AWS integration. This endpoint takes no arguments. # + # @deprecated This API is deprecated. + # # @param opts [Hash] the optional parameters # @return [Array<(Array, Integer, Hash)>] Array data, response status code and response headers def list_available_aws_namespaces_with_http_info(opts = {}) + warn "[DEPRECATION] `ListAvailableAWSNamespaces` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.list_available_aws_namespaces ...' @@ -567,12 +585,15 @@ def list_aws_accounts(opts = {}) # # List all Datadog-AWS integrations available in your Datadog organization. # + # @deprecated This API is deprecated. + # # @param opts [Hash] the optional parameters # @option opts [String] :account_id Only return AWS accounts that matches this `account_id`. # @option opts [String] :role_name Only return AWS accounts that matches this role_name. # @option opts [String] :access_key_id Only return AWS accounts that matches this `access_key_id`. # @return [Array<(AWSAccountListResponse, Integer, Hash)>] AWSAccountListResponse data, response status code and response headers def list_aws_accounts_with_http_info(opts = {}) + warn "[DEPRECATION] `ListAWSAccounts` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.list_aws_accounts ...' @@ -693,10 +714,13 @@ def list_aws_tag_filters(account_id, opts = {}) # # Get all AWS tag filters. # + # @deprecated This API is deprecated. + # # @param account_id [String] Only return AWS filters that matches this `account_id`. # @param opts [Hash] the optional parameters # @return [Array<(AWSTagFilterListResponse, Integer, Hash)>] AWSTagFilterListResponse data, response status code and response headers def list_aws_tag_filters_with_http_info(account_id, opts = {}) + warn "[DEPRECATION] `ListAWSTagFilters` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.list_aws_tag_filters ...' @@ -759,6 +783,8 @@ def update_aws_account(body, opts = {}) # # Update a Datadog-Amazon Web Services integration. # + # @deprecated This API is deprecated. + # # @param body [AWSAccount] AWS request object # @param opts [Hash] the optional parameters # @option opts [String] :account_id Only return AWS accounts that matches this `account_id`. @@ -766,6 +792,7 @@ def update_aws_account(body, opts = {}) # @option opts [String] :access_key_id Only return AWS accounts that matches this `access_key_id`. Required if none of the other two options are specified. # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers def update_aws_account_with_http_info(body, opts = {}) + warn "[DEPRECATION] `UpdateAWSAccount` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.update_aws_account ...' diff --git a/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb b/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb index a7e7fc65b36e..7fbcd309ccb4 100644 --- a/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb +++ b/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb @@ -319,10 +319,13 @@ def enable_aws_log_services(body, opts = {}) # # Enable automatic log collection for a list of services. This should be run after running `CreateAWSLambdaARN` to save the configuration. # + # @deprecated This API is deprecated. + # # @param body [AWSLogsServicesRequest] Enable AWS Log Services request body. # @param opts [Hash] the optional parameters # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers def enable_aws_log_services_with_http_info(body, opts = {}) + warn "[DEPRECATION] `EnableAWSLogServices` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.enable_aws_log_services ...' @@ -386,9 +389,12 @@ def list_aws_logs_integrations(opts = {}) # # List all Datadog-AWS Logs integrations configured in your Datadog account. # + # @deprecated This API is deprecated. + # # @param opts [Hash] the optional parameters # @return [Array<(Array, Integer, Hash)>] Array data, response status code and response headers def list_aws_logs_integrations_with_http_info(opts = {}) + warn "[DEPRECATION] `ListAWSLogsIntegrations` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.list_aws_logs_integrations ...' @@ -446,9 +452,12 @@ def list_aws_logs_services(opts = {}) # # Get the list of current AWS services that Datadog offers automatic log collection. Use returned service IDs with the services parameter for the Enable an AWS service log collection API endpoint. # + # @deprecated This API is deprecated. + # # @param opts [Hash] the optional parameters # @return [Array<(Array, Integer, Hash)>] Array data, response status code and response headers def list_aws_logs_services_with_http_info(opts = {}) + warn "[DEPRECATION] `ListAWSLogsServices` is deprecated." if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.list_aws_logs_services ...' diff --git a/lib/datadog_api_client/v2/api/aws_integration_api.rb b/lib/datadog_api_client/v2/api/aws_integration_api.rb index 7c6fdaa9fa5e..4776e963fbc0 100644 --- a/lib/datadog_api_client/v2/api/aws_integration_api.rb +++ b/lib/datadog_api_client/v2/api/aws_integration_api.rb @@ -39,12 +39,6 @@ def create_aws_account(body, opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(AWSAccountResponse, Integer, Hash)>] AWSAccountResponse data, response status code and response headers def create_aws_account_with_http_info(body, opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.create_aws_account".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.create_aws_account") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.create_aws_account")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.create_aws_account ...' @@ -111,12 +105,6 @@ def create_new_aws_external_id(opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(AWSNewExternalIDResponse, Integer, Hash)>] AWSNewExternalIDResponse data, response status code and response headers def create_new_aws_external_id_with_http_info(opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.create_new_aws_external_id".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.create_new_aws_external_id") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.create_new_aws_external_id")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.create_new_aws_external_id ...' @@ -178,12 +166,6 @@ def delete_aws_account(aws_account_config_id, opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers def delete_aws_account_with_http_info(aws_account_config_id, opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.delete_aws_account".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.delete_aws_account") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.delete_aws_account")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.delete_aws_account ...' @@ -249,12 +231,6 @@ def get_aws_account(aws_account_config_id, opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(AWSAccountResponse, Integer, Hash)>] AWSAccountResponse data, response status code and response headers def get_aws_account_with_http_info(aws_account_config_id, opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.get_aws_account".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.get_aws_account") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.get_aws_account")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.get_aws_account ...' @@ -380,12 +356,6 @@ def list_aws_accounts(opts = {}) # @option opts [String] :aws_account_id Optional query parameter to filter accounts by AWS Account ID. If not provided, all accounts are returned. # @return [Array<(AWSAccountsResponse, Integer, Hash)>] AWSAccountsResponse data, response status code and response headers def list_aws_accounts_with_http_info(opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.list_aws_accounts".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.list_aws_accounts") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.list_aws_accounts")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.list_aws_accounts ...' @@ -447,12 +417,6 @@ def list_aws_namespaces(opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(AWSNamespacesResponse, Integer, Hash)>] AWSNamespacesResponse data, response status code and response headers def list_aws_namespaces_with_http_info(opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.list_aws_namespaces".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.list_aws_namespaces") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.list_aws_namespaces")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.list_aws_namespaces ...' @@ -515,12 +479,6 @@ def update_aws_account(aws_account_config_id, body, opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(AWSAccountResponse, Integer, Hash)>] AWSAccountResponse data, response status code and response headers def update_aws_account_with_http_info(aws_account_config_id, body, opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.update_aws_account".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.update_aws_account") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.update_aws_account")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSIntegrationAPI.update_aws_account ...' diff --git a/lib/datadog_api_client/v2/api/aws_logs_integration_api.rb b/lib/datadog_api_client/v2/api/aws_logs_integration_api.rb index 1ab29b3d0d01..48dbb2365c6c 100644 --- a/lib/datadog_api_client/v2/api/aws_logs_integration_api.rb +++ b/lib/datadog_api_client/v2/api/aws_logs_integration_api.rb @@ -38,12 +38,6 @@ def list_aws_logs_services(opts = {}) # @param opts [Hash] the optional parameters # @return [Array<(AWSLogsServicesResponse, Integer, Hash)>] AWSLogsServicesResponse data, response status code and response headers def list_aws_logs_services_with_http_info(opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.list_aws_logs_services".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.list_aws_logs_services") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.list_aws_logs_services")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.list_aws_logs_services ...'