Skip to content

Commit fb45fea

Browse files
[vendor-schemas] automated update (#390)
Co-authored-by: sirosen <[email protected]>
1 parent f78b6df commit fb45fea

File tree

7 files changed

+611
-111
lines changed

7 files changed

+611
-111
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Unreleased
1010

1111
.. vendor-insert-here
1212
13-
- Update vendored schemas (2024-02-01)
13+
- Update vendored schemas (2024-02-05)
1414

1515
0.27.4
1616
------

src/check_jsonschema/builtin_schemas/vendor/cloudbuild.json

Lines changed: 31 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
}
2525
},
2626
"waitFor": {
27-
"description": "The ID(s) of the step(s) that this build step depends on.\nThis build step will not start until all the build steps in `wait_for`\nhave completed successfully. If `wait_for` is empty, this build step will\nstart when all previous build steps in the `Build.Steps` list have\ncompleted successfully.",
27+
"description": "The ID(s) of the step(s) that this build step depends on.\nThis build step will not start until all the build steps in `waitFor`\nhave completed successfully. If `waitFor` is empty, this build step will\nstart when all previous build steps in the `Build.Steps` list have\ncompleted successfully.\nIf `waitFor` is set to `'-'`, the step runs immediately when the build starts.",
2828
"type": "array",
2929
"items": {
30-
"type": "string"
30+
"type": "string",
31+
"examples": [["-"], ["terraform-init", "terraform-apply"]]
3132
}
3233
},
3334
"env": {
@@ -42,7 +43,7 @@
4243
"type": "string"
4344
},
4445
"script": {
45-
"description": "Specify a shell script to execute in the step.\nIf you specify script in a build step, you cannot specify args or entrypoint in the same step.",
46+
"description": "Specify a shell script to execute in the step.\nIf you specify script in a build step, you cannot specify `args` or `entrypoint` in the same step.",
4647
"type": "string"
4748
},
4849
"volumes": {
@@ -53,7 +54,7 @@
5354
}
5455
},
5556
"args": {
56-
"description": "A list of arguments that will be presented to the step when it is started.\n\nIf the image used to run the step's container has an entrypoint, the `args`\nare used as arguments to that entrypoint. If the image does not define\nan entrypoint, the first element in args is used as the entrypoint,\nand the remainder will be used as arguments.",
57+
"description": "A list of arguments that will be presented to the step when it is started.\n\nIf the image used to run the step's container has an entrypoint, the `args`\nare used as arguments to that entrypoint. If the image does not define\nan entrypoint, the first element in `args` is used as the entrypoint,\nand the remainder will be used as arguments.",
5758
"type": "array",
5859
"items": {
5960
"type": "string"
@@ -87,46 +88,23 @@
8788
"properties": {
8889
"machineType": {
8990
"enum": [
90-
"E2_HIGHCPU_2",
91-
"E2_HIGHCPU_4",
9291
"E2_HIGHCPU_8",
93-
"E2_HIGHCPU_16",
9492
"E2_HIGHCPU_32",
95-
"E2_HIGHMEM_2",
96-
"E2_HIGHMEM_4",
97-
"E2_HIGHMEM_8",
98-
"E2_HIGHMEM_16",
9993
"E2_MEDIUM",
100-
"E2_STANDARD_2",
101-
"E2_STANDARD_4",
102-
"E2_STANDARD_8",
103-
"E2_STANDARD_16",
104-
"E2_STANDARD_32",
10594
"N1_HIGHCPU_8",
10695
"N1_HIGHCPU_32",
10796
"UNSPECIFIED"
10897
],
10998
"description": "Compute Engine machine type on which to run the build.",
99+
"default": "UNSPECIFIED",
110100
"type": "string",
111101
"enumDescriptions": [
112-
"e2 HighCPU: 2 vCPUs, 2GB RAM",
113-
"e2 HighCPU: 4 vCPUs, 4GB RAM",
114102
"e2 HighCPU: 8 vCPUs, 8GB RAM",
115-
"e2 HighCPU: 16 vCPUs, 16GB RAM",
116103
"e2 HighCPU: 32 vCPUs, 32GB RAM",
117-
"e2 HighMem: 2 vCPUs, 16GB RAM",
118-
"e2 HighMem: 4 vCPUs, 32GB RAM",
119-
"e2 HighMem: 8 vCPUs, 64GB RAM",
120-
"e2 HighMem: 16 vCPUs, 128GB RAM",
121104
"e2 Medium: 1 vCPU, 4GB RAM",
122-
"e2 Standard: 2 vCPU, 8GB RAM",
123-
"e2 Standard: 4 vCPU, 16GB RAM",
124-
"e2 Standard: 8 vCPU, 32GB RAM",
125-
"e2 Standard: 16 vCPU, 64GB RAM",
126-
"e2 Standard: 32 vCPU, 128GB RAM",
127105
"n1 HighCPU: 8 vCPUs, 7.2GB RAM",
128106
"n1 HighCPU: 32 vCPUs, 28.8GB RAM",
129-
"e2 Medium: 1 vCPU, 4GB RAM"
107+
"e2 Standard: 2 vCPU, 8GB RAM"
130108
]
131109
},
132110
"volumes": {
@@ -160,7 +138,7 @@
160138
"required": ["name"]
161139
},
162140
"env": {
163-
"description": "A list of global environment variable definitions that will exist for all\nbuild steps in this build. If a variable is defined in both globally and in\na build step, the variable will use the build step value.\n\nThe elements are of the form \"KEY=VALUE\" for the environment variable \"KEY\"\nbeing given the value \"VALUE\".",
141+
"description": "A list of global environment variable definitions that will exist for all\nbuild steps in this build. If a variable is defined both globally and in\na build step, the variable will use the build step value.\n\nThe elements are of the form \"KEY=VALUE\" for the environment variable \"KEY\"\nbeing given the value \"VALUE\".",
164142
"type": "array",
165143
"items": {
166144
"type": "string"
@@ -188,9 +166,13 @@
188166
"description": "Configure Cloud Build to create a default logs bucket within your own project in the same region as your build.",
189167
"type": "string",
190168
"enumDescriptions": [
191-
"Configure Cloud Build to use regionalized, user-owned logs"
169+
"Unspecified",
170+
"Configure Cloud Build to use regionalized, user-owned logs."
192171
],
193-
"enum": ["REGIONAL_USER_OWNED_BUCKET"]
172+
"enum": [
173+
"DEFAULT_LOGS_BUCKET_BEHAVIOR_UNSPECIFIED",
174+
"REGIONAL_USER_OWNED_BUCKET"
175+
]
194176
},
195177
"requestedVerifyOption": {
196178
"description": "Requested verifiability options.",
@@ -215,8 +197,19 @@
215197
"type": "boolean"
216198
},
217199
"diskSizeGb": {
218-
"description": "Requested disk size for the VM that runs the build. Note that this is *NOT*\n\"disk free\"; some of the space will be used by the operating system and\nbuild utilities. Also note that this is the minimum disk size that will be\nallocated for the build -- the build may run with a larger disk than\nrequested. At present, the maximum disk size is 1000GB; builds that request\nmore than the maximum are rejected with an error.",
219-
"type": "integer"
200+
"description": "Requested disk size for the VM that runs the build. Note that this is *NOT*\n\"disk free\"; some of the space will be used by the operating system and\nbuild utilities. Also note that this is the minimum disk size that will be\nallocated for the build -- the build may run with a larger disk than\nrequested. At present, the maximum disk size is 2000GB; builds that request\nmore than the maximum are rejected with an error.",
201+
"oneOf": [
202+
{
203+
"type": "integer",
204+
"minimum": 1,
205+
"maximum": 2000
206+
},
207+
{
208+
"type": "string",
209+
"pattern": "^(?:[1-9]\\d{0,2}|1\\d{3}|2000)$"
210+
}
211+
],
212+
"examples": [30, 50, "100", 200, "300"]
220213
},
221214
"secretEnv": {
222215
"description": "A list of global environment variables, which are encrypted using a Cloud\nKey Management Service crypto key. These values must be specified in the\nbuild's `Secret`. These variables will be available to all build steps\nin this build.",
@@ -231,7 +224,7 @@
231224
"Use a sha256 hash.",
232225
"Use a md5 hash."
233226
],
234-
"description": "Requested hash for SourceProvenance.",
227+
"description": "Requested hash for `SourceProvenance`.",
235228
"type": "array",
236229
"items": {
237230
"enum": ["NONE", "SHA256", "MD5"],
@@ -257,69 +250,6 @@
257250
}
258251
}
259252
},
260-
"Source": {
261-
"description": "Location of the source in a supported storage service.",
262-
"type": "object",
263-
"properties": {
264-
"storageSource": {
265-
"$ref": "#/definitions/StorageSource",
266-
"description": "If provided, get the source from this location in Google Cloud Storage."
267-
},
268-
"repoSource": {
269-
"$ref": "#/definitions/RepoSource",
270-
"description": "If provided, get the source from this location in a Cloud Source\nRepository."
271-
}
272-
}
273-
},
274-
"StorageSource": {
275-
"$id": "StorageSource",
276-
"description": "Location of the source in an archive file in Google Cloud Storage.",
277-
"type": "object",
278-
"properties": {
279-
"generation": {
280-
"type": "string",
281-
"description": "Google Cloud Storage generation for the object. If the generation is\nomitted, the latest generation will be used."
282-
},
283-
"bucket": {
284-
"description": "Google Cloud Storage bucket containing the source (see\n[Bucket Name\nRequirements](https://cloud.google.com/storage/docs/bucket-naming#requirements)).",
285-
"type": "string"
286-
},
287-
"object": {
288-
"description": "Google Cloud Storage object containing the source.\n\nThis object must be a gzipped archive file (`.tar.gz`) containing source to\nbuild.",
289-
"type": "string"
290-
}
291-
}
292-
},
293-
"RepoSource": {
294-
"description": "Location of the source in a Google Cloud Source Repository.",
295-
"type": "object",
296-
"properties": {
297-
"tagName": {
298-
"description": "Name of the tag to build.",
299-
"type": "string"
300-
},
301-
"projectId": {
302-
"description": "ID of the project that owns the Cloud Source Repository. If omitted, the\nproject ID requesting the build is assumed.",
303-
"type": "string"
304-
},
305-
"repoName": {
306-
"description": "Name of the Cloud Source Repository. If omitted, the name \"default\" is\nassumed.",
307-
"type": "string"
308-
},
309-
"commitSha": {
310-
"description": "Explicit commit SHA to build.",
311-
"type": "string"
312-
},
313-
"dir": {
314-
"description": "Directory, relative to the source root, in which to run the build.\n\nThis must be a relative path. If a step's `dir` is specified and is an\nabsolute path, this value is ignored for that step's execution.",
315-
"type": "string"
316-
},
317-
"branchName": {
318-
"description": "Name of the branch to build.",
319-
"type": "string"
320-
}
321-
}
322-
},
323253
"Artifacts": {
324254
"description": "Artifacts produced by a build that should be uploaded upon\nsuccessful completion of all build steps.",
325255
"type": "object",
@@ -343,7 +273,7 @@
343273
}
344274
},
345275
"npmPackages": {
346-
"description": "Uploads your built NPM packages to supported repositories..",
276+
"description": "Uploads your built NPM packages to supported repositories.",
347277
"type": "array",
348278
"items": {
349279
"$ref": "#/definitions/NpmPackages"
@@ -449,7 +379,7 @@
449379
"type": "string",
450380
"description": "Time limit for executing the build or particular build step. The `timeout` field of a build step specifies the amount of time the step is allowed to run,\nand the `timeout` field of a build specifies the amount of time the build is allowed to run.",
451381
"pattern": "^\\d+(\\.\\d{0,9})?s$",
452-
"examples": ["3.5s"]
382+
"examples": ["3.5s", "120s"]
453383
}
454384
},
455385
"description": "A build resource in the Cloud Build API.\n\nAt a high level, a `Build` describes where to find source code, how to build\nit (for example, the builder image to run on the source), and where to store\nthe built artifacts.\n\nFields can include the following variables, which will be expanded when the\nbuild is created:\n\n- $PROJECT_ID: the project ID of the build.\n- $BUILD_ID: the autogenerated ID of the build.\n- $REPO_NAME: the source repository name specified by RepoSource.\n- $BRANCH_NAME: the branch name specified by RepoSource.\n- $TAG_NAME: the tag name specified by RepoSource.\n- $REVISION_ID or $COMMIT_SHA: the commit SHA specified by RepoSource or\n resolved from the specified branch or tag.\n- $SHORT_SHA: first 7 characters of $REVISION_ID or $COMMIT_SHA.",
@@ -490,10 +420,6 @@
490420
"$ref": "#/definitions/BuildOptions",
491421
"description": "Special options for this build."
492422
},
493-
"source": {
494-
"$ref": "#/definitions/Source",
495-
"description": "The location of the source files to build."
496-
},
497423
"artifacts": {
498424
"$ref": "#/definitions/Artifacts",
499425
"description": "Artifacts produced by the build that should be uploaded upon\nsuccessful completion of all build steps."
@@ -519,7 +445,7 @@
519445
"description": "Specifies the amount of time a build can be queued.\nIf a build is in the queue for longer than the value set in `queueTtl`, the build expires and the build status is set to `EXPIRED`.",
520446
"type": "string",
521447
"pattern": "^\\d+(\\.\\d{0,9})?s$",
522-
"examples": ["3.5s"],
448+
"examples": ["3.5s", "120s"],
523449
"default": "3600s"
524450
}
525451
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
324af1f7759db75af2dac70e8f1fa304e159a7bb72c644434acc4ae221b25fe8
1+
b51b3b818b212cba8f88a36f1903b15bc22f4bfdd466dc607d1513097dfa1c44

0 commit comments

Comments
 (0)