Skip to content

Commit 35f3956

Browse files
committed
Fixup: 12492 Remove artifact from old channelcreds implementation and address nits.
1 parent 5ed6993 commit 35f3956

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

xds/src/main/java/io/grpc/xds/internal/grpcservice/GrpcServiceConfigParser.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,8 @@ public static GrpcServiceConfig.GoogleGrpcConfig parseGoogleGrpcConfig(
148148
return builder.build();
149149
}
150150

151-
ConfiguredChannelCredentials channelCreds = null;
152-
if (googleGrpcProto.getChannelCredentialsPluginCount() > 0) {
153-
try {
154-
channelCreds = extractChannelCredentials(googleGrpcProto.getChannelCredentialsPluginList());
155-
} catch (GrpcServiceParseException e) {
156-
// Fall back to channel_credentials if plugins are not supported
157-
}
158-
}
159-
160-
if (channelCreds == null) {
161-
throw new GrpcServiceParseException("No valid supported channel_credentials found");
162-
}
151+
ConfiguredChannelCredentials channelCreds =
152+
extractChannelCredentials(googleGrpcProto.getChannelCredentialsPluginList());
163153

164154
Optional<CallCredentials> callCreds =
165155
extractCallCredentials(googleGrpcProto.getCallCredentialsPluginList());
@@ -277,8 +267,6 @@ public void applyRequestMetadata(RequestInfo requestInfo, Executor appExecutor,
277267
}
278268
}
279269

280-
281-
282270
static final class ProtoChannelCredsConfig implements ChannelCredsConfig {
283271
private final String type;
284272
private final Any configProto;

0 commit comments

Comments
 (0)