Skip to content

Commit 82db5f8

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
disable merging for properties in ApplicationKeyRelationships (DataDog#24915)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
1 parent 68c7352 commit 82db5f8

File tree

4 files changed

+142
-38
lines changed

4 files changed

+142
-38
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-08-27 12:13:47.092638",
8-
"spec_repo_commit": "09daef2e"
7+
"regenerated": "2024-08-27 13:38:01.234005",
8+
"spec_repo_commit": "5375acd7"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-08-27 12:13:55.396653",
13-
"spec_repo_commit": "09daef2e"
12+
"regenerated": "2024-08-27 13:38:09.411420",
13+
"spec_repo_commit": "5375acd7"
1414
}
1515
}
1616
}

‎data/api/v2/full_spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,8 @@ components:
10171017
owned_by:
10181018
$ref: '#/components/schemas/RelationshipToUser'
10191019
type: object
1020+
x-merge-override:
1021+
properties: false
10201022
ApplicationKeyResponse:
10211023
description: Response for retrieving an application key.
10221024
properties:

‎data/api/v2/full_spec_deref.json

Lines changed: 68 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3536,7 +3536,10 @@
35363536
"type": "object"
35373537
}
35383538
},
3539-
"type": "object"
3539+
"type": "object",
3540+
"x-merge-override": {
3541+
"properties": false
3542+
}
35403543
},
35413544
"ApplicationKeyResponse": {
35423545
"description": "Response for retrieving an application key.",
@@ -3638,7 +3641,10 @@
36383641
"type": "object"
36393642
}
36403643
},
3641-
"type": "object"
3644+
"type": "object",
3645+
"x-merge-override": {
3646+
"properties": false
3647+
}
36423648
},
36433649
"type": {
36443650
"default": "application_keys",
@@ -42862,7 +42868,10 @@
4286242868
"type": "object"
4286342869
}
4286442870
},
42865-
"type": "object"
42871+
"type": "object",
42872+
"x-merge-override": {
42873+
"properties": false
42874+
}
4286642875
},
4286742876
"type": {
4286842877
"default": "application_keys",
@@ -67959,7 +67968,10 @@
6795967968
"type": "object"
6796067969
}
6796167970
},
67962-
"type": "object"
67971+
"type": "object",
67972+
"x-merge-override": {
67973+
"properties": false
67974+
}
6796367975
},
6796467976
"type": {
6796567977
"default": "application_keys",
@@ -86104,7 +86116,10 @@
8610486116
"type": "object"
8610586117
}
8610686118
},
86107-
"type": "object"
86119+
"type": "object",
86120+
"x-merge-override": {
86121+
"properties": false
86122+
}
8610886123
},
8610986124
"type": {
8611086125
"default": "application_keys",
@@ -86260,7 +86275,10 @@
8626086275
"type": "object"
8626186276
}
8626286277
},
86263-
"type": "object"
86278+
"type": "object",
86279+
"x-merge-override": {
86280+
"properties": false
86281+
}
8626486282
},
8626586283
"type": {
8626686284
"default": "application_keys",
@@ -154779,7 +154797,10 @@
154779154797
"type": "object"
154780154798
}
154781154799
},
154782-
"type": "object"
154800+
"type": "object",
154801+
"x-merge-override": {
154802+
"properties": false
154803+
}
154783154804
},
154784154805
"type": {
154785154806
"default": "application_keys",
@@ -155595,7 +155616,10 @@
155595155616
"type": "object"
155596155617
}
155597155618
},
155598-
"type": "object"
155619+
"type": "object",
155620+
"x-merge-override": {
155621+
"properties": false
155622+
}
155599155623
},
155600155624
"type": {
155601155625
"default": "application_keys",
@@ -156337,7 +156361,10 @@
156337156361
"type": "object"
156338156362
}
156339156363
},
156340-
"type": "object"
156364+
"type": "object",
156365+
"x-merge-override": {
156366+
"properties": false
156367+
}
156341156368
},
156342156369
"type": {
156343156370
"default": "application_keys",
@@ -175897,7 +175924,10 @@
175897175924
"type": "object"
175898175925
}
175899175926
},
175900-
"type": "object"
175927+
"type": "object",
175928+
"x-merge-override": {
175929+
"properties": false
175930+
}
175901175931
},
175902175932
"type": {
175903175933
"default": "application_keys",
@@ -176643,7 +176673,10 @@
176643176673
"type": "object"
176644176674
}
176645176675
},
176646-
"type": "object"
176676+
"type": "object",
176677+
"x-merge-override": {
176678+
"properties": false
176679+
}
176647176680
},
176648176681
"type": {
176649176682
"default": "application_keys",
@@ -177418,7 +177451,10 @@
177418177451
"type": "object"
177419177452
}
177420177453
},
177421-
"type": "object"
177454+
"type": "object",
177455+
"x-merge-override": {
177456+
"properties": false
177457+
}
177422177458
},
177423177459
"type": {
177424177460
"default": "application_keys",
@@ -178132,7 +178168,10 @@
178132178168
"type": "object"
178133178169
}
178134178170
},
178135-
"type": "object"
178171+
"type": "object",
178172+
"x-merge-override": {
178173+
"properties": false
178174+
}
178136178175
},
178137178176
"type": {
178138178177
"default": "application_keys",
@@ -269832,7 +269871,10 @@
269832269871
"type": "object"
269833269872
}
269834269873
},
269835-
"type": "object"
269874+
"type": "object",
269875+
"x-merge-override": {
269876+
"properties": false
269877+
}
269836269878
},
269837269879
"type": {
269838269880
"default": "application_keys",
@@ -270590,7 +270632,10 @@
270590270632
"type": "object"
270591270633
}
270592270634
},
270593-
"type": "object"
270635+
"type": "object",
270636+
"x-merge-override": {
270637+
"properties": false
270638+
}
270594270639
},
270595270640
"type": {
270596270641
"default": "application_keys",
@@ -271389,7 +271434,10 @@
271389271434
"type": "object"
271390271435
}
271391271436
},
271392-
"type": "object"
271437+
"type": "object",
271438+
"x-merge-override": {
271439+
"properties": false
271440+
}
271393271441
},
271394271442
"type": {
271395271443
"default": "application_keys",
@@ -272106,7 +272154,10 @@
272106272154
"type": "object"
272107272155
}
272108272156
},
272109-
"type": "object"
272157+
"type": "object",
272158+
"x-merge-override": {
272159+
"properties": false
272160+
}
272110272161
},
272111272162
"type": {
272112272163
"default": "application_keys",

0 commit comments

Comments
 (0)