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

xds: add helper to unpack compatible com.google.protobuf.Any messages

This commit is contained in:
Sergii Tkachenko 2021-03-03 17:46:44 -05:00 committed by GitHub
parent e5ab4d743d
commit cf99e8a7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
xds/src/main/java/io/grpc/xds/ClientXdsClient.java
View File

@ -141,11 +141,9 @@ final class ClientXdsClient extends AbstractXdsClient {
List<Listener> listeners = new ArrayList<>(resources.size()); List<Listener> listeners = new ArrayList<>(resources.size());
List<String> listenerNames = new ArrayList<>(resources.size()); List<String> listenerNames = new ArrayList<>(resources.size());
try { try {
for (com.google.protobuf.Any res : resources) { for (Any res : resources) {
if (res.getTypeUrl().equals(ResourceType.LDS.typeUrlV2())) { Listener listener = unpackCompatibleType(res, Listener.class, ResourceType.LDS.typeUrl(),
res = res.toBuilder().setTypeUrl(ResourceType.LDS.typeUrl()).build(); ResourceType.LDS.typeUrlV2());
}
Listener listener = res.unpack(Listener.class);
listeners.add(listener); listeners.add(listener);
listenerNames.add(listener.getName()); listenerNames.add(listener.getName());
} }
@ -160,12 +158,9 @@ final class ClientXdsClient extends AbstractXdsClient {
Map<String, HttpConnectionManager> httpConnectionManagers = new HashMap<>(listeners.size()); Map<String, HttpConnectionManager> httpConnectionManagers = new HashMap<>(listeners.size());
try { try {
for (Listener listener : listeners) { for (Listener listener : listeners) {
Any apiListener = listener.getApiListener().getApiListener(); HttpConnectionManager hcm = unpackCompatibleType(
if (apiListener.getTypeUrl().equals(TYPE_URL_HTTP_CONNECTION_MANAGER_V2)) { listener.getApiListener().getApiListener(), HttpConnectionManager.class,
apiListener = TYPE_URL_HTTP_CONNECTION_MANAGER, TYPE_URL_HTTP_CONNECTION_MANAGER_V2);
apiListener.toBuilder().setTypeUrl(TYPE_URL_HTTP_CONNECTION_MANAGER).build();
}
HttpConnectionManager hcm = apiListener.unpack(HttpConnectionManager.class);
httpConnectionManagers.put(listener.getName(), hcm); httpConnectionManagers.put(listener.getName(), hcm);
} }
} catch (InvalidProtocolBufferException e) { } catch (InvalidProtocolBufferException e) {
@ -671,11 +666,10 @@ final class ClientXdsClient extends AbstractXdsClient {
// Unpack RouteConfiguration messages. // Unpack RouteConfiguration messages.
Map<String, RouteConfiguration> routeConfigs = new HashMap<>(resources.size()); Map<String, RouteConfiguration> routeConfigs = new HashMap<>(resources.size());
try { try {
for (com.google.protobuf.Any res : resources) { for (Any res : resources) {
if (res.getTypeUrl().equals(ResourceType.RDS.typeUrlV2())) { RouteConfiguration rc =
res = res.toBuilder().setTypeUrl(ResourceType.RDS.typeUrl()).build(); unpackCompatibleType(res, RouteConfiguration.class, ResourceType.RDS.typeUrl(),
} ResourceType.RDS.typeUrlV2());
RouteConfiguration rc = res.unpack(RouteConfiguration.class);
routeConfigs.put(rc.getName(), rc); routeConfigs.put(rc.getName(), rc);
} }
} catch (InvalidProtocolBufferException e) { } catch (InvalidProtocolBufferException e) {
@ -721,11 +715,9 @@ final class ClientXdsClient extends AbstractXdsClient {
List<Cluster> clusters = new ArrayList<>(resources.size()); List<Cluster> clusters = new ArrayList<>(resources.size());
List<String> clusterNames = new ArrayList<>(resources.size()); List<String> clusterNames = new ArrayList<>(resources.size());
try { try {
for (com.google.protobuf.Any res : resources) { for (Any res : resources) {
if (res.getTypeUrl().equals(ResourceType.CDS.typeUrlV2())) { Cluster cluster = unpackCompatibleType(res, Cluster.class, ResourceType.CDS.typeUrl(),
res = res.toBuilder().setTypeUrl(ResourceType.CDS.typeUrl()).build(); ResourceType.CDS.typeUrlV2());
}
Cluster cluster = res.unpack(Cluster.class);
clusters.add(cluster); clusters.add(cluster);
clusterNames.add(cluster.getName()); clusterNames.add(cluster.getName());
} }
@ -814,14 +806,10 @@ final class ClientXdsClient extends AbstractXdsClient {
"Cluster " + clusterName + ": unsupported custom cluster type: " + typeName); "Cluster " + clusterName + ": unsupported custom cluster type: " + typeName);
} }
io.envoyproxy.envoy.extensions.clusters.aggregate.v3.ClusterConfig clusterConfig; io.envoyproxy.envoy.extensions.clusters.aggregate.v3.ClusterConfig clusterConfig;
Any unpackedClusterConfig = customType.getTypedConfig();
if (unpackedClusterConfig.getTypeUrl().equals(TYPE_URL_CLUSTER_CONFIG_V2)) {
unpackedClusterConfig =
unpackedClusterConfig.toBuilder().setTypeUrl(TYPE_URL_CLUSTER_CONFIG).build();
}
try { try {
clusterConfig = unpackedClusterConfig.unpack( clusterConfig = unpackCompatibleType(customType.getTypedConfig(),
io.envoyproxy.envoy.extensions.clusters.aggregate.v3.ClusterConfig.class); io.envoyproxy.envoy.extensions.clusters.aggregate.v3.ClusterConfig.class,
TYPE_URL_CLUSTER_CONFIG, TYPE_URL_CLUSTER_CONFIG_V2);
} catch (InvalidProtocolBufferException e) { } catch (InvalidProtocolBufferException e) {
return StructOrError.fromError("Cluster " + clusterName + ": malformed ClusterConfig: " + e); return StructOrError.fromError("Cluster " + clusterName + ": malformed ClusterConfig: " + e);
} }
@ -855,19 +843,15 @@ final class ClientXdsClient extends AbstractXdsClient {
} }
if (cluster.hasTransportSocket() if (cluster.hasTransportSocket()
&& TRANSPORT_SOCKET_NAME_TLS.equals(cluster.getTransportSocket().getName())) { && TRANSPORT_SOCKET_NAME_TLS.equals(cluster.getTransportSocket().getName())) {
Any any = cluster.getTransportSocket().getTypedConfig();
if (any.getTypeUrl().equals(TYPE_URL_UPSTREAM_TLS_CONTEXT_V2)) {
any = any.toBuilder().setTypeUrl(TYPE_URL_UPSTREAM_TLS_CONTEXT).build();
}
io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext unpacked;
try { try {
unpacked = any.unpack( upstreamTlsContext = UpstreamTlsContext.fromEnvoyProtoUpstreamTlsContext(
io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext.class); unpackCompatibleType(cluster.getTransportSocket().getTypedConfig(),
io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext.class,
TYPE_URL_UPSTREAM_TLS_CONTEXT, TYPE_URL_UPSTREAM_TLS_CONTEXT_V2));
} catch (InvalidProtocolBufferException e) { } catch (InvalidProtocolBufferException e) {
return StructOrError.fromError( return StructOrError.fromError(
"Cluster " + clusterName + ": malformed UpstreamTlsContext: " + e); "Cluster " + clusterName + ": malformed UpstreamTlsContext: " + e);
} }
upstreamTlsContext = UpstreamTlsContext.fromEnvoyProtoUpstreamTlsContext(unpacked);
} }
DiscoveryType type = cluster.getType(); DiscoveryType type = cluster.getType();
@ -902,11 +886,10 @@ final class ClientXdsClient extends AbstractXdsClient {
List<ClusterLoadAssignment> clusterLoadAssignments = new ArrayList<>(resources.size()); List<ClusterLoadAssignment> clusterLoadAssignments = new ArrayList<>(resources.size());
List<String> claNames = new ArrayList<>(resources.size()); List<String> claNames = new ArrayList<>(resources.size());
try { try {
for (com.google.protobuf.Any res : resources) { for (Any res : resources) {
if (res.getTypeUrl().equals(ResourceType.EDS.typeUrlV2())) { ClusterLoadAssignment assignment =
res = res.toBuilder().setTypeUrl(ResourceType.EDS.typeUrl()).build(); unpackCompatibleType(res, ClusterLoadAssignment.class, ResourceType.EDS.typeUrl(),
} ResourceType.EDS.typeUrlV2());
ClusterLoadAssignment assignment = res.unpack(ClusterLoadAssignment.class);
clusterLoadAssignments.add(assignment); clusterLoadAssignments.add(assignment);
claNames.add(assignment.getClusterName()); claNames.add(assignment.getClusterName());
} }
@ -1018,6 +1001,27 @@ final class ClientXdsClient extends AbstractXdsClient {
endpoints, proto.getLoadBalancingWeight().getValue(), proto.getPriority())); endpoints, proto.getLoadBalancingWeight().getValue(), proto.getPriority()));
} }
/**
* Helper method to unpack serialized {@link com.google.protobuf.Any} message, while replacing
* Type URL {@code compatibleTypeUrl} with {@code typeUrl}.
*
* @param <T> The type of unpacked message
* @param any serialized message to unpack
* @param clazz the class to unpack the message to
* @param typeUrl type URL to replace message Type URL, when it's compatible
* @param compatibleTypeUrl compatible Type URL to be replaced with {@code typeUrl}
* @return Unpacked message
* @throws InvalidProtocolBufferException if the message couldn't be unpacked
*/
private static <T extends com.google.protobuf.Message> T unpackCompatibleType(
Any any, Class<T> clazz, String typeUrl, String compatibleTypeUrl)
throws InvalidProtocolBufferException {
if (any.getTypeUrl().equals(compatibleTypeUrl)) {
any = any.toBuilder().setTypeUrl(typeUrl).build();
}
return any.unpack(clazz);
}
private static int getRatePerMillion(FractionalPercent percent) { private static int getRatePerMillion(FractionalPercent percent) {
int numerator = percent.getNumerator(); int numerator = percent.getNumerator();
DenominatorType type = percent.getDenominator(); DenominatorType type = percent.getDenominator();