Skip to content

tooling: include protoc-gen-jsonschema repository#27661

Merged
phlax merged 6 commits into
envoyproxy:mainfrom
norbjd:include-protoc-gen-jsonschema
May 30, 2023
Merged

tooling: include protoc-gen-jsonschema repository#27661
phlax merged 6 commits into
envoyproxy:mainfrom
norbjd:include-protoc-gen-jsonschema

Conversation

@norbjd
Copy link
Copy Markdown
Contributor

@norbjd norbjd commented May 27, 2023

Commit Message

Include protoc-gen-jsonschema repository that will be used to generate JSON schemas from protobuf files.

Additional Description

Split from #27640 following @phlax demand.

This PR is a prerequisite to generate JSON schemas from protobuf files. First, we want to make sure everything's working after including that repository.

The protoc-gen-jsonschema repository used is still a fork I've made to bazelify the repo before including it here (chrusty/protoc-gen-jsonschema@master...norbjd:protoc-gen-jsonschema:add-bazel); if everything's good I plan to contribute to chrusty's upstream repository.

Risk Level

Low

Testing

I have added a dummy rule to confirm the setup works.

$ bazel build //tools/protojsonschema:envoy_annotations_jsonschema

$ cat bazel-bin/tools/protojsonschema/envoy_annotations_jsonschema
{
    "$schema": "http://json-schema.org/draft-04/schema#",
    "$ref": "#/definitions/ResourceAnnotation",
    "definitions": {
        "ResourceAnnotation": {
            "properties": {
                "type": {
                    "type": "string"
                }
            },
            "additionalProperties": true,
            "type": "object"
        }
    }
}

Docs Changes

/

Release Notes

Include protoc-gen-jsonschema repository

Platform Specific Features

/

Signed-off-by: norbjd <norbjd@users.noreply.github.com>
Comment thread WORKSPACE Outdated
@repokitteh-read-only repokitteh-read-only Bot added the deps Approval required for changes to Envoy's external dependencies label May 27, 2023
Comment thread api/bazel/repository_locations.bzl Outdated
Signed-off-by: norbjd <norbjd@users.noreply.github.com>
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @htuch

🐱

Caused by: #27661 was synchronize by norbjd.

see: more, trace.

@phlax phlax self-assigned this May 29, 2023
Comment thread WORKSPACE Outdated
norbjd added 2 commits May 30, 2023 13:28
Signed-off-by: norbjd <norbjd@users.noreply.github.com>
Signed-off-by: norbjd <norbjd@users.noreply.github.com>
Copy link
Copy Markdown
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for iterating @norbjd

if we can put these imports in the right places we should be good to land

Comment thread tools/protojsonschema/com_github_chrusty_protoc_gen_jsonschema_deps.bzl Outdated
Comment thread WORKSPACE Outdated
…d of manually copying it

Signed-off-by: norbjd <norbjd@users.noreply.github.com>
Copy link
Copy Markdown
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you remove the added BUILD file ci should pass now i think

Signed-off-by: norbjd <norbjd@users.noreply.github.com>
@norbjd
Copy link
Copy Markdown
Contributor Author

norbjd commented May 30, 2023

Should be good now, everything unnecessary has been removed 🧹

Copy link
Copy Markdown
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks for separating this out and cleaning up, i think it will make it easier to look at the next steps

lgtm, thanks @norbjd

@repokitteh-read-only repokitteh-read-only Bot removed the deps Approval required for changes to Envoy's external dependencies label May 30, 2023
@phlax phlax merged commit 86537d1 into envoyproxy:main May 30, 2023
reskin89 pushed a commit to reskin89/envoy that referenced this pull request Jul 11, 2023
Signed-off-by: norbjd <norbjd@users.noreply.github.com>
Signed-off-by: Ryan Eskin <ryan.eskin89@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants