From cb9ee82c34cba4e6f001c8b2e23d751c600e0c48 Mon Sep 17 00:00:00 2001 From: "api-clients-generation-pipeline[bot]" <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:46:40 +0000 Subject: [PATCH] Fix GCP CSPM test in Java (#1805) Co-authored-by: ci.datadog-api-spec Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> --- .apigentools-info | 8 ++++---- .../v2/gcp-integration/CreateGCPSTSAccount_4235664992.py | 1 + ...e_account_with_cspm_enabled_returns_ok_response.frozen | 2 +- ...ice_account_with_cspm_enabled_returns_ok_response.yaml | 6 +++--- tests/v2/features/gcp_integration.feature | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index 886b5c3fda..9e9c21dff7 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2023-12-14 19:38:24.188378", - "spec_repo_commit": "cdc82e06" + "regenerated": "2023-12-15 15:50:51.303374", + "spec_repo_commit": "56bcf717" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2023-12-14 19:38:24.201899", - "spec_repo_commit": "cdc82e06" + "regenerated": "2023-12-15 15:50:51.318688", + "spec_repo_commit": "56bcf717" } } } \ No newline at end of file diff --git a/examples/v2/gcp-integration/CreateGCPSTSAccount_4235664992.py b/examples/v2/gcp-integration/CreateGCPSTSAccount_4235664992.py index 8c5e3c1938..579ff666cd 100644 --- a/examples/v2/gcp-integration/CreateGCPSTSAccount_4235664992.py +++ b/examples/v2/gcp-integration/CreateGCPSTSAccount_4235664992.py @@ -13,6 +13,7 @@ data=GCPSTSServiceAccountData( attributes=GCPSTSServiceAccountAttributes( is_cspm_enabled=True, + resource_collection_enabled=True, client_email="252bf553ef04b351@test-project.iam.gserviceaccount.com", host_filters=[], ), diff --git a/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.frozen b/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.frozen index 4c8e03a1d9..007c9de4a0 100644 --- a/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.frozen +++ b/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.frozen @@ -1 +1 @@ -2023-12-13T21:29:09.202Z \ No newline at end of file +2023-12-15T08:45:38.020Z \ No newline at end of file diff --git a/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.yaml b/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.yaml index 30319103a1..d323d1e3bd 100644 --- a/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.yaml +++ b/tests/v2/cassettes/test_scenarios/test_create_a_new_entry_for_your_service_account_with_cspm_enabled_returns_ok_response.yaml @@ -1,6 +1,6 @@ interactions: - request: - body: '{"data":{"attributes":{"client_email":"dfb9f119aee90526@test-project.iam.gserviceaccount.com","host_filters":[],"is_cspm_enabled":true},"type":"gcp_service_account"}}' + body: '{"data":{"attributes":{"client_email":"9f53cbf93a21704b@test-project.iam.gserviceaccount.com","host_filters":[],"is_cspm_enabled":true,"resource_collection_enabled":true},"type":"gcp_service_account"}}' headers: accept: - application/json @@ -10,7 +10,7 @@ interactions: uri: https://api.datadoghq.com/api/v2/integration/gcp/accounts response: body: - string: '{"data":{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"resource_collection_enabled":true,"is_cspm_enabled":true,"client_email":"dfb9f119aee90526@test-project.iam.gserviceaccount.com","account_tags":[],"automute":false,"host_filters":[]},"id":"d2ef6458-62a4-4fbe-ad48-9429baa01867"}} + string: '{"data":{"type":"gcp_service_account","attributes":{"is_cspm_enabled":true,"account_tags":[],"host_filters":[],"resource_collection_enabled":true,"is_security_command_center_enabled":false,"client_email":"9f53cbf93a21704b@test-project.iam.gserviceaccount.com","automute":false},"id":"cf3c6e32-dad2-452e-8c09-f34c5f2211a1"}} ' headers: @@ -25,7 +25,7 @@ interactions: accept: - '*/*' method: DELETE - uri: https://api.datadoghq.com/api/v2/integration/gcp/accounts/d2ef6458-62a4-4fbe-ad48-9429baa01867 + uri: https://api.datadoghq.com/api/v2/integration/gcp/accounts/cf3c6e32-dad2-452e-8c09-f34c5f2211a1 response: body: string: '' diff --git a/tests/v2/features/gcp_integration.feature b/tests/v2/features/gcp_integration.feature index 5414ae350b..d4111a43e3 100644 --- a/tests/v2/features/gcp_integration.feature +++ b/tests/v2/features/gcp_integration.feature @@ -67,7 +67,7 @@ Feature: GCP Integration @team:DataDog/gcp-integrations Scenario: Create a new entry for your service account with cspm enabled returns "OK" response Given new "CreateGCPSTSAccount" request - And body with value {"data": {"attributes": {"is_cspm_enabled": true, "client_email": "{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}} + And body with value {"data": {"attributes": {"is_cspm_enabled": true, "resource_collection_enabled": true, "client_email": "{{ unique_hash }}@test-project.iam.gserviceaccount.com", "host_filters": []}, "type": "gcp_service_account"}} When the request is sent Then the response status is 201 OK And the response "data.type" is equal to "gcp_service_account"