diff --git a/.apigentools-info b/.apigentools-info index 612472dae37..2d1f77c8b5d 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2024-10-23 16:37:04.850584", - "spec_repo_commit": "a916f673" + "regenerated": "2024-10-24 15:38:49.959224", + "spec_repo_commit": "da544f48" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2024-10-23 16:37:04.869465", - "spec_repo_commit": "a916f673" + "regenerated": "2024-10-24 15:38:49.977906", + "spec_repo_commit": "da544f48" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index db36354cca9..e74833c0c4c 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -4506,10 +4506,13 @@ components: example: test-name type: string resources: - description: An allowlist of resources to restrict pulling metrics for. + description: An allowlist of resources to restrict pulling metrics for including + `'web', 'dns', 'lb' (load balancer), and 'worker'`. example: - web - dns + - lb + - worker items: type: string type: array @@ -4554,10 +4557,13 @@ components: example: test-name type: string resources: - description: An allowlist of resources to restrict pulling metrics for. + description: An allowlist of resources to restrict pulling metrics for including + `'web', 'dns', 'lb' (load balancer), and 'worker'`. example: - web - dns + - lb + - worker items: type: string type: array @@ -4621,10 +4627,13 @@ components: description: The name of the Cloudflare account. type: string resources: - description: An allowlist of resources to restrict pulling metrics for. + description: An allowlist of resources to restrict pulling metrics for including + `'web', 'dns', 'lb' (load balancer), and 'worker'`. example: - web - dns + - lb + - worker items: type: string type: array diff --git a/features/v2/cloudflare_integration.feature b/features/v2/cloudflare_integration.feature index aaca58aec12..506d440826d 100644 --- a/features/v2/cloudflare_integration.feature +++ b/features/v2/cloudflare_integration.feature @@ -13,7 +13,7 @@ Feature: Cloudflare Integration @generated @skip @team:DataDog/saas-integrations Scenario: Add Cloudflare account returns "Bad Request" response Given new "CreateCloudflareAccount" request - And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "name": "test-name", "resources": ["web", "dns"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} + And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "name": "test-name", "resources": ["web", "dns", "lb", "worker"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} When the request is sent Then the response status is 400 Bad Request @@ -44,7 +44,7 @@ Feature: Cloudflare Integration @generated @skip @team:DataDog/saas-integrations Scenario: Add Cloudflare account returns "Not Found" response Given new "CreateCloudflareAccount" request - And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "name": "test-name", "resources": ["web", "dns"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} + And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "name": "test-name", "resources": ["web", "dns", "lb", "worker"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} When the request is sent Then the response status is 404 Not Found @@ -118,7 +118,7 @@ Feature: Cloudflare Integration Scenario: Update Cloudflare account returns "Bad Request" response Given new "UpdateCloudflareAccount" request And request contains "account_id" parameter from "REPLACE.ME" - And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "resources": ["web", "dns"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} + And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "resources": ["web", "dns", "lb", "worker"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} When the request is sent Then the response status is 400 Bad Request @@ -144,7 +144,7 @@ Feature: Cloudflare Integration Scenario: Update Cloudflare account returns "Not Found" response Given new "UpdateCloudflareAccount" request And request contains "account_id" parameter from "REPLACE.ME" - And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "resources": ["web", "dns"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} + And body with value {"data": {"attributes": {"api_key": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "email": "test-email@example.com", "resources": ["web", "dns", "lb", "worker"], "zones": ["zone_id_1", "zone_id_2"]}, "type": "cloudflare-accounts"}} When the request is sent Then the response status is 404 Not Found diff --git a/features/v2/given.json b/features/v2/given.json index efc7bed91b5..0153edccea8 100644 --- a/features/v2/given.json +++ b/features/v2/given.json @@ -240,7 +240,7 @@ "parameters": [ { "name": "body", - "value": "{\n \"data\": {\n \"type\": \"cloudflare-accounts\",\n \"attributes\": {\n \"api_key\": \"fakekey\",\n \"name\": \"{{ unique_lower_alnum }}\",\n \"email\": \"dev@datadog.com\",\n \"zones\": [\"zone-id-1\", \"zone-id-2\"],\n \"resources\": [\"web\", \"dns\"]\n }\n }\n}" + "value": "{\n \"data\": {\n \"type\": \"cloudflare-accounts\",\n \"attributes\": {\n \"api_key\": \"fakekey\",\n \"name\": \"{{ unique_lower_alnum }}\",\n \"email\": \"dev@datadog.com\",\n \"zones\": [\"zone-id-1\", \"zone-id-2\"],\n \"resources\": [\"web\", \"dns\", \"lb\", \"worker\"]\n }\n }\n}" } ], "step": "there is a valid \"cloudflare_account\" in the system", diff --git a/packages/datadog-api-client-v2/models/CloudflareAccountCreateRequestAttributes.ts b/packages/datadog-api-client-v2/models/CloudflareAccountCreateRequestAttributes.ts index 69dd232e9c5..bc6f94221b6 100644 --- a/packages/datadog-api-client-v2/models/CloudflareAccountCreateRequestAttributes.ts +++ b/packages/datadog-api-client-v2/models/CloudflareAccountCreateRequestAttributes.ts @@ -23,7 +23,7 @@ export class CloudflareAccountCreateRequestAttributes { */ "name": string; /** - * An allowlist of resources to restrict pulling metrics for. + * An allowlist of resources to restrict pulling metrics for including `'web', 'dns', 'lb' (load balancer), and 'worker'`. */ "resources"?: Array; /** diff --git a/packages/datadog-api-client-v2/models/CloudflareAccountResponseAttributes.ts b/packages/datadog-api-client-v2/models/CloudflareAccountResponseAttributes.ts index 826b998f64d..045cb1304b7 100644 --- a/packages/datadog-api-client-v2/models/CloudflareAccountResponseAttributes.ts +++ b/packages/datadog-api-client-v2/models/CloudflareAccountResponseAttributes.ts @@ -19,7 +19,7 @@ export class CloudflareAccountResponseAttributes { */ "name": string; /** - * An allowlist of resources to restrict pulling metrics for. + * An allowlist of resources to restrict pulling metrics for including `'web', 'dns', 'lb' (load balancer), and 'worker'`. */ "resources"?: Array; /** diff --git a/packages/datadog-api-client-v2/models/CloudflareAccountUpdateRequestAttributes.ts b/packages/datadog-api-client-v2/models/CloudflareAccountUpdateRequestAttributes.ts index 4ecce58d619..8fe73f8be00 100644 --- a/packages/datadog-api-client-v2/models/CloudflareAccountUpdateRequestAttributes.ts +++ b/packages/datadog-api-client-v2/models/CloudflareAccountUpdateRequestAttributes.ts @@ -23,7 +23,7 @@ export class CloudflareAccountUpdateRequestAttributes { */ "name"?: string; /** - * An allowlist of resources to restrict pulling metrics for. + * An allowlist of resources to restrict pulling metrics for including `'web', 'dns', 'lb' (load balancer), and 'worker'`. */ "resources"?: Array; /**