Move the proto to third_party

pull/23766/head
Yash Tibrewal 4 years ago
parent 2c6074ac6a
commit 9e4ceb041e
  1. 6
      BUILD
  2. 4
      src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c
  3. 8
      src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h
  4. 1
      third_party/istio/security/proto/providers/google/meshca.proto
  5. 2
      tools/codegen/core/gen_upb_api.sh
  6. 2
      tools/distrib/check_copyright.py

@ -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 = [

@ -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 <stddef.h>
#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"

@ -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_ */

@ -49,4 +49,3 @@ service MeshCertificateService {
returns (MeshCertificateResponse) {
}
}

@ -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" \

@ -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',

Loading…
Cancel
Save