Skip to content

Generate the Athenz xDS protos with java_multiple_files #6915

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

Open
minwoox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Generate the Athenz xDS protos with java_multiple_files #6915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions xds-api/src/main/proto/armeria/xds/athenz/athenz_access_token.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ syntax = "proto3";

package jp.co.lycorp.ftd.athenz.v1;

option java_multiple_files = true;

import "validate/validate.proto";
import "envoy/type/matcher/v3/string.proto";
import "armeria/xds/supported.proto";
Expand Down
1 change: 1 addition & 0 deletions xds-api/src/main/proto/armeria/xds/athenz/athenz_filter_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ syntax = "proto3";
package armeria.xds.athenz;

option java_package = "com.linecorp.armeria.xds.athenz";
option java_multiple_files = true;

import "validate/validate.proto";
import "armeria/xds/supported.proto";
Expand Down
4 changes: 4 additions & 0 deletions xds-api/src/main/proto/armeria/xds/supported.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ package armeria.xds;

option java_package = "com.linecorp.armeria.xds.api";
option java_outer_classname = "SupportedFieldProto";
// Intentionally NOT java_multiple_files: the only message here, `supported`, is a lowercase namespacing
// holder for the option extensions (so usage reads as `(armeria.xds.supported.field)`), not a real data
// message. Emitting it with java_multiple_files would produce a non-idiomatic top-level lowercase
// `supported` class, so keep it nested under the SupportedFieldProto outer class.

import "google/protobuf/descriptor.proto";

Expand Down
14 changes: 7 additions & 7 deletions .../main/java/com/linecorp/armeria/xds/filter/athenz/AccessTokenConstraintFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import com.linecorp.armeria.server.athenz.AccessCheckStatus;
import com.linecorp.armeria.server.athenz.AthenzAuthorizer;
import com.linecorp.armeria.server.athenz.AthenzPolicyConfig;
import com.linecorp.armeria.xds.athenz.AthenzFilterConfig.AccessTokenConstraintConfig;
import com.linecorp.armeria.xds.athenz.AccessTokenConstraintConfig;
import com.linecorp.armeria.xds.filter.FactoryContext;
import com.linecorp.armeria.xds.filter.HttpFilterFactory;
import com.linecorp.armeria.xds.filter.XdsHttpFilter;
Expand All @@ -47,12 +47,12 @@
import com.linecorp.armeria.xds.stream.Subscription;

import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.AccessTokenConstraint;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.AssertionMappingRule;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.EndpointAttribute;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.EndpointAttribute.AttributeCase;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.EndpointAttributeMatch;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.WellKnownEndpointAttribute;
import jp.co.lycorp.ftd.athenz.v1.AccessTokenConstraint;
import jp.co.lycorp.ftd.athenz.v1.AssertionMappingRule;
import jp.co.lycorp.ftd.athenz.v1.EndpointAttribute;
import jp.co.lycorp.ftd.athenz.v1.EndpointAttribute.AttributeCase;
import jp.co.lycorp.ftd.athenz.v1.EndpointAttributeMatch;
import jp.co.lycorp.ftd.athenz.v1.WellKnownEndpointAttribute;

final class AccessTokenConstraintFilterFactory implements HttpFilterFactory {

Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/com/linecorp/armeria/xds/filter/athenz/AccessTokenTargetFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
import com.linecorp.armeria.common.RpcResponse;
import com.linecorp.armeria.common.annotation.Nullable;
import com.linecorp.armeria.common.util.Exceptions;
import com.linecorp.armeria.xds.athenz.AthenzFilterConfig.AccessTokenTargetConfig;
import com.linecorp.armeria.xds.athenz.AccessTokenTargetConfig;
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.stream.SnapshotStream;

import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter;
import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.AccessTokenTarget;
import jp.co.lycorp.ftd.athenz.v1.AccessTokenTarget;

final class AccessTokenTargetFilterFactory implements HttpFilterFactory {

Expand Down
2 changes: 1 addition & 1 deletion xds-athenz/src/main/java/com/linecorp/armeria/xds/filter/athenz/MappingTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.linecorp.armeria.common.annotation.Nullable;
import com.linecorp.armeria.server.ServiceRequestContext;

import jp.co.lycorp.ftd.athenz.v1.AthenzAccessToken.MappingString;
import jp.co.lycorp.ftd.athenz.v1.MappingString;

/**
* Pre-parsed template from a {@link MappingString}.
Expand Down
Loading