Skip to content

Commit

Permalink
fix: Fix CI. Regen with latest Chrusty plugin. (#132)
Browse files Browse the repository at this point in the history 
* docs: brush up gen output

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* feat: remove oneof null values. Regen.

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* refactor: fix sp for plug-in

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* refactor: move cleaning scripts into separate file

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
  • Loading branch information
@grant
grant authored Jan 12, 2021
1 parent b284a18 commit 2a7c823
Show file tree
Hide file tree
Showing 15 changed files with 130 additions and 133 deletions.
111 changes: 39 additions & 72 deletions jsonschema/google/events/cloud/audit/v1/LogEntryData.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$id": "https://googleapis.github.io/google-cloudevents/jsonschema/google/events/cloud/audit/v1/LogEntryData.json",
"name": "LogEntryData",
"examples": [],
"package": "google.events.cloud.audit.v1",
"datatype": "google.events.cloud.audit.v1.LogEntryData",
"cloudeventTypes": [
Expand Down Expand Up @@ -70,14 +71,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand Down Expand Up @@ -139,14 +134,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand All @@ -173,14 +162,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand All @@ -201,14 +184,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand Down Expand Up @@ -374,14 +351,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand Down Expand Up @@ -447,14 +418,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand All @@ -468,14 +433,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand All @@ -489,14 +448,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand All @@ -510,14 +463,8 @@
"properties": {
"fields": {
"additionalProperties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
]
"additionalProperties": true,
"type": "object"
},
"type": "object",
"description": "Unordered map of dynamically typed values."
Expand Down Expand Up @@ -577,6 +524,26 @@
"format": "date-time"
},
"severity": {
"enum": [
"DEFAULT",
0,
"DEBUG",
100,
"INFO",
200,
"NOTICE",
300,
"WARNING",
400,
"ERROR",
500,
"CRITICAL",
600,
"ALERT",
700,
"EMERGENCY",
800
],
"oneOf": [
{
"type": "string"
Expand Down
47 changes: 29 additions & 18 deletions jsonschema/google/events/cloud/cloudbuild/v1/BuildEventData.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$id": "https://googleapis.github.io/google-cloudevents/jsonschema/google/events/cloud/cloudbuild/v1/BuildEventData.json",
"name": "BuildEventData",
"examples": [],
"package": "google.events.cloud.cloudbuild.v1",
"datatype": "google.events.cloud.cloudbuild.v1.BuildEventData",
"cloudeventTypes": [
Expand Down Expand Up @@ -57,13 +58,11 @@
"storageSource": {
"$ref": "#/definitions/StorageSource",
"additionalProperties": true,
"type": "object",
"description": "If provided, get the source from this location in Google Cloud Storage."
},
"repoSource": {
"$ref": "#/definitions/RepoSource",
"additionalProperties": true,
"type": "object",
"description": "If provided, get the source from this location in a Cloud Source\n Repository."
}
},
Expand Down Expand Up @@ -128,13 +127,11 @@
"timing": {
"$ref": "#/definitions/TimeSpan",
"additionalProperties": true,
"type": "object",
"description": "Stores timing information for executing this build step."
},
"pullTiming": {
"$ref": "#/definitions/TimeSpan",
"additionalProperties": true,
"type": "object",
"description": "Stores timing information for pulling this build step's\n builder image only."
},
"timeout": {
Expand All @@ -153,6 +150,26 @@
"description": "Time limit for executing this build step. If not defined, the step has no\n time limit and will be allowed to continue to run until either it completes\n or the build itself times out."
},
"status": {
"enum": [
"STATUS_UNKNOWN",
0,
"QUEUED",
1,
"WORKING",
2,
"SUCCESS",
3,
"FAILURE",
4,
"INTERNAL_ERROR",
5,
"TIMEOUT",
6,
"CANCELLED",
7,
"EXPIRED",
9
],
"oneOf": [
{
"type": "string"
Expand Down Expand Up @@ -187,7 +204,6 @@
"pushTiming": {
"$ref": "#/definitions/TimeSpan",
"additionalProperties": true,
"type": "object",
"description": "Stores timing information for pushing the specified image."
}
},
Expand Down Expand Up @@ -223,7 +239,6 @@
"artifactTiming": {
"$ref": "#/definitions/TimeSpan",
"additionalProperties": true,
"type": "object",
"description": "Time to push all non-container artifacts."
}
},
Expand Down Expand Up @@ -308,7 +323,6 @@
"timing": {
"$ref": "#/definitions/TimeSpan",
"additionalProperties": true,
"type": "object",
"description": "Stores timing information for pushing all artifact objects."
}
},
Expand All @@ -330,13 +344,11 @@
"resolvedStorageSource": {
"$ref": "#/definitions/StorageSource",
"additionalProperties": true,
"type": "object",
"description": "A copy of the build's `source.storage_source`, if exists, with any\n generations resolved."
},
"resolvedRepoSource": {
"$ref": "#/definitions/RepoSource",
"additionalProperties": true,
"type": "object",
"description": "A copy of the build's `source.repo_source`, if exists, with any\n revisions resolved."
},
"fileHashes": {
Expand Down Expand Up @@ -396,13 +408,13 @@
"properties": {
"sourceProvenanceHash": {
"items": {
"oneOf": [
{
"type": "string"
},
{
"type": "integer"
}
"enum": [
"NONE",
0,
"SHA256",
1,
"MD5",
2
]
},
"type": "array",
Expand Down Expand Up @@ -576,8 +588,7 @@
"timing": {
"additionalProperties": {
"$ref": "#/definitions/TimeSpan",
"additionalProperties": true,
"type": "object"
"additionalProperties": true
},
"type": "object",
"description": "Stores timing information for phases of the build. Valid keys\n are:\n\n * BUILD: time to execute all build steps\n * PUSH: time to push all specified images.\n * FETCHSOURCE: time to fetch source.\n\n If the build does not specify source or images,\n these keys will not be included."
Expand Down
13 changes: 7 additions & 6 deletions jsonschema/google/events/cloud/firestore/v1/DocumentEventData.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$id": "https://googleapis.github.io/google-cloudevents/jsonschema/google/events/cloud/firestore/v1/DocumentEventData.json",
"name": "DocumentEventData",
"examples": [],
"package": "google.events.cloud.firestore.v1",
"datatype": "google.events.cloud.firestore.v1.DocumentEventData",
"cloudeventTypes": [
Expand All @@ -15,13 +16,11 @@
"value": {
"$ref": "#/definitions/Document",
"additionalProperties": true,
"type": "object",
"description": "A Document object containing a post-operation document snapshot.\n This is not populated for delete events. (TODO: check this!)"
},
"oldValue": {
"$ref": "#/definitions/Document",
"additionalProperties": true,
"type": "object",
"description": "A Document object containing a pre-operation document snapshot.\n This is only populated for update and delete events."
},
"updateMask": {
Expand Down Expand Up @@ -52,8 +51,7 @@
"fields": {
"additionalProperties": {
"$ref": "#/definitions/Value",
"additionalProperties": true,
"type": "object"
"additionalProperties": true
},
"type": "object",
"description": "The document's fields.\n\n The map keys represent field names.\n\n A simple field name contains only characters `a` to `z`, `A` to `Z`,\n `0` to `9`, or `_`, and must not start with `0` to `9`. For example,\n `foo_bar_17`.\n\n Field names matching the regular expression `__.*__` are reserved. Reserved\n field names are forbidden except in certain documented contexts. The map\n keys, represented as UTF-8, must not exceed 1,500 bytes and cannot be\n empty.\n\n Field paths may be used in other contexts to refer to structured fields\n defined here. For `map_value`, the field path is represented by the simple\n or quoted field names of the containing fields, delimited by `.`. For\n example, the structured field\n `\"foo\" : { map_value: { \"x&y\" : { string_value: \"hello\" }}}` would be\n represented by the field path `foo.x&y`.\n\n Within a field path, a quoted field name starts and ends with `` ` `` and\n may contain any character. Some characters, including `` ` ``, must be\n escaped using a `\\`. For example, `` `x&y` `` represents `x&y` and\n `` `bak\\`tik` `` represents `` bak`tik ``."
Expand All @@ -77,6 +75,10 @@
"Value": {
"properties": {
"nullValue": {
"enum": [
"NULL_VALUE",
0
],
"oneOf": [
{
"type": "string"
Expand Down Expand Up @@ -150,8 +152,7 @@
"fields": {
"additionalProperties": {
"$ref": "#/definitions/Value",
"additionalProperties": true,
"type": "object"
"additionalProperties": true
},
"type": "object",
"description": "The map's fields.\n\n The map keys represent field names. Field names matching the regular\n expression `__.*__` are reserved. Reserved field names are forbidden except\n in certain documented contexts. The map keys, represented as UTF-8, must\n not exceed 1,500 bytes and cannot be empty."
Expand Down
1 change: 1 addition & 0 deletions jsonschema/google/events/cloud/pubsub/v1/MessagePublishedData.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$id": "https://googleapis.github.io/google-cloudevents/jsonschema/google/events/cloud/pubsub/v1/MessagePublishedData.json",
"name": "MessagePublishedData",
"examples": [],
"package": "google.events.cloud.pubsub.v1",
"datatype": "google.events.cloud.pubsub.v1.MessagePublishedData",
"cloudeventTypes": [
Expand Down
1 change: 1 addition & 0 deletions jsonschema/google/events/cloud/scheduler/v1/SchedulerJobData.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$id": "https://googleapis.github.io/google-cloudevents/jsonschema/google/events/cloud/scheduler/v1/SchedulerJobData.json",
"name": "SchedulerJobData",
"examples": [],
"package": "google.events.cloud.scheduler.v1",
"datatype": "google.events.cloud.scheduler.v1.SchedulerJobData",
"cloudeventTypes": [
Expand Down
1 change: 1 addition & 0 deletions jsonschema/google/events/cloud/storage/v1/StorageObjectData.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$id": "https://googleapis.github.io/google-cloudevents/jsonschema/google/events/cloud/storage/v1/StorageObjectData.json",
"name": "StorageObjectData",
"examples": [],
"package": "google.events.cloud.storage.v1",
"datatype": "google.events.cloud.storage.v1.StorageObjectData",
"cloudeventTypes": [
Expand Down
Loading

0 comments on commit 2a7c823

Please sign in to comment.