From 09294b6d1f84e46189c9adc0cde8c9de38f7768b Mon Sep 17 00:00:00 2001 From: Grant Timmerman <744973+grant@users.noreply.github.com> Date: Tue, 30 Mar 2021 16:17:45 -0500 Subject: [PATCH] fix: correctly pin json schema generator tool (#196) Signed-off-by: Grant Timmerman --- .../google/events/cloud/audit/v1/LogEntryData.json | 4 +--- .../events/cloud/cloudbuild/v1/BuildEventData.json | 12 +++--------- .../events/cloud/firestore/v1/DocumentEventData.json | 4 +--- .../events/cloud/pubsub/v1/MessagePublishedData.json | 4 +--- .../events/cloud/scheduler/v1/SchedulerJobData.json | 4 +--- scripts/clean.sh | 0 tools/proto2jsonschema/gen.sh | 2 -- tools/readme-catalog/gen-audit-catalog.js | 2 -- 8 files changed, 7 insertions(+), 25 deletions(-) mode change 100644 => 100755 scripts/clean.sh diff --git a/jsonschema/google/events/cloud/audit/v1/LogEntryData.json b/jsonschema/google/events/cloud/audit/v1/LogEntryData.json index 6359b48b..16b6dcfb 100644 --- a/jsonschema/google/events/cloud/audit/v1/LogEntryData.json +++ b/jsonschema/google/events/cloud/audit/v1/LogEntryData.json @@ -107,9 +107,7 @@ }, "value": { "type": "string", - "description": "Must be a valid serialized protocol buffer of the above specified type.", - "format": "binary", - "binaryEncoding": "base64" + "description": "Must be a valid serialized protocol buffer of the above specified type." } }, "additionalProperties": true, diff --git a/jsonschema/google/events/cloud/cloudbuild/v1/BuildEventData.json b/jsonschema/google/events/cloud/cloudbuild/v1/BuildEventData.json index 99dc468e..122b662e 100644 --- a/jsonschema/google/events/cloud/cloudbuild/v1/BuildEventData.json +++ b/jsonschema/google/events/cloud/cloudbuild/v1/BuildEventData.json @@ -234,9 +234,7 @@ "type": "string" }, "type": "array", - "description": "List of build step outputs, produced by builder images, in the order\n corresponding to build step indices.\n\n [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders)\n can produce this output by writing to `$BUILDER_OUTPUT/output`.\n Only the first 4KB of data is stored.", - "format": "binary", - "binaryEncoding": "base64" + "description": "List of build step outputs, produced by builder images, in the order\n corresponding to build step indices.\n\n [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders)\n can produce this output by writing to `$BUILDER_OUTPUT/output`.\n Only the first 4KB of data is stored." }, "artifactTiming": { "$ref": "#/definitions/TimeSpan", @@ -380,9 +378,7 @@ }, "value": { "type": "string", - "description": "The hash value.", - "format": "binary", - "binaryEncoding": "base64" + "description": "The hash value." } }, "additionalProperties": true, @@ -576,9 +572,7 @@ }, "secretEnv": { "additionalProperties": { - "type": "string", - "format": "binary", - "binaryEncoding": "base64" + "type": "string" }, "type": "object", "description": "Map of environment variable name to its encrypted value.\n\n Secret environment variables must be unique across all of a build's\n secrets, and must be used by at least one build step. Values can be at most\n 64 KB in size. There can be at most 100 secret values across all of a\n build's secrets." diff --git a/jsonschema/google/events/cloud/firestore/v1/DocumentEventData.json b/jsonschema/google/events/cloud/firestore/v1/DocumentEventData.json index 4999dff2..2f46e4c4 100644 --- a/jsonschema/google/events/cloud/firestore/v1/DocumentEventData.json +++ b/jsonschema/google/events/cloud/firestore/v1/DocumentEventData.json @@ -115,9 +115,7 @@ }, "bytesValue": { "type": "string", - "description": "A bytes value.\n\n Must not exceed 1 MiB - 89 bytes.\n Only the first 1,500 bytes are considered by queries.", - "format": "binary", - "binaryEncoding": "base64" + "description": "A bytes value.\n\n Must not exceed 1 MiB - 89 bytes.\n Only the first 1,500 bytes are considered by queries." }, "referenceValue": { "type": "string", diff --git a/jsonschema/google/events/cloud/pubsub/v1/MessagePublishedData.json b/jsonschema/google/events/cloud/pubsub/v1/MessagePublishedData.json index e62fabcf..ae84bebb 100644 --- a/jsonschema/google/events/cloud/pubsub/v1/MessagePublishedData.json +++ b/jsonschema/google/events/cloud/pubsub/v1/MessagePublishedData.json @@ -17,9 +17,7 @@ "properties": { "data": { "type": "string", - "description": "The binary data in the message.", - "format": "binary", - "binaryEncoding": "base64" + "description": "The binary data in the message." }, "attributes": { "additionalProperties": { diff --git a/jsonschema/google/events/cloud/scheduler/v1/SchedulerJobData.json b/jsonschema/google/events/cloud/scheduler/v1/SchedulerJobData.json index ecf400eb..5d03860c 100644 --- a/jsonschema/google/events/cloud/scheduler/v1/SchedulerJobData.json +++ b/jsonschema/google/events/cloud/scheduler/v1/SchedulerJobData.json @@ -12,9 +12,7 @@ "properties": { "customData": { "type": "string", - "description": "The custom data the user specified when creating the scheduler source.", - "format": "binary", - "binaryEncoding": "base64" + "description": "The custom data the user specified when creating the scheduler source." } }, "additionalProperties": true, diff --git a/scripts/clean.sh b/scripts/clean.sh old mode 100644 new mode 100755 diff --git a/tools/proto2jsonschema/gen.sh b/tools/proto2jsonschema/gen.sh index 9e3d6a39..d4c74dac 100755 --- a/tools/proto2jsonschema/gen.sh +++ b/tools/proto2jsonschema/gen.sh @@ -57,9 +57,7 @@ cd .. PROTOC_PLUGIN_VERSION=0.9.7 echo "- Setting up protoc plugin: chrusty/protoc-gen-jsonschema@$PROTOC_PLUGIN_VERSION" # Pin chrusty tool to specific version: https://github.com/chrusty/protoc-gen-jsonschema/tags -go get -v github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema GO111MODULE=on go get -v github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema@$PROTOC_PLUGIN_VERSION -go install github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema echo "- Converting protos to JSON Schemas" chmod +x $PROTOC diff --git a/tools/readme-catalog/gen-audit-catalog.js b/tools/readme-catalog/gen-audit-catalog.js index d6b19389..57b48095 100644 --- a/tools/readme-catalog/gen-audit-catalog.js +++ b/tools/readme-catalog/gen-audit-catalog.js @@ -50,8 +50,6 @@ export const genAuditCatalog = () => { const replacementString = CATALOG.services.map(getServiceCatalogEntryMarkdown).join(''); const updatedReadmeContents = getGeneratedStringWithReplacement(auditCatalogContents, replacementString); - console.log(updatedReadmeContents); - // Save updated README fs.writeFileSync(AUDIT_CATALOG_PATH, updatedReadmeContents); console.log('- Updated README.');