Skip to content

Commit 174513f

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Fix service catalog schema change (#906)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent 3b718ae commit 174513f

File tree

15 files changed

+65
-255
lines changed

15 files changed

+65
-255
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": "2022-11-09 16:23:06.424605",
8-
"spec_repo_commit": "a896c6f6"
7+
"regenerated": "2022-11-14 19:03:59.473851",
8+
"spec_repo_commit": "aaa18608"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.4",
12-
"regenerated": "2022-11-09 16:23:06.443387",
13-
"spec_repo_commit": "a896c6f6"
12+
"regenerated": "2022-11-14 19:03:59.486021",
13+
"spec_repo_commit": "aaa18608"
1414
}
1515
}
1616
}

‎.generator/schemas/v2/openapi.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9701,12 +9701,12 @@ components:
97019701
properties:
97029702
region:
97039703
$ref: '#/components/schemas/ServiceDefinitionV2OpsgenieRegion'
9704-
service-id:
9705-
description: Opsgenie service id.
9706-
example: 123e4567-e89b-12d3-a456-426614174000
9704+
service-url:
9705+
description: Opsgenie service url.
9706+
example: https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000
97079707
type: string
97089708
required:
9709-
- service-id
9709+
- service-url
97109710
type: object
97119711
ServiceDefinitionV2OpsgenieRegion:
97129712
description: Opsgenie instance region.

‎cassettes/v2/Service-Definition_2211895093/Create-or-update-service-definition-returns-CREATED-response_4118101501/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2022-10-11T16:11:15.904Z"
1+
"2022-11-10T21:14:44.544Z"

‎cassettes/v2/Service-Definition_2211895093/Create-or-update-service-definition-returns-CREATED-response_4118101501/recording.har

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
},
99
"entries": [
1010
{
11-
"_id": "2eab0410570d0cc16e146291eec63e54",
11+
"_id": "b5aa6928e06a8df2c5c8ff06a6bdb3f1",
1212
"_order": 0,
1313
"cache": {},
1414
"request": {
15-
"bodySize": 749,
15+
"bodySize": 786,
1616
"cookies": [],
1717
"headers": [
1818
{
@@ -26,23 +26,23 @@
2626
"value": "application/json"
2727
}
2828
],
29-
"headersSize": 585,
29+
"headersSize": 587,
3030
"httpVersion": "HTTP/1.1",
3131
"method": "POST",
3232
"postData": {
3333
"mimeType": "application/json",
3434
"params": [],
35-
"text": "{\"contacts\":[{\"contact\":\"[email protected]\",\"name\":\"Team Email\",\"type\":\"email\"}],\"dd-service\":\"service-Test-Create_or_update_service_definition_returns_CREATED_response-1665504675\",\"dd-team\":\"my-team\",\"docs\":[{\"name\":\"Architecture\",\"provider\":\"google drive\",\"url\":\"https://gdrive/mydoc\"}],\"extensions\":{\"myorgextension\":\"extensionvalue\"},\"integrations\":{\"opsgenie\":{\"region\":\"US\",\"service-id\":\"123e4567-e89b-12d3-a456-426614174000\"},\"pagerduty\":\"https://my-org.pagerduty.com/service-directory/PMyService\"},\"links\":[{\"name\":\"Runbook\",\"type\":\"runbook\",\"url\":\"https://my-runbook\"}],\"repos\":[{\"name\":\"Source Code\",\"provider\":\"GitHub\",\"url\":\"https://github.com/DataDog/schema\"}],\"schema-version\":\"v2\",\"tags\":[\"my:tag\",\"service:tag\"],\"team\":\"my-team\"}"
35+
"text": "{\"contacts\":[{\"contact\":\"[email protected]\",\"name\":\"Team Email\",\"type\":\"email\"}],\"dd-service\":\"service-Test-Create_or_update_service_definition_returns_CREATED_response-1668114884\",\"dd-team\":\"my-team\",\"docs\":[{\"name\":\"Architecture\",\"provider\":\"google drive\",\"url\":\"https://gdrive/mydoc\"}],\"extensions\":{\"myorgextension\":\"extensionvalue\"},\"integrations\":{\"opsgenie\":{\"region\":\"US\",\"service-url\":\"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000\"},\"pagerduty\":\"https://my-org.pagerduty.com/service-directory/PMyService\"},\"links\":[{\"name\":\"Runbook\",\"type\":\"runbook\",\"url\":\"https://my-runbook\"}],\"repos\":[{\"name\":\"Source Code\",\"provider\":\"GitHub\",\"url\":\"https://github.com/DataDog/schema\"}],\"schema-version\":\"v2\",\"tags\":[\"my:tag\",\"service:tag\"],\"team\":\"my-team\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v2/services/definitions"
3939
},
4040
"response": {
41-
"bodySize": 936,
41+
"bodySize": 1005,
4242
"content": {
4343
"mimeType": "application/json",
44-
"size": 936,
45-
"text": "{\"data\":[{\"attributes\":{\"meta\":{\"ingested-schema-version\":\"v2\",\"ingestion-source\":\"api\",\"last-modified-time\":\"2022-10-11T16:11:16.302119241Z\",\"github-html-url\":\"\",\"warnings\":[]},\"schema\":{\"links\":[{\"url\":\"https://my-runbook\",\"type\":\"runbook\",\"name\":\"Runbook\"}],\"contacts\":[{\"contact\":\"[email protected]\",\"type\":\"email\",\"name\":\"Team Email\"}],\"docs\":[{\"url\":\"https://gdrive/mydoc\",\"name\":\"Architecture\",\"provider\":\"google drive\"}],\"repos\":[{\"url\":\"https://github.com/DataDog/schema\",\"name\":\"Source Code\",\"provider\":\"GitHub\"}],\"tags\":[\"my:tag\",\"service:tag\"],\"dd-team\":\"my-team\",\"integrations\":{\"opsgenie\":{\"region\":\"US\",\"service-id\":\"123e4567-e89b-12d3-a456-426614174000\"},\"pagerduty\":\"https://my-org.pagerduty.com/service-directory/PMyService\"},\"schema-version\":\"v2\",\"team\":\"my-team\",\"extensions\":{},\"dd-service\":\"service-test-create_or_update_service_definition_returns_created_response-1665504675\"}},\"type\":\"service-definition\"}]}\n"
44+
"size": 1005,
45+
"text": "{\"data\":[{\"type\":\"service-definition\",\"attributes\":{\"meta\":{\"last-modified-time\":\"2022-11-10T21:14:45.52228008Z\",\"github-html-url\":\"\",\"ingestion-source\":\"api\",\"warnings\":[],\"ingested-schema-version\":\"v2\"},\"schema\":{\"schema-version\":\"v2\",\"dd-service\":\"service-test-create_or_update_service_definition_returns_created_response-1668114884\",\"dd-team\":\"my-team\",\"team\":\"my-team\",\"contacts\":[{\"name\":\"Team Email\",\"type\":\"email\",\"contact\":\"[email protected]\"}],\"links\":[{\"name\":\"Runbook\",\"type\":\"runbook\",\"url\":\"https://my-runbook\"}],\"repos\":[{\"name\":\"Source Code\",\"provider\":\"GitHub\",\"url\":\"https://github.com/DataDog/schema\"}],\"docs\":[{\"name\":\"Architecture\",\"provider\":\"google drive\",\"url\":\"https://gdrive/mydoc\"}],\"tags\":[\"my:tag\",\"service:tag\"],\"integrations\":{\"pagerduty\":\"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\"}}}}]}\n"
4646
},
4747
"cookies": [],
4848
"headers": [
@@ -51,17 +51,17 @@
5151
"value": "application/json"
5252
}
5353
],
54-
"headersSize": 628,
54+
"headersSize": 629,
5555
"httpVersion": "HTTP/1.1",
5656
"redirectURL": "",
5757
"status": 200,
5858
"statusText": "OK"
5959
},
60-
"startedDateTime": "2022-10-11T16:11:15.914Z",
61-
"time": 453
60+
"startedDateTime": "2022-11-10T21:14:44.561Z",
61+
"time": 1001
6262
},
6363
{
64-
"_id": "023b1b51b1876a2649f7bf02f35c06b3",
64+
"_id": "8da7c885e895edd327aed527f50e4817",
6565
"_order": 0,
6666
"cache": {},
6767
"request": {
@@ -74,11 +74,11 @@
7474
"value": "*/*"
7575
}
7676
],
77-
"headersSize": 597,
77+
"headersSize": 599,
7878
"httpVersion": "HTTP/1.1",
7979
"method": "DELETE",
8080
"queryString": [],
81-
"url": "https://api.datadoghq.com/api/v2/services/definitions/service-test-create_or_update_service_definition_returns_created_response-1665504675"
81+
"url": "https://api.datadoghq.com/api/v2/services/definitions/service-test-create_or_update_service_definition_returns_created_response-1668114884"
8282
},
8383
"response": {
8484
"bodySize": 46,
@@ -94,14 +94,14 @@
9494
"value": "application/json"
9595
}
9696
],
97-
"headersSize": 670,
97+
"headersSize": 627,
9898
"httpVersion": "HTTP/1.1",
9999
"redirectURL": "",
100100
"status": 404,
101101
"statusText": "Not Found"
102102
},
103-
"startedDateTime": "2022-10-11T16:11:16.374Z",
104-
"time": 785
103+
"startedDateTime": "2022-11-10T21:14:45.587Z",
104+
"time": 511
105105
}
106106
],
107107
"pages": [],

‎cassettes/v2/Service-Definition_2211895093/Delete-a-single-service-definition-returns-OK-response_484092435/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2022-10-10T12:48:37.381Z"
1+
"2022-11-14T18:19:52.943Z"

‎cassettes/v2/Service-Definition_2211895093/Delete-a-single-service-definition-returns-OK-response_484092435/recording.har

Lines changed: 10 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,7 @@
88
},
99
"entries": [
1010
{
11-
"_id": "d68d4a1c9ec2a0b3f8b5a3f29bc801e0",
12-
"_order": 0,
13-
"cache": {},
14-
"request": {
15-
"bodySize": 671,
16-
"cookies": [],
17-
"headers": [
18-
{
19-
"_fromType": "array",
20-
"name": "accept",
21-
"value": "application/json"
22-
},
23-
{
24-
"_fromType": "array",
25-
"name": "content-type",
26-
"value": "application/json"
27-
}
28-
],
29-
"headersSize": 587,
30-
"httpVersion": "HTTP/1.1",
31-
"method": "POST",
32-
"postData": {
33-
"mimeType": "application/json",
34-
"params": [],
35-
"text": "{\"dd-service\":\"service-Test-Delete_a_single_service_definition_returns_OK_response-1665406117\",\"dd-team\":\"my-team\",\"docs\":[{\"name\":\"Architecture\",\"provider\":\"google drive\",\"url\":\"https://gdrive/mygivedoc\"}],\"extensions\":{\"frogextension\":\"extensionfrogvalue\"},\"integrations\":{\"opsgenie\":{\"region\":\"US\",\"service-id\":\"123e4567-e89b-12d3-a456-426614174000\"},\"pagerduty\":\"https://my-org.pagerduty.com/service-directory/PMyService\"},\"links\":[{\"name\":\"Runbook\",\"type\":\"runbook\",\"url\":\"https://my-runbook\"}],\"repos\":[{\"name\":\"Source Code\",\"provider\":\"GitHub\",\"url\":\"https://github.com/DataDog/given\"}],\"schema-version\":\"v2\",\"tags\":[\"this:tag\",\"service:tag\"],\"team\":\"super-team\"}"
36-
},
37-
"queryString": [],
38-
"url": "https://api.datadoghq.com/api/v2/services/definitions"
39-
},
40-
"response": {
41-
"bodySize": 868,
42-
"content": {
43-
"mimeType": "application/json",
44-
"size": 868,
45-
"text": "{\"data\":[{\"attributes\":{\"meta\":{\"ingested-schema-version\":\"v2\",\"ingestion-source\":\"api\",\"last-modified-time\":\"2022-10-10T12:48:37.797458518Z\",\"github-html-url\":\"\",\"warnings\":[]},\"schema\":{\"links\":[{\"url\":\"https://my-runbook\",\"type\":\"runbook\",\"name\":\"Runbook\"}],\"contacts\":[],\"docs\":[{\"url\":\"https://gdrive/mygivedoc\",\"name\":\"Architecture\",\"provider\":\"google drive\"}],\"repos\":[{\"url\":\"https://github.com/DataDog/given\",\"name\":\"Source Code\",\"provider\":\"GitHub\"}],\"tags\":[\"service:tag\",\"this:tag\"],\"dd-team\":\"my-team\",\"integrations\":{\"opsgenie\":{\"region\":\"US\",\"service-id\":\"123e4567-e89b-12d3-a456-426614174000\"},\"pagerduty\":\"https://my-org.pagerduty.com/service-directory/PMyService\"},\"schema-version\":\"v2\",\"team\":\"super-team\",\"extensions\":{},\"dd-service\":\"service-test-delete_a_single_service_definition_returns_ok_response-1665406117\"}},\"type\":\"service-definition\"}]}\n"
46-
},
47-
"cookies": [],
48-
"headers": [
49-
{
50-
"name": "content-type",
51-
"value": "application/json"
52-
}
53-
],
54-
"headersSize": 628,
55-
"httpVersion": "HTTP/1.1",
56-
"redirectURL": "",
57-
"status": 200,
58-
"statusText": "OK"
59-
},
60-
"startedDateTime": "2022-10-10T12:48:37.393Z",
61-
"time": 469
62-
},
63-
{
64-
"_id": "acb004fa754eaa7ae7fac60d61b3c321",
11+
"_id": "66a071a113b4b4d41295856a5491e751",
6512
"_order": 0,
6613
"cache": {},
6714
"request": {
@@ -74,71 +21,33 @@
7421
"value": "*/*"
7522
}
7623
],
77-
"headersSize": 593,
24+
"headersSize": 538,
7825
"httpVersion": "HTTP/1.1",
7926
"method": "DELETE",
8027
"queryString": [],
81-
"url": "https://api.datadoghq.com/api/v2/services/definitions/service-Test-Delete_a_single_service_definition_returns_OK_response-1665406117"
28+
"url": "https://api.datadoghq.com/api/v2/services/definitions/service-definition-test"
8229
},
8330
"response": {
8431
"bodySize": 0,
8532
"content": {
86-
"mimeType": "text/plain",
33+
"mimeType": "text/html; charset=utf-8",
8734
"size": 0
8835
},
8936
"cookies": [],
90-
"headers": [],
91-
"headersSize": 624,
92-
"httpVersion": "HTTP/1.1",
93-
"redirectURL": "",
94-
"status": 204,
95-
"statusText": "No Content"
96-
},
97-
"startedDateTime": "2022-10-10T12:48:51.870Z",
98-
"time": 704
99-
},
100-
{
101-
"_id": "3ba19283a0d8e37d4fee07800746d58f",
102-
"_order": 0,
103-
"cache": {},
104-
"request": {
105-
"bodySize": 0,
106-
"cookies": [],
107-
"headers": [
108-
{
109-
"_fromType": "array",
110-
"name": "accept",
111-
"value": "*/*"
112-
}
113-
],
114-
"headersSize": 593,
115-
"httpVersion": "HTTP/1.1",
116-
"method": "DELETE",
117-
"queryString": [],
118-
"url": "https://api.datadoghq.com/api/v2/services/definitions/service-test-delete_a_single_service_definition_returns_ok_response-1665406117"
119-
},
120-
"response": {
121-
"bodySize": 46,
122-
"content": {
123-
"mimeType": "application/json",
124-
"size": 46,
125-
"text": "{\"errors\":[\"Not Found\"],\"error_details\":[{}]}\n"
126-
},
127-
"cookies": [],
12837
"headers": [
12938
{
13039
"name": "content-type",
131-
"value": "application/json"
40+
"value": "text/html; charset=utf-8"
13241
}
13342
],
134-
"headersSize": 669,
43+
"headersSize": 614,
13544
"httpVersion": "HTTP/1.1",
13645
"redirectURL": "",
137-
"status": 404,
138-
"statusText": "Not Found"
46+
"status": 204,
47+
"statusText": "No Content"
13948
},
140-
"startedDateTime": "2022-10-10T12:48:52.582Z",
141-
"time": 639
49+
"startedDateTime": "2022-11-14T18:19:52.951Z",
50+
"time": 597
14251
}
14352
],
14453
"pages": [],

‎cassettes/v2/Service-Definition_2211895093/Get-a-single-service-definition-returns-OK-response_1436718714/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2022-10-10T12:33:59.012Z"
1+
"2022-11-14T18:09:34.511Z"

0 commit comments

Comments
 (0)