Skip to content

Commit 9632d98

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Fix service definition name for v2.1 schema tests (#1393)
Co-authored-by: ci.datadog-api-spec <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
1 parent 545f422 commit 9632d98

5 files changed

+15
-17
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.4",
7-
"regenerated": "2023-03-29 13:52:26.833708",
8-
"spec_repo_commit": "1f3268e7"
7+
"regenerated": "2023-03-29 17:57:23.251037",
8+
"spec_repo_commit": "c0790f05"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.4",
12-
"regenerated": "2023-03-29 13:52:26.848231",
13-
"spec_repo_commit": "1f3268e7"
12+
"regenerated": "2023-03-29 17:57:23.268567",
13+
"spec_repo_commit": "c0790f05"
1414
}
1515
}
1616
}

examples/v2/service-definition/CreateOrUpdateServiceDefinitions_2619874414.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
type=ServiceDefinitionV2Dot1EmailType.EMAIL,
2424
),
2525
],
26-
dd_service="service-Example-Create_or_update_service_definition_using_schema_v2_1_returns_CREATED_response",
26+
dd_service="service-examplecreateorupdateservicedefinitionusingschemav21returnscreatedresponse",
2727
extensions=dict([("myorgextension", "extensionvalue")]),
2828
integrations=ServiceDefinitionV2Dot1Integrations(
2929
opsgenie=ServiceDefinitionV2Dot1Opsgenie(
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2023-03-28T20:28:44.080Z
1+
2023-03-29T17:51:36.535Z

tests/v2/cassettes/test_scenarios/test_create_or_update_service_definition_using_schema_v21_returns_created_response.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
interactions:
22
- request:
3-
body: '{"contacts":[{"contact":"[email protected]","name":"Team Email","type":"email"}],"dd-service":"service-Test-Create_or_update_service_definition_using_schema_v2_1_returns_CREATED_response-1680035324","extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"}},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source
3+
body: '{"contacts":[{"contact":"[email protected]","name":"Team Email","type":"email"}],"dd-service":"service-testcreateorupdateservicedefinitionusingschemav21returnscreatedresponse1680112296","extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"}},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source
44
Code","provider":"GitHub","type":"repo","url":"https://github.com/DataDog/schema"},{"name":"Architecture","provider":"Gigoogle
55
drivetHub","type":"doc","url":"https://my-runbook"}],"schema-version":"v2.1","tags":["my:tag","service:tag"],"team":"my-team"}'
66
headers:
@@ -12,7 +12,7 @@ interactions:
1212
uri: https://api.datadoghq.com/api/v2/services/definitions
1313
response:
1414
body:
15-
string: '{"data":[{"type":"service-definition","attributes":{"meta":{"last-modified-time":"2023-03-28T20:28:44.264527027Z","github-html-url":"","ingestion-source":"api","origin":"unknown","origin-detail":"","warnings":[],"ingested-schema-version":"v2.1"},"schema":{"schema-version":"v2.1","dd-service":"service-test-create_or_update_service_definition_using_schema_v2_1_returns_created_response-1680035324","team":"my-team","contacts":[{"name":"Team
15+
string: '{"data":[{"type":"service-definition","attributes":{"meta":{"last-modified-time":"2023-03-29T17:51:36.683797279Z","github-html-url":"","ingestion-source":"api","origin":"unknown","origin-detail":"","warnings":[],"ingested-schema-version":"v2.1"},"schema":{"schema-version":"v2.1","dd-service":"service-testcreateorupdateservicedefinitionusingschemav21returnscreatedresponse1680112296","team":"my-team","contacts":[{"name":"Team
1616
Email","type":"email","contact":"[email protected]"}],"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source
1717
Code","type":"repo","provider":"GitHub","url":"https://github.com/DataDog/schema"},{"name":"Architecture","type":"doc","provider":"Gigoogle
1818
drivetHub","url":"https://my-runbook"}],"tags":["my:tag","service:tag"],"integrations":{"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"},"opsgenie":{"service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000","region":"US"}},"extensions":{"myorgextension":"extensionvalue"}}}}]}
@@ -30,16 +30,14 @@ interactions:
3030
accept:
3131
- '*/*'
3232
method: DELETE
33-
uri: https://api.datadoghq.com/api/v2/services/definitions/service-test-create_or_update_service_definition_using_schema_v2_1_returns_created_response-1680035324
33+
uri: https://api.datadoghq.com/api/v2/services/definitions/service-testcreateorupdateservicedefinitionusingschemav21returnscreatedresponse1680112296
3434
response:
3535
body:
36-
string: '{"errors":["Not Found"],"error_details":[{}]}
37-
38-
'
36+
string: ''
3937
headers:
4038
content-type:
41-
- application/json
39+
- text/html; charset=utf-8
4240
status:
43-
code: 404
44-
message: Not Found
41+
code: 204
42+
message: No Content
4543
version: 1

tests/v2/features/service_definition.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ Feature: Service Definition
4040
@team:DataDog/service-catalog
4141
Scenario: Create or update service definition using schema v2-1 returns "CREATED" response
4242
Given new "CreateOrUpdateServiceDefinitions" request
43-
And body with value {"contacts":[{"contact":"[email protected]","name":"Team Email","type":"email"}],"dd-service":"service-{{ unique }}","extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"}},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source Code","type":"repo","provider":"GitHub","url":"https://github.com/DataDog/schema"},{"name":"Architecture","type":"doc","provider":"Gigoogle drivetHub","url":"https://my-runbook"}],"schema-version":"v2.1","tags":["my:tag","service:tag"],"team":"my-team"}
43+
And body with value {"contacts":[{"contact":"[email protected]","name":"Team Email","type":"email"}],"dd-service":"service-{{ unique_lower_alnum }}","extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":{"service-url":"https://my-org.pagerduty.com/service-directory/PMyService"}},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"},{"name":"Source Code","type":"repo","provider":"GitHub","url":"https://github.com/DataDog/schema"},{"name":"Architecture","type":"doc","provider":"Gigoogle drivetHub","url":"https://my-runbook"}],"schema-version":"v2.1","tags":["my:tag","service:tag"],"team":"my-team"}
4444
When the request is sent
4545
Then the response status is 200 CREATED
4646
And the response "data[0].attributes.meta.ingested-schema-version" is equal to "v2.1"
47-
And the response "data[0].attributes.schema.dd-service" is equal to "service-{{ unique_lower }}"
47+
And the response "data[0].attributes.schema.dd-service" is equal to "service-{{ unique_lower_alnum }}"
4848

4949
@generated @skip @team:DataDog/service-catalog
5050
Scenario: Delete a single service definition returns "Bad Request" response

0 commit comments

Comments
 (0)