From e2e230f37b60a469faadd314b93eefbb8d574232 Mon Sep 17 00:00:00 2001 From: Julian Figueroa Date: Tue, 14 May 2024 11:03:58 -0500 Subject: [PATCH 1/4] Add google/gnostic --- README.md | 1 + modules/static/google/gnostic/buf.md | 13 +++++++++++++ modules/static/google/gnostic/buf.yaml | 2 ++ modules/static/google/gnostic/initref | 1 + modules/static/google/gnostic/rsync.incl | 11 +++++++++++ scripts/fetch.sh | 1 + 6 files changed, 29 insertions(+) create mode 100644 modules/static/google/gnostic/buf.md create mode 100644 modules/static/google/gnostic/buf.yaml create mode 100644 modules/static/google/gnostic/initref create mode 100644 modules/static/google/gnostic/rsync.incl diff --git a/README.md b/README.md index 221638ee..6538e4ba 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ We currently sync automatically the following modules: | envoyproxy/protoc-gen-validate | https://github.com/envoyproxy/protoc-gen-validate | | | gogo/protobuf | https://github.com/gogo/protobuf | | | google/cel-spec | https://github.com/google/cel-spec | - googleapis/googleapis | +| google/gnostic | https://github.com/google/gnostic | | | googleapis/googleapis | https://github.com/googleapis/googleapis | | | googlechrome/lighthouse | https://github.com/GoogleChrome/lighthouse | | | googlecloudplatform/bq-schema-api | https://github.com/GoogleCloudPlatform/protoc-gen-bq-schema | | diff --git a/modules/static/google/gnostic/buf.md b/modules/static/google/gnostic/buf.md new file mode 100644 index 00000000..01ced987 --- /dev/null +++ b/modules/static/google/gnostic/buf.md @@ -0,0 +1,13 @@ +**This is a third-party repository managed by Buf.** + +Updates to the [source repository](https://github.com/google/gnostic) are automatically synced on a +periodic basis, and each BSR commit is tagged with corresponding Git semver releases. + +To depend on a specific version, you can use it as your reference in your dependencies: + +``` +deps: + - buf.build/google/gnostic: +``` + +For more information, see the [documentation](https://buf.build/docs/bsr/overview). diff --git a/modules/static/google/gnostic/buf.yaml b/modules/static/google/gnostic/buf.yaml new file mode 100644 index 00000000..4ebdeac9 --- /dev/null +++ b/modules/static/google/gnostic/buf.yaml @@ -0,0 +1,2 @@ +version: v1 +name: buf.build/google/gnostic diff --git a/modules/static/google/gnostic/initref b/modules/static/google/gnostic/initref new file mode 100644 index 00000000..5aff472d --- /dev/null +++ b/modules/static/google/gnostic/initref @@ -0,0 +1 @@ +v0.4.1 diff --git a/modules/static/google/gnostic/rsync.incl b/modules/static/google/gnostic/rsync.incl new file mode 100644 index 00000000..b8248d59 --- /dev/null +++ b/modules/static/google/gnostic/rsync.incl @@ -0,0 +1,11 @@ ++ /LICENSE + +# Open API v2 ++ /openapiv2/OpenAPIv2.proto + +# Open API v3 ++ /openapiv3/annotations.proto ++ /openapiv3/OpenAPIv3.proto + ++ */ +- * diff --git a/scripts/fetch.sh b/scripts/fetch.sh index 9aa6ff45..88b589a9 100755 --- a/scripts/fetch.sh +++ b/scripts/fetch.sh @@ -219,6 +219,7 @@ sync_references commits envoyproxy envoy https://github.com/envoyproxy/envoy api sync_references commits envoyproxy protoc-gen-validate https://github.com/envoyproxy/protoc-gen-validate sync_references commits gogo protobuf https://github.com/gogo/protobuf sync_references releases google cel-spec https://github.com/google/cel-spec proto +sync_references releases google gnostic https://github.com/google/gnostic sync_references commits googleapis googleapis https://github.com/googleapis/googleapis # TODO: replace to sync releases once they release the latest proto change: # https://github.com/GoogleChrome/lighthouse/pull/15116#issuecomment-1569261877 From ad9d739c364cd6c27da79e0ac112f82bd095c5d2 Mon Sep 17 00:00:00 2001 From: Julian Figueroa Date: Tue, 14 May 2024 12:22:25 -0500 Subject: [PATCH 2/4] Add all relevant protos --- modules/static/google/gnostic/rsync.incl | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/static/google/gnostic/rsync.incl b/modules/static/google/gnostic/rsync.incl index b8248d59..38543e6f 100644 --- a/modules/static/google/gnostic/rsync.incl +++ b/modules/static/google/gnostic/rsync.incl @@ -1,11 +1,21 @@ + /LICENSE -# Open API v2 -+ /openapiv2/OpenAPIv2.proto - -# Open API v3 -+ /openapiv3/annotations.proto -+ /openapiv3/OpenAPIv3.proto ++ /discovery ++ /discovery/**.proto ++ /extensions ++ /extensions/**.proto ++ /metrics ++ /metrics/**.proto ++ /metrics/lint ++ /metrics/lint/**.proto ++ /openapiv2 ++ /openapiv2/**.proto ++ /openapiv3 ++ /openapiv3/**.proto ++ /plugins ++ /plugins/**.proto ++ /surface ++ /surface/**.proto + */ - * From b8fb9a862f8a7d89de1bad58aa58452df65492c9 Mon Sep 17 00:00:00 2001 From: Julian Figueroa Date: Tue, 14 May 2024 12:24:15 -0500 Subject: [PATCH 3/4] Test sync only gnostic --- scripts/fetch.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/fetch.sh b/scripts/fetch.sh index 88b589a9..8a5c7dbc 100755 --- a/scripts/fetch.sh +++ b/scripts/fetch.sh @@ -210,26 +210,26 @@ trap cleanup EXIT # Keep this module list synced with README.md # sync_references ${sync_strategy} ${owner} ${repo} ${git_remote} ${opt_proto_subdir} -sync_references commits bufbuild confluent https://github.com/bufbuild/confluent-proto -sync_references releases bufbuild protovalidate https://github.com/bufbuild/protovalidate proto/protovalidate -sync_references releases bufbuild protovalidate-testing https://github.com/bufbuild/protovalidate proto/protovalidate-testing -sync_references commits bufbuild reflect https://github.com/bufbuild/reflect -sync_references commits cncf xds https://github.com/cncf/xds -sync_references commits envoyproxy envoy https://github.com/envoyproxy/envoy api -sync_references commits envoyproxy protoc-gen-validate https://github.com/envoyproxy/protoc-gen-validate -sync_references commits gogo protobuf https://github.com/gogo/protobuf -sync_references releases google cel-spec https://github.com/google/cel-spec proto +# sync_references commits bufbuild confluent https://github.com/bufbuild/confluent-proto +# sync_references releases bufbuild protovalidate https://github.com/bufbuild/protovalidate proto/protovalidate +# sync_references releases bufbuild protovalidate-testing https://github.com/bufbuild/protovalidate proto/protovalidate-testing +# sync_references commits bufbuild reflect https://github.com/bufbuild/reflect +# sync_references commits cncf xds https://github.com/cncf/xds +# sync_references commits envoyproxy envoy https://github.com/envoyproxy/envoy api +# sync_references commits envoyproxy protoc-gen-validate https://github.com/envoyproxy/protoc-gen-validate +# sync_references commits gogo protobuf https://github.com/gogo/protobuf +# sync_references releases google cel-spec https://github.com/google/cel-spec proto sync_references releases google gnostic https://github.com/google/gnostic -sync_references commits googleapis googleapis https://github.com/googleapis/googleapis -# TODO: replace to sync releases once they release the latest proto change: -# https://github.com/GoogleChrome/lighthouse/pull/15116#issuecomment-1569261877 -sync_references commits googlechrome lighthouse https://github.com/GoogleChrome/lighthouse proto -sync_references commits googlecloudplatform bq-schema-api https://github.com/GoogleCloudPlatform/protoc-gen-bq-schema -sync_references commits grpc grpc https://github.com/grpc/grpc-proto -sync_references commits grpc-ecosystem grpc-gateway https://github.com/grpc-ecosystem/grpc-gateway -sync_references commits opencensus opencensus https://github.com/census-instrumentation/opencensus-proto src -sync_references commits opentelemetry opentelemetry https://github.com/open-telemetry/opentelemetry-proto -sync_references commits prometheus client-model https://github.com/prometheus/client_model -sync_references releases protocolbuffers wellknowntypes https://github.com/protocolbuffers/protobuf src +# sync_references commits googleapis googleapis https://github.com/googleapis/googleapis +# # TODO: replace to sync releases once they release the latest proto change: +# # https://github.com/GoogleChrome/lighthouse/pull/15116#issuecomment-1569261877 +# sync_references commits googlechrome lighthouse https://github.com/GoogleChrome/lighthouse proto +# sync_references commits googlecloudplatform bq-schema-api https://github.com/GoogleCloudPlatform/protoc-gen-bq-schema +# sync_references commits grpc grpc https://github.com/grpc/grpc-proto +# sync_references commits grpc-ecosystem grpc-gateway https://github.com/grpc-ecosystem/grpc-gateway +# sync_references commits opencensus opencensus https://github.com/census-instrumentation/opencensus-proto src +# sync_references commits opentelemetry opentelemetry https://github.com/open-telemetry/opentelemetry-proto +# sync_references commits prometheus client-model https://github.com/prometheus/client_model +# sync_references releases protocolbuffers wellknowntypes https://github.com/protocolbuffers/protobuf src popd > /dev/null From 9f40a99e6c6398539ddc7a0278e142e61e2c2bc1 Mon Sep 17 00:00:00 2001 From: Julian Figueroa Date: Tue, 14 May 2024 12:38:45 -0500 Subject: [PATCH 4/4] Revert "Test sync only gnostic" This reverts commit b8fb9a862f8a7d89de1bad58aa58452df65492c9. --- scripts/fetch.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/fetch.sh b/scripts/fetch.sh index 8a5c7dbc..88b589a9 100755 --- a/scripts/fetch.sh +++ b/scripts/fetch.sh @@ -210,26 +210,26 @@ trap cleanup EXIT # Keep this module list synced with README.md # sync_references ${sync_strategy} ${owner} ${repo} ${git_remote} ${opt_proto_subdir} -# sync_references commits bufbuild confluent https://github.com/bufbuild/confluent-proto -# sync_references releases bufbuild protovalidate https://github.com/bufbuild/protovalidate proto/protovalidate -# sync_references releases bufbuild protovalidate-testing https://github.com/bufbuild/protovalidate proto/protovalidate-testing -# sync_references commits bufbuild reflect https://github.com/bufbuild/reflect -# sync_references commits cncf xds https://github.com/cncf/xds -# sync_references commits envoyproxy envoy https://github.com/envoyproxy/envoy api -# sync_references commits envoyproxy protoc-gen-validate https://github.com/envoyproxy/protoc-gen-validate -# sync_references commits gogo protobuf https://github.com/gogo/protobuf -# sync_references releases google cel-spec https://github.com/google/cel-spec proto +sync_references commits bufbuild confluent https://github.com/bufbuild/confluent-proto +sync_references releases bufbuild protovalidate https://github.com/bufbuild/protovalidate proto/protovalidate +sync_references releases bufbuild protovalidate-testing https://github.com/bufbuild/protovalidate proto/protovalidate-testing +sync_references commits bufbuild reflect https://github.com/bufbuild/reflect +sync_references commits cncf xds https://github.com/cncf/xds +sync_references commits envoyproxy envoy https://github.com/envoyproxy/envoy api +sync_references commits envoyproxy protoc-gen-validate https://github.com/envoyproxy/protoc-gen-validate +sync_references commits gogo protobuf https://github.com/gogo/protobuf +sync_references releases google cel-spec https://github.com/google/cel-spec proto sync_references releases google gnostic https://github.com/google/gnostic -# sync_references commits googleapis googleapis https://github.com/googleapis/googleapis -# # TODO: replace to sync releases once they release the latest proto change: -# # https://github.com/GoogleChrome/lighthouse/pull/15116#issuecomment-1569261877 -# sync_references commits googlechrome lighthouse https://github.com/GoogleChrome/lighthouse proto -# sync_references commits googlecloudplatform bq-schema-api https://github.com/GoogleCloudPlatform/protoc-gen-bq-schema -# sync_references commits grpc grpc https://github.com/grpc/grpc-proto -# sync_references commits grpc-ecosystem grpc-gateway https://github.com/grpc-ecosystem/grpc-gateway -# sync_references commits opencensus opencensus https://github.com/census-instrumentation/opencensus-proto src -# sync_references commits opentelemetry opentelemetry https://github.com/open-telemetry/opentelemetry-proto -# sync_references commits prometheus client-model https://github.com/prometheus/client_model -# sync_references releases protocolbuffers wellknowntypes https://github.com/protocolbuffers/protobuf src +sync_references commits googleapis googleapis https://github.com/googleapis/googleapis +# TODO: replace to sync releases once they release the latest proto change: +# https://github.com/GoogleChrome/lighthouse/pull/15116#issuecomment-1569261877 +sync_references commits googlechrome lighthouse https://github.com/GoogleChrome/lighthouse proto +sync_references commits googlecloudplatform bq-schema-api https://github.com/GoogleCloudPlatform/protoc-gen-bq-schema +sync_references commits grpc grpc https://github.com/grpc/grpc-proto +sync_references commits grpc-ecosystem grpc-gateway https://github.com/grpc-ecosystem/grpc-gateway +sync_references commits opencensus opencensus https://github.com/census-instrumentation/opencensus-proto src +sync_references commits opentelemetry opentelemetry https://github.com/open-telemetry/opentelemetry-proto +sync_references commits prometheus client-model https://github.com/prometheus/client_model +sync_references releases protocolbuffers wellknowntypes https://github.com/protocolbuffers/protobuf src popd > /dev/null