Skip to content

Commit cd7063a

Browse files
api-clients-generation-pipeline[bot]therveci.datadog-api-spec
authored
Add test support for file parameters (#1839)
* Add support for file parameters * Regenerate client from commit b407748b of spec repo --------- Co-authored-by: Thomas Hervé <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent f4be2fb commit cd7063a

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-01-18 23:59:52.072244",
8-
"spec_repo_commit": "7dba000a"
7+
"regenerated": "2024-01-19 15:18:14.559252",
8+
"spec_repo_commit": "b407748b"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-01-18 23:59:52.086183",
13-
"spec_repo_commit": "7dba000a"
12+
"regenerated": "2024-01-19 15:18:14.573971",
13+
"spec_repo_commit": "b407748b"
1414
}
1515
}
1616
}

tests/conftest.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def pytest_terminal_summary(terminalreporter, exitstatus, config):
5555
from datadog_api_client import exceptions
5656
from datadog_api_client.api_client import ApiClient
5757
from datadog_api_client.configuration import Configuration
58-
from datadog_api_client.model_utils import OpenApiModel
58+
from datadog_api_client.model_utils import OpenApiModel, file_type
5959

6060
logging.basicConfig()
6161

@@ -581,7 +581,13 @@ def execute_request(undo, context, client, api_version, request):
581581

582582
params_map = getattr(api_request["api"], f'_{api_request["request"].__name__}_endpoint').params_map
583583
for k, v in api_request["kwargs"].items():
584-
api_request["kwargs"][k] = client.deserialize(v, params_map[k]["openapi_types"], True)
584+
openapi_types = params_map[k]["openapi_types"]
585+
if openapi_types == (file_type,):
586+
filepath = os.path.join(os.path.dirname(__file__), api_version, "features", json.loads(v))
587+
# We let the GC collects it, this shouldn't be an issue
588+
api_request["kwargs"][k] = open(filepath)
589+
else:
590+
api_request["kwargs"][k] = client.deserialize(v, openapi_types, True)
585591

586592
try:
587593
response = api_request["request"](*api_request["args"], **api_request["kwargs"])

tests/v2/features/organizations.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Feature: Organizations
2020
When the request is sent
2121
Then the response status is 400 Bad Request
2222

23-
@skip-go @skip-java @skip-python @skip-ruby @skip-terraform-config @skip-typescript @skip-validation @team:DataDog/team-aaa-identity
23+
@integration-only @skip-terraform-config @skip-validation @team:DataDog/team-aaa-identity
2424
Scenario: Upload IdP metadata returns "OK" response
2525
Given request contains "idp_file" parameter with value "fixtures/organizations/saml_configurations/valid_idp_metadata.xml"
2626
When the request is sent

0 commit comments

Comments
 (0)