Skip to content

Commit b2c813a

Browse files
committed
test/integration: update golden files
Regenerate v2 and v3 JSON to reflect removal of defaults from array item and map value schemas. Signed-off-by: Arthur Diniz <arthurbd@debian.org>
1 parent 762641a commit b2c813a

2 files changed

Lines changed: 17 additions & 39 deletions

File tree

test/integration/testdata/golden.v2.json

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -773,8 +773,7 @@
773773
"bar"
774774
],
775775
"items": {
776-
"type": "string",
777-
"default": ""
776+
"type": "string"
778777
}
779778
},
780779
"Map": {
@@ -783,8 +782,7 @@
783782
"foo": "bar"
784783
},
785784
"additionalProperties": {
786-
"type": "string",
787-
"default": ""
785+
"type": "string"
788786
}
789787
},
790788
"OtherField": {
@@ -939,8 +937,7 @@
939937
"Field": {
940938
"type": "array",
941939
"items": {
942-
"type": "string",
943-
"default": ""
940+
"type": "string"
944941
},
945942
"x-kubernetes-list-type": "atomic"
946943
}
@@ -987,7 +984,6 @@
987984
"Field": {
988985
"type": "array",
989986
"items": {
990-
"default": {},
991987
"$ref": "#/definitions/listtype.Item"
992988
},
993989
"x-kubernetes-list-map-keys": [
@@ -1006,8 +1002,7 @@
10061002
"Field": {
10071003
"type": "array",
10081004
"items": {
1009-
"type": "string",
1010-
"default": ""
1005+
"type": "string"
10111006
},
10121007
"x-kubernetes-list-type": "set"
10131008
}
@@ -1022,8 +1017,7 @@
10221017
"KeyValue": {
10231018
"type": "object",
10241019
"additionalProperties": {
1025-
"type": "string",
1026-
"default": ""
1020+
"type": "string"
10271021
},
10281022
"x-kubernetes-map-type": "atomic"
10291023
}
@@ -1038,8 +1032,7 @@
10381032
"KeyValue": {
10391033
"type": "object",
10401034
"additionalProperties": {
1041-
"type": "string",
1042-
"default": ""
1035+
"type": "string"
10431036
},
10441037
"x-kubernetes-map-type": "granular"
10451038
}
@@ -1234,17 +1227,15 @@
12341227
"minItems": 1,
12351228
"uniqueItems": true,
12361229
"items": {
1237-
"type": "string",
1238-
"default": ""
1230+
"type": "string"
12391231
}
12401232
},
12411233
"MapValue": {
12421234
"type": "object",
12431235
"maxProperties": 5,
12441236
"minProperties": 1,
12451237
"additionalProperties": {
1246-
"type": "string",
1247-
"default": ""
1238+
"type": "string"
12481239
}
12491240
},
12501241
"NumberValue": {

test/integration/testdata/golden.v3.json

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,7 @@
711711
"bar"
712712
],
713713
"items": {
714-
"type": "string",
715-
"default": ""
714+
"type": "string"
716715
}
717716
},
718717
"Map": {
@@ -721,8 +720,7 @@
721720
"foo": "bar"
722721
},
723722
"additionalProperties": {
724-
"type": "string",
725-
"default": ""
723+
"type": "string"
726724
}
727725
},
728726
"OtherField": {
@@ -885,8 +883,7 @@
885883
"Field": {
886884
"type": "array",
887885
"items": {
888-
"type": "string",
889-
"default": ""
886+
"type": "string"
890887
},
891888
"x-kubernetes-list-type": "atomic"
892889
}
@@ -933,12 +930,7 @@
933930
"Field": {
934931
"type": "array",
935932
"items": {
936-
"default": {},
937-
"allOf": [
938-
{
939-
"$ref": "#/components/schemas/listtype.Item"
940-
}
941-
]
933+
"$ref": "#/components/schemas/listtype.Item"
942934
},
943935
"x-kubernetes-list-map-keys": [
944936
"port"
@@ -956,8 +948,7 @@
956948
"Field": {
957949
"type": "array",
958950
"items": {
959-
"type": "string",
960-
"default": ""
951+
"type": "string"
961952
},
962953
"x-kubernetes-list-type": "set"
963954
}
@@ -972,8 +963,7 @@
972963
"KeyValue": {
973964
"type": "object",
974965
"additionalProperties": {
975-
"type": "string",
976-
"default": ""
966+
"type": "string"
977967
},
978968
"x-kubernetes-map-type": "atomic"
979969
}
@@ -988,8 +978,7 @@
988978
"KeyValue": {
989979
"type": "object",
990980
"additionalProperties": {
991-
"type": "string",
992-
"default": ""
981+
"type": "string"
993982
},
994983
"x-kubernetes-map-type": "granular"
995984
}
@@ -1196,17 +1185,15 @@
11961185
"minItems": 1,
11971186
"uniqueItems": true,
11981187
"items": {
1199-
"type": "string",
1200-
"default": ""
1188+
"type": "string"
12011189
}
12021190
},
12031191
"MapValue": {
12041192
"type": "object",
12051193
"maxProperties": 5,
12061194
"minProperties": 1,
12071195
"additionalProperties": {
1208-
"type": "string",
1209-
"default": ""
1196+
"type": "string"
12101197
}
12111198
},
12121199
"NumberValue": {

0 commit comments

Comments
 (0)