Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meshca: Pull in the MeshCA config proto from grpc-proto repo. #3807

Merged
merged 3 commits into from
Aug 13, 2020

Conversation

easwars
Copy link
Contributor

@easwars easwars commented Aug 11, 2020

No description provided.

@easwars easwars added no release notes Type: Feature New features or improvements in behavior labels Aug 11, 2020
@easwars easwars requested a review from dfawley August 11, 2020 22:13
@easwars
Copy link
Contributor Author

easwars commented Aug 12, 2020

I have excluded the pb.go files from the vet check which was failing earlier. And when importing into g3, we can exclude these pb.go files and use the canonical versions instead. PTAL.

regenerate.sh Outdated
"https://github.com/envoyproxy/protoc-gen-validate"
)
for repo in ${ENVOY_API_REPOS[@]}; do
dirname=`basename ${repo}`
Copy link
Member

Choose a reason for hiding this comment

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

Use $( instead of backticks please.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

regenerate.sh Outdated
Comment on lines 74 to 82
MAPPINGS=(
"grpc/service_config/service_config.proto=/internal/proto/grpc_service_config"
"envoy/config/core/v3/config_source.proto=github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
)
OPTS=""
for i in "${MAPPINGS[@]}"
do
OPTS+="M$i,"
done
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this extra complexity is a good idea. Just write it literally:

OPTS=Mgrpc/service_config/service_config.proto=/internal/proto/grpc_service_config,\
Menvoy/config/core/v3/config_source.proto=github.com/envoyproxy/go-control-plane/envoy/config/core/v3

(Also, the code above leaves a trailing comma which apparently works now, but doesn't seem like a good thing to be doing.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor Author

@easwars easwars 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 the review.

regenerate.sh Outdated
"https://github.com/envoyproxy/protoc-gen-validate"
)
for repo in ${ENVOY_API_REPOS[@]}; do
dirname=`basename ${repo}`
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

regenerate.sh Outdated
Comment on lines 74 to 82
MAPPINGS=(
"grpc/service_config/service_config.proto=/internal/proto/grpc_service_config"
"envoy/config/core/v3/config_source.proto=github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
)
OPTS=""
for i in "${MAPPINGS[@]}"
do
OPTS+="M$i,"
done
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@easwars easwars merged commit 0baf4c2 into grpc:master Aug 13, 2020
@easwars easwars deleted the meshca_config_proto branch August 13, 2020 16:39
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Type: Feature New features or improvements in behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants