Skip to content

Commit 23f5c7e

Browse files
committed
JSON schema fixes
* remove `additionalItems` for non-array-`items` see also #230 Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
1 parent 88cfd33 commit 23f5c7e

1 file changed

Lines changed: 1 addition & 45 deletions

File tree

schema/bom-1.5.schema.json

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
},
101101
"formulation": {
102102
"type": "array",
103-
"additionalItems": false,
104103
"items": {"$ref": "#/definitions/formula"},
105104
"uniqueItems": true,
106105
"title": "Formulation",
@@ -2772,7 +2771,6 @@
27722771
"title": "Components",
27732772
"description": "Transient components that are used in tasks that constitute one or more of this formula's workflows",
27742773
"type": "array",
2775-
"additionalItems": false,
27762774
"items": {
27772775
"$ref": "#/definitions/component"
27782776
},
@@ -2782,7 +2780,6 @@
27822780
"title": "Services",
27832781
"description": "Transient services that are used in tasks that constitute one or more of this formula's workflows",
27842782
"type": "array",
2785-
"additionalItems": false,
27862783
"items": {
27872784
"$ref": "#/definitions/service"
27882785
},
@@ -2793,7 +2790,6 @@
27932790
"description": "List of workflows that can be declared to accomplish specific orchestrated goals and independently triggered.",
27942791
"$comment": "Different workflows can be designed to work together to perform end-to-end CI/CD builds and deployments.",
27952792
"type": "array",
2796-
"additionalItems": false,
27972793
"items": {
27982794
"$ref": "#/definitions/workflow"
27992795
},
@@ -2802,7 +2798,6 @@
28022798
"properties": {
28032799
"type": "array",
28042800
"title": "Properties",
2805-
"additionalItems": false,
28062801
"items": {
28072802
"$ref": "#/definitions/property"
28082803
}
@@ -2845,7 +2840,6 @@
28452840
"title": "Resource references",
28462841
"description": "References to component or service resources that are used to realize the resource instance.",
28472842
"type": "array",
2848-
"additionalItems": false,
28492843
"uniqueItems": true,
28502844
"items": {
28512845
"$ref": "#/definitions/resourceReferenceChoice"
@@ -2856,7 +2850,6 @@
28562850
"description": "The tasks that comprise the workflow.",
28572851
"$comment": "Note that tasks can appear more than once as different instances (by name or UID).",
28582852
"type": "array",
2859-
"additionalItems": false,
28602853
"uniqueItems": true,
28612854
"items": {
28622855
"$ref": "#/definitions/task"
@@ -2866,7 +2859,6 @@
28662859
"title": "Task dependency graph",
28672860
"description": "The graph of dependencies between tasks within the workflow.",
28682861
"type": "array",
2869-
"additionalItems": false,
28702862
"uniqueItems": true,
28712863
"items": {
28722864
"$ref": "#/definitions/dependency"
@@ -2877,7 +2869,6 @@
28772869
"description": "Indicates the types of activities performed by the set of workflow tasks.",
28782870
"$comment": "Currently, these types reflect common CI/CD actions.",
28792871
"type": "array",
2880-
"additionalItems": false,
28812872
"items": {
28822873
"$ref": "#/definitions/taskType"
28832874
}
@@ -2891,7 +2882,6 @@
28912882
"title": "Steps",
28922883
"description": "The sequence of steps for the task.",
28932884
"type": "array",
2894-
"additionalItems": false,
28952885
"items": {
28962886
"$ref": "#/definitions/step"
28972887
},
@@ -2902,7 +2892,6 @@
29022892
"description": "Represents resources and data brought into a task at runtime by executor or task commands",
29032893
"examples": ["a `configuration` file which was declared as a local `component` or `externalReference`"],
29042894
"type": "array",
2905-
"additionalItems": false,
29062895
"items": {
29072896
"$ref": "#/definitions/inputType"
29082897
},
@@ -2913,7 +2902,6 @@
29132902
"description": "Represents resources and data output from a task at runtime by executor or task commands",
29142903
"examples": ["a log file or metrics data produced by the task"],
29152904
"type": "array",
2916-
"additionalItems": false,
29172905
"items": {
29182906
"$ref": "#/definitions/outputType"
29192907
},
@@ -2936,7 +2924,6 @@
29362924
"description": "A set of named filesystem or data resource shareable by workflow tasks.",
29372925
"type": "array",
29382926
"uniqueItems": true,
2939-
"additionalItems": false,
29402927
"items": {
29412928
"$ref": "#/definitions/workspace"
29422929
}
@@ -2947,15 +2934,13 @@
29472934
"$comment": "A description of the runtime component and service topology. This can describe a partial or complete topology used to host and execute the task (e.g., hardware, operating systems, configurations, etc.),",
29482935
"type": "array",
29492936
"uniqueItems": true,
2950-
"additionalItems": false,
29512937
"items": {
29522938
"$ref": "#/definitions/dependency"
29532939
}
29542940
},
29552941
"properties": {
29562942
"type": "array",
29572943
"title": "Properties",
2958-
"additionalItems": false,
29592944
"items": {
29602945
"$ref": "#/definitions/property"
29612946
}
@@ -2998,7 +2983,6 @@
29982983
"title": "Resource references",
29992984
"description": "References to component or service resources that are used to realize the resource instance.",
30002985
"type": "array",
3001-
"additionalItems": false,
30022986
"uniqueItems": true,
30032987
"items": {
30042988
"$ref": "#/definitions/resourceReferenceChoice"
@@ -3009,7 +2993,6 @@
30092993
"description": "Indicates the types of activities performed by the set of workflow tasks.",
30102994
"$comment": "Currently, these types reflect common CI/CD actions.",
30112995
"type": "array",
3012-
"additionalItems": false,
30132996
"items": {
30142997
"$ref": "#/definitions/taskType"
30152998
}
@@ -3023,7 +3006,6 @@
30233006
"title": "Steps",
30243007
"description": "The sequence of steps for the task.",
30253008
"type": "array",
3026-
"additionalItems": false,
30273009
"items": {
30283010
"$ref": "#/definitions/step"
30293011
},
@@ -3034,7 +3016,6 @@
30343016
"description": "Represents resources and data brought into a task at runtime by executor or task commands",
30353017
"examples": ["a `configuration` file which was declared as a local `component` or `externalReference`"],
30363018
"type": "array",
3037-
"additionalItems": false,
30383019
"items": {
30393020
"$ref": "#/definitions/inputType"
30403021
},
@@ -3045,7 +3026,6 @@
30453026
"description": "Represents resources and data output from a task at runtime by executor or task commands",
30463027
"examples": ["a log file or metrics data produced by the task"],
30473028
"type": "array",
3048-
"additionalItems": false,
30493029
"items": {
30503030
"$ref": "#/definitions/outputType"
30513031
},
@@ -3067,7 +3047,6 @@
30673047
"title": "Workspaces",
30683048
"description": "A set of named filesystem or data resource shareable by workflow tasks.",
30693049
"type": "array",
3070-
"additionalItems": false,
30713050
"items": {
30723051
"$ref": "#/definitions/workspace"
30733052
},
@@ -3078,7 +3057,6 @@
30783057
"description": "A graph of the component runtime topology for task's instance.",
30793058
"$comment": "A description of the runtime component and service topology. This can describe a partial or complete topology used to host and execute the task (e.g., hardware, operating systems, configurations, etc.),",
30803059
"type": "array",
3081-
"additionalItems": false,
30823060
"items": {
30833061
"$ref": "#/definitions/dependency"
30843062
},
@@ -3087,7 +3065,6 @@
30873065
"properties": {
30883066
"type": "array",
30893067
"title": "Properties",
3090-
"additionalItems": false,
30913068
"items": {
30923069
"$ref": "#/definitions/property"
30933070
}
@@ -3113,15 +3090,13 @@
31133090
"title": "Commands",
31143091
"description": "Ordered list of commands or directives for the step",
31153092
"type": "array",
3116-
"additionalItems": false,
31173093
"items": {
31183094
"$ref": "#/definitions/command"
31193095
}
31203096
},
31213097
"properties": {
31223098
"type": "array",
31233099
"title": "Properties",
3124-
"additionalItems": false,
31253100
"items": {
31263101
"$ref": "#/definitions/property"
31273102
}
@@ -3140,7 +3115,6 @@
31403115
"properties": {
31413116
"type": "array",
31423117
"title": "Properties",
3143-
"additionalItems": false,
31443118
"items": {
31453119
"$ref": "#/definitions/property"
31463120
}
@@ -3176,10 +3150,7 @@
31763150
"title": "Aliases",
31773151
"description": "The names for the workspace as referenced by other workflow tasks. Effectively, a name mapping so other tasks can use their own local name in their steps.",
31783152
"type": "array",
3179-
"additionalItems": false,
3180-
"items": {
3181-
"type": "string"
3182-
}
3153+
"items": {"type": "string"}
31833154
},
31843155
"description": {
31853156
"title": "Description",
@@ -3190,7 +3161,6 @@
31903161
"title": "Resource references",
31913162
"description": "References to component or service resources that are used to realize the resource instance.",
31923163
"type": "array",
3193-
"additionalItems": false,
31943164
"uniqueItems": true,
31953165
"items": {
31963166
"$ref": "#/definitions/resourceReferenceChoice"
@@ -3236,7 +3206,6 @@
32363206
"properties": {
32373207
"type": "array",
32383208
"title": "Properties",
3239-
"additionalItems": false,
32403209
"items": {
32413210
"$ref": "#/definitions/property"
32423211
}
@@ -3292,7 +3261,6 @@
32923261
"properties": {
32933262
"type": "array",
32943263
"title": "Properties",
3295-
"additionalItems": false,
32963264
"items": {
32973265
"$ref": "#/definitions/property"
32983266
}
@@ -3334,7 +3302,6 @@
33343302
"title": "Resource references",
33353303
"description": "References to component or service resources that are used to realize the resource instance.",
33363304
"type": "array",
3337-
"additionalItems": false,
33383305
"uniqueItems": true,
33393306
"items": {
33403307
"$ref": "#/definitions/resourceReferenceChoice"
@@ -3358,7 +3325,6 @@
33583325
},
33593326
"conditions": {
33603327
"type": "array",
3361-
"additionalItems": false,
33623328
"uniqueItems": true,
33633329
"items": {
33643330
"$ref": "#/definitions/condition"
@@ -3375,7 +3341,6 @@
33753341
"description": "Represents resources and data brought into a task at runtime by executor or task commands",
33763342
"examples": ["a `configuration` file which was declared as a local `component` or `externalReference`"],
33773343
"type": "array",
3378-
"additionalItems": false,
33793344
"items": {
33803345
"$ref": "#/definitions/inputType"
33813346
},
@@ -3386,7 +3351,6 @@
33863351
"description": "Represents resources and data output from a task at runtime by executor or task commands",
33873352
"examples": ["a log file or metrics data produced by the task"],
33883353
"type": "array",
3389-
"additionalItems": false,
33903354
"items": {
33913355
"$ref": "#/definitions/outputType"
33923356
},
@@ -3395,7 +3359,6 @@
33953359
"properties": {
33963360
"type": "array",
33973361
"title": "Properties",
3398-
"additionalItems": false,
33993362
"items": {
34003363
"$ref": "#/definitions/property"
34013364
}
@@ -3442,7 +3405,6 @@
34423405
"properties": {
34433406
"type": "array",
34443407
"title": "Properties",
3445-
"additionalItems": false,
34463408
"items": {
34473409
"$ref": "#/definitions/property"
34483410
}
@@ -3508,7 +3470,6 @@
35083470
"title": "Parameters",
35093471
"description": "Inputs that have the form of parameters with names and values.",
35103472
"type": "array",
3511-
"additionalItems": false,
35123473
"uniqueItems": true,
35133474
"items": {
35143475
"$ref": "#/definitions/parameter"
@@ -3519,7 +3480,6 @@
35193480
"description": "Inputs that have the form of parameters with names and values.",
35203481
"type": "array",
35213482
"uniqueItems": true,
3522-
"additionalItems": false,
35233483
"items": {
35243484
"oneOf": [
35253485
{
@@ -3539,7 +3499,6 @@
35393499
"properties": {
35403500
"type": "array",
35413501
"title": "Properties",
3542-
"additionalItems": false,
35433502
"items": {
35443503
"$ref": "#/definitions/property"
35453504
}
@@ -3610,7 +3569,6 @@
36103569
"title": "Environment variables",
36113570
"description": "Outputs that have the form of environment variables.",
36123571
"type": "array",
3613-
"additionalItems": false,
36143572
"items": {
36153573
"oneOf": [
36163574
{
@@ -3626,7 +3584,6 @@
36263584
"properties": {
36273585
"type": "array",
36283586
"title": "Properties",
3629-
"additionalItems": false,
36303587
"items": {
36313588
"$ref": "#/definitions/property"
36323589
}
@@ -3683,7 +3640,6 @@
36833640
"properties": {
36843641
"type": "array",
36853642
"title": "Properties",
3686-
"additionalItems": false,
36873643
"items": {
36883644
"$ref": "#/definitions/property"
36893645
}

0 commit comments

Comments
 (0)