From 9e4ceb041efb966d5c6abcc0ec49120cfbe104ee Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 12 Aug 2020 14:21:14 -0700 Subject: [PATCH] Move the proto to third_party --- BUILD | 6 +++--- .../istio/security/proto/providers/google}/meshca.upb.c | 4 ++-- .../istio/security/proto/providers/google}/meshca.upb.h | 8 ++++---- .../istio/security/proto/providers/google}/meshca.proto | 1 - tools/codegen/core/gen_upb_api.sh | 2 +- tools/distrib/check_copyright.py | 2 -- 6 files changed, 10 insertions(+), 13 deletions(-) rename src/core/ext/upb-generated/{src/proto/grpc/tls/provider/meshca => third_party/istio/security/proto/providers/google}/meshca.upb.c (89%) rename src/core/ext/upb-generated/{src/proto/grpc/tls/provider/meshca => third_party/istio/security/proto/providers/google}/meshca.upb.h (95%) rename {src/proto/grpc/tls/provider/meshca => third_party/istio/security/proto/providers/google}/meshca.proto (99%) diff --git a/BUILD b/BUILD index fd0da8fcc62..e8ef84bda59 100644 --- a/BUILD +++ b/BUILD @@ -2834,16 +2834,16 @@ grpc_cc_library( # Once upb code-gen issue is resolved, replace meshca_upb with this. # meshca_upb_proto_library( # name = "meshca_upb", -# deps = ["//src/proto/grpc/tls/provider/meshca:meshca_proto"], +# deps = ["//third_party/istio/security/proto/providers/google:meshca_proto"], # ) grpc_cc_library( name = "meshca_upb", srcs = [ - "src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.c", + "src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c", ], hdrs = [ - "src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.h", + "src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h", ], language = "c++", deps = [ diff --git a/src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.c b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c similarity index 89% rename from src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.c rename to src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c index 5dc28cf857e..81e77467bb2 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.c +++ b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c @@ -1,14 +1,14 @@ /* This file was generated by upbc (the upb compiler) from the input * file: * - * src/proto/grpc/tls/provider/meshca/meshca.proto + * third_party/istio/security/proto/providers/google/meshca.proto * * Do not edit -- your changes will be discarded when the file is * regenerated. */ #include #include "upb/msg.h" -#include "src/proto/grpc/tls/provider/meshca/meshca.upb.h" +#include "third_party/istio/security/proto/providers/google/meshca.upb.h" #include "google/protobuf/duration.upb.h" #include "upb/port_def.inc" diff --git a/src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.h b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h similarity index 95% rename from src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.h rename to src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h index ab2f7b95085..8afbaab46fa 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/tls/provider/meshca/meshca.upb.h +++ b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h @@ -1,13 +1,13 @@ /* This file was generated by upbc (the upb compiler) from the input * file: * - * src/proto/grpc/tls/provider/meshca/meshca.proto + * third_party/istio/security/proto/providers/google/meshca.proto * * Do not edit -- your changes will be discarded when the file is * regenerated. */ -#ifndef SRC_PROTO_GRPC_TLS_PROVIDER_MESHCA_MESHCA_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_TLS_PROVIDER_MESHCA_MESHCA_PROTO_UPB_H_ +#ifndef THIRD_PARTY_ISTIO_SECURITY_PROTO_PROVIDERS_GOOGLE_MESHCA_PROTO_UPB_H_ +#define THIRD_PARTY_ISTIO_SECURITY_PROTO_PROVIDERS_GOOGLE_MESHCA_PROTO_UPB_H_ #include "upb/msg.h" #include "upb/decode.h" @@ -100,4 +100,4 @@ UPB_INLINE bool google_security_meshca_v1_MeshCertificateResponse_add_cert_chain #include "upb/port_undef.inc" -#endif /* SRC_PROTO_GRPC_TLS_PROVIDER_MESHCA_MESHCA_PROTO_UPB_H_ */ +#endif /* THIRD_PARTY_ISTIO_SECURITY_PROTO_PROVIDERS_GOOGLE_MESHCA_PROTO_UPB_H_ */ diff --git a/src/proto/grpc/tls/provider/meshca/meshca.proto b/third_party/istio/security/proto/providers/google/meshca.proto similarity index 99% rename from src/proto/grpc/tls/provider/meshca/meshca.proto rename to third_party/istio/security/proto/providers/google/meshca.proto index 90afde2b7fc..c02b7f58287 100644 --- a/src/proto/grpc/tls/provider/meshca/meshca.proto +++ b/third_party/istio/security/proto/providers/google/meshca.proto @@ -49,4 +49,3 @@ service MeshCertificateService { returns (MeshCertificateResponse) { } } - diff --git a/tools/codegen/core/gen_upb_api.sh b/tools/codegen/core/gen_upb_api.sh index fd6b6fa6c71..2d89c6fa02c 100755 --- a/tools/codegen/core/gen_upb_api.sh +++ b/tools/codegen/core/gen_upb_api.sh @@ -106,7 +106,7 @@ proto_files=( \ "src/proto/grpc/gcp/transport_security_common.proto" \ "src/proto/grpc/health/v1/health.proto" \ "src/proto/grpc/lb/v1/load_balancer.proto" \ - "src/proto/grpc/tls/provider/meshca/meshca.proto" \ + "third_party/istio/security/proto/providers/google/meshca.proto" \ "udpa/data/orca/v1/orca_load_report.proto" \ "udpa/annotations/migrate.proto" \ "udpa/annotations/sensitive.proto" \ diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 5bb1f4e8b85..5d3029484f8 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -88,8 +88,6 @@ _EXEMPT = frozenset(( 'tools/grpcz/census.proto', # status.proto copied from googleapis 'src/proto/grpc/status/status.proto', - # meshca.proto copied from istio - 'src/proto/grpc/tls/provider/meshca/meshca.proto', # Gradle wrappers used to build for Android 'examples/android/helloworld/gradlew.bat', 'src/android/test/interop/gradlew.bat',