From 7dfd7633a328f137347162340ac088c825fbb5c3 Mon Sep 17 00:00:00 2001 From: "api-clients-generation-pipeline[bot]" <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 14:24:37 +0000 Subject: [PATCH] Regenerate client from commit 0c99985 of spec repo (#802) 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 +++---- .generator/schemas/v1/openapi.yaml | 20 ++++++++++++++++ .generator/schemas/v2/openapi.yaml | 24 +++++++++++++++++++ docs/v1/LogsIndexesApi.md | 6 +++-- docs/v1/LogsPipelinesApi.md | 9 ++++--- docs/v2/LogsArchivesApi.md | 12 ++++++---- docs/v2/LogsMetricsApi.md | 6 +++-- .../v1/api/logs_indexes_api.py | 4 ++-- .../v1/api/logs_pipelines_api.py | 6 ++--- .../v2/api/logs_archives_api.py | 8 +++---- .../v2/api/logs_metrics_api.py | 4 ++-- tests/v2/features/logs.feature | 4 ++-- 12 files changed, 83 insertions(+), 28 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index e35e57f78b..45d1e439dc 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.1", - "regenerated": "2022-01-21 15:36:42.752034", - "spec_repo_commit": "a7ac3db" + "regenerated": "2022-01-26 13:33:00.873323", + "spec_repo_commit": "0c99985" }, "v2": { "apigentools_version": "1.6.1", - "regenerated": "2022-01-21 15:36:43.187598", - "spec_repo_commit": "a7ac3db" + "regenerated": "2022-01-26 13:33:01.519206", + "spec_repo_commit": "0c99985" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index f8ae892823..676956b97f 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -19857,6 +19857,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get indexes order tags: - Logs Indexes @@ -19925,6 +19929,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get all indexes tags: - Logs Indexes @@ -20084,6 +20092,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get pipeline order tags: - Logs Pipelines @@ -20165,6 +20177,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get all pipelines tags: - Logs Pipelines @@ -20282,6 +20298,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get a pipeline tags: - Logs Pipelines diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 4a79c4326e..1ba8088ee4 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -6835,6 +6835,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get archive order tags: - Logs Archives @@ -6913,6 +6917,10 @@ paths: description: Forbidden '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get all archives tags: - Logs Archives @@ -7028,6 +7036,10 @@ paths: description: Not found '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get an archive tags: - Logs Archives @@ -7159,6 +7171,10 @@ paths: description: Not found '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: List read roles for an archive tags: - Logs Archives @@ -7222,6 +7238,10 @@ paths: $ref: '#/components/responses/NotAuthorizedResponse' '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get all log-based metrics tags: - Logs Metrics @@ -7315,6 +7335,10 @@ paths: $ref: '#/components/responses/NotFoundResponse' '429': $ref: '#/components/responses/TooManyRequestsResponse' + security: + - apiKeyAuth: [] + appKeyAuth: [] + - AuthZ: [] summary: Get a log-based metric tags: - Logs Metrics diff --git a/docs/v1/LogsIndexesApi.md b/docs/v1/LogsIndexesApi.md index 632e574ef6..c2af068758 100644 --- a/docs/v1/LogsIndexesApi.md +++ b/docs/v1/LogsIndexesApi.md @@ -168,6 +168,7 @@ Get the current order of your log indexes. This endpoint takes no JSON arguments ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -205,7 +206,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -231,6 +232,7 @@ This endpoint returns an array of the `LogIndex` objects of your organization. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -268,7 +270,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers diff --git a/docs/v1/LogsPipelinesApi.md b/docs/v1/LogsPipelinesApi.md index 2a5084ca4b..8de18a2ae8 100644 --- a/docs/v1/LogsPipelinesApi.md +++ b/docs/v1/LogsPipelinesApi.md @@ -162,6 +162,7 @@ This endpoint takes no JSON arguments. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -202,7 +203,7 @@ with ApiClient(configuration) as api_client: ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -229,6 +230,7 @@ This endpoint takes no JSON arguments. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -266,7 +268,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -292,6 +294,7 @@ This endpoint takes no JSON arguments. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -329,7 +332,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers diff --git a/docs/v2/LogsArchivesApi.md b/docs/v2/LogsArchivesApi.md index 541c4f182d..b771d824c8 100644 --- a/docs/v2/LogsArchivesApi.md +++ b/docs/v2/LogsArchivesApi.md @@ -239,6 +239,7 @@ Get a specific archive from your organization. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -279,7 +280,7 @@ with ApiClient(configuration) as api_client: ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -307,6 +308,7 @@ This endpoint takes no JSON arguments. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -344,7 +346,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -369,6 +371,7 @@ Returns all read roles a given archive is restricted to. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -409,7 +412,7 @@ with ApiClient(configuration) as api_client: ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -436,6 +439,7 @@ Get the list of configured logs archives with their definitions. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -473,7 +477,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers diff --git a/docs/v2/LogsMetricsApi.md b/docs/v2/LogsMetricsApi.md index 99703add7e..46a0f10f2f 100644 --- a/docs/v2/LogsMetricsApi.md +++ b/docs/v2/LogsMetricsApi.md @@ -171,6 +171,7 @@ Get a specific log-based metric from your organization. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -211,7 +212,7 @@ with ApiClient(configuration) as api_client: ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers @@ -237,6 +238,7 @@ Get the list of configured log-based metrics with their definitions. ### Example +- OAuth Authentication (AuthZ): - Api Key Authentication (apiKeyAuth): - Api Key Authentication (appKeyAuth): @@ -274,7 +276,7 @@ This endpoint does not need any parameter. ### Authorization -[apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) +[AuthZ](README.md#AuthZ), [apiKeyAuth](README.md#apiKeyAuth), [appKeyAuth](README.md#appKeyAuth) ### HTTP request headers diff --git a/src/datadog_api_client/v1/api/logs_indexes_api.py b/src/datadog_api_client/v1/api/logs_indexes_api.py index 380fc0b717..b2af0867ec 100644 --- a/src/datadog_api_client/v1/api/logs_indexes_api.py +++ b/src/datadog_api_client/v1/api/logs_indexes_api.py @@ -69,7 +69,7 @@ def __init__(self, api_client=None): self._get_logs_index_order_endpoint = _Endpoint( settings={ "response_type": (LogsIndexesOrder,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v1/logs/config/index-order", "operation_id": "get_logs_index_order", "http_method": "GET", @@ -86,7 +86,7 @@ def __init__(self, api_client=None): self._list_log_indexes_endpoint = _Endpoint( settings={ "response_type": (LogsIndexListResponse,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v1/logs/config/indexes", "operation_id": "list_log_indexes", "http_method": "GET", diff --git a/src/datadog_api_client/v1/api/logs_pipelines_api.py b/src/datadog_api_client/v1/api/logs_pipelines_api.py index 284c35fdbc..f4bbd80659 100644 --- a/src/datadog_api_client/v1/api/logs_pipelines_api.py +++ b/src/datadog_api_client/v1/api/logs_pipelines_api.py @@ -68,7 +68,7 @@ def __init__(self, api_client=None): self._get_logs_pipeline_endpoint = _Endpoint( settings={ "response_type": (LogsPipeline,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v1/logs/config/pipelines/{pipeline_id}", "operation_id": "get_logs_pipeline", "http_method": "GET", @@ -92,7 +92,7 @@ def __init__(self, api_client=None): self._get_logs_pipeline_order_endpoint = _Endpoint( settings={ "response_type": (LogsPipelinesOrder,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v1/logs/config/pipeline-order", "operation_id": "get_logs_pipeline_order", "http_method": "GET", @@ -109,7 +109,7 @@ def __init__(self, api_client=None): self._list_logs_pipelines_endpoint = _Endpoint( settings={ "response_type": (LogsPipelineList,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v1/logs/config/pipelines", "operation_id": "list_logs_pipelines", "http_method": "GET", diff --git a/src/datadog_api_client/v2/api/logs_archives_api.py b/src/datadog_api_client/v2/api/logs_archives_api.py index 57ad98b527..c495135324 100644 --- a/src/datadog_api_client/v2/api/logs_archives_api.py +++ b/src/datadog_api_client/v2/api/logs_archives_api.py @@ -97,7 +97,7 @@ def __init__(self, api_client=None): self._get_logs_archive_endpoint = _Endpoint( settings={ "response_type": (LogsArchive,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v2/logs/config/archives/{archive_id}", "operation_id": "get_logs_archive", "http_method": "GET", @@ -121,7 +121,7 @@ def __init__(self, api_client=None): self._get_logs_archive_order_endpoint = _Endpoint( settings={ "response_type": (LogsArchiveOrder,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v2/logs/config/archive-order", "operation_id": "get_logs_archive_order", "http_method": "GET", @@ -138,7 +138,7 @@ def __init__(self, api_client=None): self._list_archive_read_roles_endpoint = _Endpoint( settings={ "response_type": (RolesResponse,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v2/logs/config/archives/{archive_id}/readers", "operation_id": "list_archive_read_roles", "http_method": "GET", @@ -162,7 +162,7 @@ def __init__(self, api_client=None): self._list_logs_archives_endpoint = _Endpoint( settings={ "response_type": (LogsArchives,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v2/logs/config/archives", "operation_id": "list_logs_archives", "http_method": "GET", diff --git a/src/datadog_api_client/v2/api/logs_metrics_api.py b/src/datadog_api_client/v2/api/logs_metrics_api.py index 3c4dcd1310..a11e4e54dc 100644 --- a/src/datadog_api_client/v2/api/logs_metrics_api.py +++ b/src/datadog_api_client/v2/api/logs_metrics_api.py @@ -69,7 +69,7 @@ def __init__(self, api_client=None): self._get_logs_metric_endpoint = _Endpoint( settings={ "response_type": (LogsMetricResponse,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v2/logs/config/metrics/{metric_id}", "operation_id": "get_logs_metric", "http_method": "GET", @@ -93,7 +93,7 @@ def __init__(self, api_client=None): self._list_logs_metrics_endpoint = _Endpoint( settings={ "response_type": (LogsMetricsResponse,), - "auth": ["apiKeyAuth", "appKeyAuth"], + "auth": ["AuthZ", "apiKeyAuth", "appKeyAuth"], "endpoint_path": "/api/v2/logs/config/metrics", "operation_id": "list_logs_metrics", "http_method": "GET", diff --git a/tests/v2/features/logs.feature b/tests/v2/features/logs.feature index b29f532d72..a1b676db48 100644 --- a/tests/v2/features/logs.feature +++ b/tests/v2/features/logs.feature @@ -73,7 +73,7 @@ Feature: Logs When the request is sent Then the response status is 200 OK - @integration-only @skip-validation @skip-terraform-config @team:DataDog/logs-backend @team:DataDog/logs-intake + @integration-only @skip-terraform-config @skip-validation @team:DataDog/logs-backend @team:DataDog/logs-intake Scenario: Send deflate logs returns "Request accepted for processing (always 202 empty JSON)." response Given new "SubmitLog" request And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}] @@ -81,7 +81,7 @@ Feature: Logs When the request is sent Then the response status is 202 Response from server (always 202 empty JSON). - @integration-only @skip-validation @skip-terraform-config @team:DataDog/logs-backend @team:DataDog/logs-intake + @integration-only @skip-terraform-config @skip-validation @team:DataDog/logs-backend @team:DataDog/logs-intake Scenario: Send gzip logs returns "Request accepted for processing (always 202 empty JSON)." response Given new "SubmitLog" request And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]