grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: get the correct meshca.proto version that has the needed Java annotations (#7298)

This commit is contained in:
sanjaypujare 2020-08-07 09:22:42 -07:00 committed by GitHub
parent f59c9a9c6b
commit b749cb6210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/build.gradle
View File

@ -96,7 +96,7 @@ shadowJar {
relocate 'io.envoyproxy', 'io.grpc.xds.shaded.io.envoyproxy' relocate 'io.envoyproxy', 'io.grpc.xds.shaded.io.envoyproxy'
relocate 'io.grpc.netty', 'io.grpc.netty.shaded.io.grpc.netty' relocate 'io.grpc.netty', 'io.grpc.netty.shaded.io.grpc.netty'
relocate 'io.netty', 'io.grpc.netty.shaded.io.netty' relocate 'io.netty', 'io.grpc.netty.shaded.io.netty'
relocate 'google.security', 'io.grpc.xds.shaded.google.security' relocate 'com.google.security', 'io.grpc.xds.shaded.com.google.security'
exclude "**/*.proto" exclude "**/*.proto"
} }

46
xds/src/generated/main/grpc/google/security/meshca/v1/MeshCertificateServiceGrpc.java → xds/src/generated/main/grpc/com/google/security/meshca/v1/MeshCertificateServiceGrpc.java
View File

@ -1,4 +1,4 @@
package google.security.meshca.v1; package com.google.security.meshca.v1;
import static io.grpc.MethodDescriptor.generateFullMethodName; import static io.grpc.MethodDescriptor.generateFullMethodName;
import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
@ -30,29 +30,29 @@ public final class MeshCertificateServiceGrpc {
public static final String SERVICE_NAME = "google.security.meshca.v1.MeshCertificateService"; public static final String SERVICE_NAME = "google.security.meshca.v1.MeshCertificateService";
// Static method descriptors that strictly reflect the proto. // Static method descriptors that strictly reflect the proto.
private static volatile io.grpc.MethodDescriptor<google.security.meshca.v1.Meshca.MeshCertificateRequest, private static volatile io.grpc.MethodDescriptor<com.google.security.meshca.v1.MeshCertificateRequest,
google.security.meshca.v1.Meshca.MeshCertificateResponse> getCreateCertificateMethod; com.google.security.meshca.v1.MeshCertificateResponse> getCreateCertificateMethod;
@io.grpc.stub.annotations.RpcMethod( @io.grpc.stub.annotations.RpcMethod(
fullMethodName = SERVICE_NAME + '/' + "CreateCertificate", fullMethodName = SERVICE_NAME + '/' + "CreateCertificate",
requestType = google.security.meshca.v1.Meshca.MeshCertificateRequest.class, requestType = com.google.security.meshca.v1.MeshCertificateRequest.class,
responseType = google.security.meshca.v1.Meshca.MeshCertificateResponse.class, responseType = com.google.security.meshca.v1.MeshCertificateResponse.class,
methodType = io.grpc.MethodDescriptor.MethodType.UNARY) methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
public static io.grpc.MethodDescriptor<google.security.meshca.v1.Meshca.MeshCertificateRequest, public static io.grpc.MethodDescriptor<com.google.security.meshca.v1.MeshCertificateRequest,
google.security.meshca.v1.Meshca.MeshCertificateResponse> getCreateCertificateMethod() { com.google.security.meshca.v1.MeshCertificateResponse> getCreateCertificateMethod() {
io.grpc.MethodDescriptor<google.security.meshca.v1.Meshca.MeshCertificateRequest, google.security.meshca.v1.Meshca.MeshCertificateResponse> getCreateCertificateMethod; io.grpc.MethodDescriptor<com.google.security.meshca.v1.MeshCertificateRequest, com.google.security.meshca.v1.MeshCertificateResponse> getCreateCertificateMethod;
if ((getCreateCertificateMethod = MeshCertificateServiceGrpc.getCreateCertificateMethod) == null) { if ((getCreateCertificateMethod = MeshCertificateServiceGrpc.getCreateCertificateMethod) == null) {
synchronized (MeshCertificateServiceGrpc.class) { synchronized (MeshCertificateServiceGrpc.class) {
if ((getCreateCertificateMethod = MeshCertificateServiceGrpc.getCreateCertificateMethod) == null) { if ((getCreateCertificateMethod = MeshCertificateServiceGrpc.getCreateCertificateMethod) == null) {
MeshCertificateServiceGrpc.getCreateCertificateMethod = getCreateCertificateMethod = MeshCertificateServiceGrpc.getCreateCertificateMethod = getCreateCertificateMethod =
io.grpc.MethodDescriptor.<google.security.meshca.v1.Meshca.MeshCertificateRequest, google.security.meshca.v1.Meshca.MeshCertificateResponse>newBuilder() io.grpc.MethodDescriptor.<com.google.security.meshca.v1.MeshCertificateRequest, com.google.security.meshca.v1.MeshCertificateResponse>newBuilder()
.setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
.setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateCertificate")) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateCertificate"))
.setSampledToLocalTracing(true) .setSampledToLocalTracing(true)
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
google.security.meshca.v1.Meshca.MeshCertificateRequest.getDefaultInstance())) com.google.security.meshca.v1.MeshCertificateRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
google.security.meshca.v1.Meshca.MeshCertificateResponse.getDefaultInstance())) com.google.security.meshca.v1.MeshCertificateResponse.getDefaultInstance()))
.setSchemaDescriptor(new MeshCertificateServiceMethodDescriptorSupplier("CreateCertificate")) .setSchemaDescriptor(new MeshCertificateServiceMethodDescriptorSupplier("CreateCertificate"))
.build(); .build();
} }
@ -118,8 +118,8 @@ public final class MeshCertificateServiceGrpc {
* service account identity. * service account identity.
* </pre> * </pre>
*/ */
public void createCertificate(google.security.meshca.v1.Meshca.MeshCertificateRequest request, public void createCertificate(com.google.security.meshca.v1.MeshCertificateRequest request,
io.grpc.stub.StreamObserver<google.security.meshca.v1.Meshca.MeshCertificateResponse> responseObserver) { io.grpc.stub.StreamObserver<com.google.security.meshca.v1.MeshCertificateResponse> responseObserver) {
asyncUnimplementedUnaryCall(getCreateCertificateMethod(), responseObserver); asyncUnimplementedUnaryCall(getCreateCertificateMethod(), responseObserver);
} }
@ -129,8 +129,8 @@ public final class MeshCertificateServiceGrpc {
getCreateCertificateMethod(), getCreateCertificateMethod(),
asyncUnaryCall( asyncUnaryCall(
new MethodHandlers< new MethodHandlers<
google.security.meshca.v1.Meshca.MeshCertificateRequest, com.google.security.meshca.v1.MeshCertificateRequest,
google.security.meshca.v1.Meshca.MeshCertificateResponse>( com.google.security.meshca.v1.MeshCertificateResponse>(
this, METHODID_CREATE_CERTIFICATE))) this, METHODID_CREATE_CERTIFICATE)))
.build(); .build();
} }
@ -159,8 +159,8 @@ public final class MeshCertificateServiceGrpc {
* service account identity. * service account identity.
* </pre> * </pre>
*/ */
public void createCertificate(google.security.meshca.v1.Meshca.MeshCertificateRequest request, public void createCertificate(com.google.security.meshca.v1.MeshCertificateRequest request,
io.grpc.stub.StreamObserver<google.security.meshca.v1.Meshca.MeshCertificateResponse> responseObserver) { io.grpc.stub.StreamObserver<com.google.security.meshca.v1.MeshCertificateResponse> responseObserver) {
asyncUnaryCall( asyncUnaryCall(
getChannel().newCall(getCreateCertificateMethod(), getCallOptions()), request, responseObserver); getChannel().newCall(getCreateCertificateMethod(), getCallOptions()), request, responseObserver);
} }
@ -189,7 +189,7 @@ public final class MeshCertificateServiceGrpc {
* service account identity. * service account identity.
* </pre> * </pre>
*/ */
public google.security.meshca.v1.Meshca.MeshCertificateResponse createCertificate(google.security.meshca.v1.Meshca.MeshCertificateRequest request) { public com.google.security.meshca.v1.MeshCertificateResponse createCertificate(com.google.security.meshca.v1.MeshCertificateRequest request) {
return blockingUnaryCall( return blockingUnaryCall(
getChannel(), getCreateCertificateMethod(), getCallOptions(), request); getChannel(), getCreateCertificateMethod(), getCallOptions(), request);
} }
@ -218,8 +218,8 @@ public final class MeshCertificateServiceGrpc {
* service account identity. * service account identity.
* </pre> * </pre>
*/ */
public com.google.common.util.concurrent.ListenableFuture<google.security.meshca.v1.Meshca.MeshCertificateResponse> createCertificate( public com.google.common.util.concurrent.ListenableFuture<com.google.security.meshca.v1.MeshCertificateResponse> createCertificate(
google.security.meshca.v1.Meshca.MeshCertificateRequest request) { com.google.security.meshca.v1.MeshCertificateRequest request) {
return futureUnaryCall( return futureUnaryCall(
getChannel().newCall(getCreateCertificateMethod(), getCallOptions()), request); getChannel().newCall(getCreateCertificateMethod(), getCallOptions()), request);
} }
@ -245,8 +245,8 @@ public final class MeshCertificateServiceGrpc {
public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) { public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
switch (methodId) { switch (methodId) {
case METHODID_CREATE_CERTIFICATE: case METHODID_CREATE_CERTIFICATE:
serviceImpl.createCertificate((google.security.meshca.v1.Meshca.MeshCertificateRequest) request, serviceImpl.createCertificate((com.google.security.meshca.v1.MeshCertificateRequest) request,
(io.grpc.stub.StreamObserver<google.security.meshca.v1.Meshca.MeshCertificateResponse>) responseObserver); (io.grpc.stub.StreamObserver<com.google.security.meshca.v1.MeshCertificateResponse>) responseObserver);
break; break;
default: default:
throw new AssertionError(); throw new AssertionError();
@ -270,7 +270,7 @@ public final class MeshCertificateServiceGrpc {
@java.lang.Override @java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return google.security.meshca.v1.Meshca.getDescriptor(); return com.google.security.meshca.v1.MeshCaProto.getDescriptor();
} }
@java.lang.Override @java.lang.Override

2
xds/third_party/istio/import.sh vendored
View File

@ -18,7 +18,7 @@
set -e set -e
BRANCH=master BRANCH=master
VERSION=4c14c4673ab8748a0c77922290d91b6ce68b7b7c VERSION=e0ce39487b4806bdd9062b2c0d0cae0bebbbac7b
GIT_REPO="https://github.com/istio/istio.git" GIT_REPO="https://github.com/istio/istio.git"
GIT_BASE_DIR=istio GIT_BASE_DIR=istio
SOURCE_PROTO_BASE_DIR=istio SOURCE_PROTO_BASE_DIR=istio

4
xds/third_party/istio/src/main/proto/security/proto/providers/google/meshca.proto vendored
View File

@ -18,6 +18,10 @@ package google.security.meshca.v1;
import "google/protobuf/duration.proto"; import "google/protobuf/duration.proto";
option java_multiple_files = true;
option java_outer_classname = "MeshCaProto";
option java_package = "com.google.security.meshca.v1";
// Certificate request message. // Certificate request message.
message MeshCertificateRequest { message MeshCertificateRequest {
// The request ID must be a valid UUID with the exception that zero UUID is // The request ID must be a valid UUID with the exception that zero UUID is