minimal impl

Author: jrhee17

it/xds-client/src/test/java/com/linecorp/armeria/xds/it/CredentialInjectorFilterTest.java

@@ -21,7 +21,7 @@
 
 import com.linecorp.armeria.client.HttpPreprocessor;
 import com.linecorp.armeria.common.annotation.Nullable;
-import com.linecorp.armeria.xds.XdsResourceValidator;
+import com.linecorp.armeria.xds.filter.FactoryContext;
 import com.linecorp.armeria.xds.filter.HttpFilterFactory;
 import com.linecorp.armeria.xds.filter.XdsHttpFilter;
 import com.linecorp.armeria.xds.internal.XdsCommonUtil;
@@ -40,7 +40,7 @@ public final class IstioFilterFactories {
     public abstract static class Base implements HttpFilterFactory {
         @Override
         @Nullable
-        public XdsHttpFilter create(HttpFilter httpFilter, Any config, XdsResourceValidator validator) {
+        public XdsHttpFilter create(HttpFilter httpFilter, Any config, FactoryContext context) {
             return null;
         }
     }
@@ -62,7 +62,7 @@ public String name() {
         }
 
         @Override
-        public XdsHttpFilter create(HttpFilter httpFilter, Any config, XdsResourceValidator validator) {
+        public XdsHttpFilter create(HttpFilter httpFilter, Any config, FactoryContext context) {
             // we need to also generate istio proto configs to actually dynamically decide alpn
             // based on filter config, but for testing purposes we just assume h2 is always used
             return ALPN_FILTER;

it/xds-istio/src/test/java/com/linecorp/armeria/it/xds/filter/IstioFilterFactories.java

@@ -4,6 +4,7 @@ package envoy.config.core.v3;
 
 import "google/protobuf/any.proto";
 
+import "armeria/xds/supported.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
@@ -20,6 +21,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 message TypedExtensionConfig {
   // The name of an extension. This is not used to select the extension, instead
   // it serves the role of an opaque identifier.
+  option (armeria.xds.supported.field) = 1;
   string name = 1 [(validate.rules).string = {min_len: 1}];
 
   // The typed config for the extension. The type URL will be used to identify
@@ -28,5 +30,6 @@ message TypedExtensionConfig {
   // URL of ``TypedStruct`` will be utilized. See the
   // :ref:`extension configuration overview
   // <config_overview_extension_configuration>` for further details.
+  option (armeria.xds.supported.field) = 2;
   google.protobuf.Any typed_config = 2 [(validate.rules).any = {required: true}];
 }

xds-api/src/main/proto/envoy/config/core/v3/extension.proto

@@ -4,6 +4,7 @@ package envoy.extensions.filters.http.credential_injector.v3;
 
 import "envoy/config/core/v3/extension.proto";
 
+import "armeria/xds/supported.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
@@ -71,6 +72,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 message CredentialInjector {
   // Whether to overwrite the value or not if the injected headers already exist.
   // Value defaults to false.
+  option (armeria.xds.supported.field) = 1;
   bool overwrite = 1;
 
   // Whether to send the request to upstream if the credential is not present or if the credential injection
@@ -79,9 +81,11 @@ message CredentialInjector {
   // By default, a request will fail with ``401 Unauthorized`` if the
   // credential is not present or the injection of the credential to the request fails.
   // If set to true, the request will be sent to upstream without the credential.
+  option (armeria.xds.supported.field) = 2;
   bool allow_request_without_credential = 2;
 
   // The credential to inject into the proxied requests
   // [#extension-category: envoy.http.injected_credentials]
+  option (armeria.xds.supported.field) = 3;
   config.core.v3.TypedExtensionConfig credential = 3 [(validate.rules).message = {required: true}];
 }

xds-api/src/main/proto/envoy/extensions/filters/http/credential_injector/v3/credential_injector.proto

@@ -4,6 +4,7 @@ package envoy.extensions.http.injected_credentials.generic.v3;
 
 import "envoy/extensions/transport_sockets/tls/v3/secret.proto";
 
+import "armeria/xds/supported.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
@@ -24,11 +25,13 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 message Generic {
   // The SDS configuration for the credential that will be injected to the specified HTTP request header.
   // It must be a generic secret.
+  option (armeria.xds.supported.field) = 1;
   transport_sockets.tls.v3.SdsSecretConfig credential = 1
       [(validate.rules).message = {required: true}];
 
   // The header that will be injected to the HTTP request with the provided credential.
   // If not set, filter will default to: ``Authorization``
+  option (armeria.xds.supported.field) = 2;
   string header = 2
       [(validate.rules).string = {well_known_regex: HTTP_HEADER_NAME ignore_empty: true}];
 }

xds-api/src/main/proto/envoy/extensions/http/injected_credentials/generic/v3/generic.proto

@@ -26,6 +26,7 @@ message GenericSecret {
 
   // Secret of generic type and is available to filters. It is expected
   // that only only one of secret and secrets is set.
+  option (armeria.xds.supported.field) = 1;
   config.core.v3.DataSource secret = 1 [(udpa.annotations.sensitive) = true];
 
   // For cases where multiple associated secrets need to be distributed together. It is expected
@@ -63,6 +64,7 @@ message Secret {
     option (armeria.xds.supported.oneof_field) = 4;
     CertificateValidationContext validation_context = 4;
 
+    option (armeria.xds.supported.oneof_field) = 5;
     GenericSecret generic_secret = 5;
   }
 }

xds-api/src/main/proto/envoy/extensions/transport_sockets/tls/v3/secret.proto

@@ -24,6 +24,9 @@
 
 import com.linecorp.armeria.common.util.Exceptions;
 import com.linecorp.armeria.internal.common.util.CertificateUtil;
+import com.linecorp.armeria.xds.stream.RefCountedStream;
+import com.linecorp.armeria.xds.stream.SnapshotStream;
+import com.linecorp.armeria.xds.stream.Subscription;
 
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext;
 

xds/src/main/java/com/linecorp/armeria/xds/CertificateValidationContextStream.java

@@ -18,7 +18,7 @@
 
 import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
-import com.linecorp.armeria.xds.SnapshotStream.Subscription;
+import com.linecorp.armeria.xds.stream.Subscription;
 
 import io.envoyproxy.envoy.config.cluster.v3.Cluster;
 

xds/src/main/java/com/linecorp/armeria/xds/ClusterRoot.java

@@ -27,6 +27,9 @@
 import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.xds.client.endpoint.XdsLoadBalancer;
 import com.linecorp.armeria.xds.client.endpoint.XdsLoadBalancerFactory;
+import com.linecorp.armeria.xds.stream.RefCountedStream;
+import com.linecorp.armeria.xds.stream.SnapshotStream;
+import com.linecorp.armeria.xds.stream.Subscription;
 
 import io.envoyproxy.envoy.config.cluster.v3.Cluster;
 import io.envoyproxy.envoy.config.cluster.v3.Cluster.EdsClusterConfig;

xds/src/main/java/com/linecorp/armeria/xds/ClusterStream.java

@@ -30,6 +30,9 @@
 import com.linecorp.armeria.common.Cancellable;
 import com.linecorp.armeria.common.CommonPools;
 import com.linecorp.armeria.common.file.PathWatcher;
+import com.linecorp.armeria.xds.stream.RefCountedStream;
+import com.linecorp.armeria.xds.stream.SnapshotStream;
+import com.linecorp.armeria.xds.stream.Subscription;
 
 import io.envoyproxy.envoy.config.core.v3.DataSource;
 import io.envoyproxy.envoy.config.core.v3.DataSource.SpecifierCase;