Skip to content

xds: Envoy proto sync to 2022-04-08 #9101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergiitk merged 8 commits into from
Apr 25, 2022
Merged

xds: Envoy proto sync to 2022-04-08 #9101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ab569d
Sort xds/import.sh protos alphabetically
sergiitk Apr 21, 2022
53870cc
Import latest xds/type/matcher/v3/matcher.proto
sergiitk Apr 21, 2022
5d2f7fb
Import protoc-gen-validate with ignore_empty field needed for envoy
sergiitk Apr 22, 2022
039b3aa
Update envoy xds 368650f7fe037a28cc2719065289ced036d67420 (2022-04-07)
sergiitk Apr 22, 2022
ee97739
Recreate xds AggregatedDiscoveryServiceGrpc with syncGeneratedSources
sergiitk Apr 22, 2022
2aeb66d
Fix ConfigSource.path deprecation
sergiitk Apr 22, 2022
b18caf3
Suppress CertificateValidationContext.match_subject_alt_names depreca…
sergiitk Apr 22, 2022
7e2a918
Update envoy xds 5d74719102f461bc57e85acdda706e0a8df9b12d (2022-04-08)
sergiitk Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...ed/main/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down Expand Up @@ -131,7 +131,7 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down Expand Up @@ -180,7 +180,7 @@ public io.grpc.stub.StreamObserver<io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequ

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down Expand Up @@ -222,7 +222,7 @@ public io.grpc.stub.StreamObserver<io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequ

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand All @@ -245,7 +245,7 @@ protected AggregatedDiscoveryServiceBlockingStub build(

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down
10 changes: 5 additions & 5 deletions ...ed/main/grpc/io/envoyproxy/envoy/service/discovery/v3/AggregatedDiscoveryServiceGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down Expand Up @@ -131,7 +131,7 @@ public AggregatedDiscoveryServiceFutureStub newStub(io.grpc.Channel channel, io.

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down Expand Up @@ -180,7 +180,7 @@ public io.grpc.stub.StreamObserver<io.envoyproxy.envoy.service.discovery.v3.Delt

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down Expand Up @@ -222,7 +222,7 @@ public io.grpc.stub.StreamObserver<io.envoyproxy.envoy.service.discovery.v3.Delt

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand All @@ -245,7 +245,7 @@ protected AggregatedDiscoveryServiceBlockingStub build(

/**
* <pre>
* See https://github.com/lyft/envoy-api#apis for a description of the role of
* See https://github.com/envoyproxy/envoy-api#apis for a description of the role of
* ADS and how it is intended to be used by a management server. ADS requests
* have the same structure as their singleton xDS counterparts, but can
* multiplex many resource types on a single stream. The type_url in the
Expand Down
6 changes: 4 additions & 2 deletions xds/src/test/java/io/grpc/xds/ClientXdsClientDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import io.envoyproxy.envoy.config.core.v3.DataSource;
import io.envoyproxy.envoy.config.core.v3.HttpProtocolOptions;
import io.envoyproxy.envoy.config.core.v3.Locality;
import io.envoyproxy.envoy.config.core.v3.PathConfigSource;
import io.envoyproxy.envoy.config.core.v3.RuntimeFractionalPercent;
import io.envoyproxy.envoy.config.core.v3.SelfConfigSource;
import io.envoyproxy.envoy.config.core.v3.SocketAddress;
Expand Down Expand Up @@ -1616,7 +1617,8 @@ public void parseHttpConnectionManager_validateRdsConfigSource() throws Exceptio
.setRds(Rds.newBuilder()
.setRouteConfigName("rds-config-foo")
.setConfigSource(
ConfigSource.newBuilder().setPath("foo-path")))
ConfigSource.newBuilder()
.setPathConfigSource(PathConfigSource.newBuilder().setPath("foo-path"))))
.build();
thrown.expect(ResourceInvalidException.class);
thrown.expectMessage(
Expand Down Expand Up @@ -1822,7 +1824,7 @@ public void parseCluster_validateEdsSourceConfig() throws ResourceInvalidExcepti
EdsClusterConfig.newBuilder()
.setEdsConfig(
ConfigSource.newBuilder()
.setPath("foo-path"))
.setPathConfigSource(PathConfigSource.newBuilder().setPath("foo-path")))
.setServiceName("service-foo.googleapis.com"))
.setLbPolicy(LbPolicy.ROUND_ROBIN)
.build();
Expand Down
1 change: 1 addition & 0 deletions ...test/java/io/grpc/xds/internal/certprovider/CertProviderServerSslContextProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public void testProviderForServer_mtls_newXds() throws Exception {
new CertificateProvider.DistributorWatcher[1];
TestCertificateProvider.createAndRegisterProviderProvider(
certificateProviderRegistry, watcherCaptor, "testca", 0);
@SuppressWarnings("deprecation")
CertificateValidationContext staticCertValidationContext =
CertificateValidationContext.newBuilder().addAllMatchSubjectAltNames(Arrays
.asList(StringMatcher.newBuilder().setExact("foo.com").build(),
Expand Down
3 changes: 3 additions & 0 deletions xds/src/test/java/io/grpc/xds/internal/sds/ClientSslContextProviderFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ public void createCertProviderClientSslContextProvider_withStaticContext()
final CertificateProvider.DistributorWatcher[] watcherCaptor =
new CertificateProvider.DistributorWatcher[1];
createAndRegisterProviderProvider(certificateProviderRegistry, watcherCaptor, "testca", 0);
@SuppressWarnings("deprecation")
CertificateValidationContext staticCertValidationContext =
CertificateValidationContext.newBuilder()
.addAllMatchSubjectAltNames(
Expand Down Expand Up @@ -216,6 +217,7 @@ public void createNewCertProviderClientSslContextProvider_withSans() {
createAndRegisterProviderProvider(
certificateProviderRegistry, watcherCaptor, "file_watcher", 1);

@SuppressWarnings("deprecation")
CertificateValidationContext staticCertValidationContext =
CertificateValidationContext.newBuilder()
.addAllMatchSubjectAltNames(
Expand Down Expand Up @@ -248,6 +250,7 @@ public void createNewCertProviderClientSslContextProvider_onlyRootCert() {
final CertificateProvider.DistributorWatcher[] watcherCaptor =
new CertificateProvider.DistributorWatcher[1];
createAndRegisterProviderProvider(certificateProviderRegistry, watcherCaptor, "testca", 0);
@SuppressWarnings("deprecation")
CertificateValidationContext staticCertValidationContext =
CertificateValidationContext.newBuilder()
.addAllMatchSubjectAltNames(
Expand Down
2 changes: 2 additions & 0 deletions xds/src/test/java/io/grpc/xds/internal/sds/ServerSslContextProviderFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public void createCertProviderServerSslContextProvider_withStaticContext()
final CertificateProvider.DistributorWatcher[] watcherCaptor =
new CertificateProvider.DistributorWatcher[1];
createAndRegisterProviderProvider(certificateProviderRegistry, watcherCaptor, "testca", 0);
@SuppressWarnings("deprecation")
CertificateValidationContext staticCertValidationContext =
CertificateValidationContext.newBuilder()
.addAllMatchSubjectAltNames(
Expand Down Expand Up @@ -215,6 +216,7 @@ public void createNewCertProviderServerSslContextProvider_withSans()
createAndRegisterProviderProvider(certificateProviderRegistry, watcherCaptor, "testca", 0);
createAndRegisterProviderProvider(
certificateProviderRegistry, watcherCaptor, "file_watcher", 1);
@SuppressWarnings("deprecation")
CertificateValidationContext staticCertValidationContext =
CertificateValidationContext.newBuilder()
.addAllMatchSubjectAltNames(
Expand Down
4 changes: 3 additions & 1 deletion xds/src/test/java/io/grpc/xds/internal/sds/trust/SdsTrustManagerFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ private static final CertificateValidationContext buildStaticValidationContext(
String... verifySans) {
CertificateValidationContext.Builder builder = CertificateValidationContext.newBuilder();
for (String san : verifySans) {
builder.addMatchSubjectAltNames(StringMatcher.newBuilder().setExact(san));
@SuppressWarnings("deprecation")
CertificateValidationContext.Builder unused =
builder.addMatchSubjectAltNames(StringMatcher.newBuilder().setExact(san));
}
return builder.build();
}
Expand Down
Loading