Skip to content

Commit cd72421

Browse files
kannanjgithubkannanjgithub
committed
xds: Rename FilterContext to FilterConfigParseContext
TAG=agy
1 parent ca05e90 commit cd72421

14 files changed

Lines changed: 55 additions & 29 deletions

‎xds/src/main/java/io/grpc/xds/ExternalProcessorFilter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.base.Preconditions.checkNotNull;
2022

2123
import com.google.common.base.Joiner;
@@ -140,7 +142,7 @@ public ExternalProcessorFilter newInstance(String name) {
140142

141143
@Override
142144
public ConfigOrError<ExternalProcessorFilterConfig> parseFilterConfig(
143-
Message rawProtoMessage, FilterContext context) {
145+
Message rawProtoMessage, FilterConfigParseContext context) {
144146
if (!(rawProtoMessage instanceof Any)) {
145147
return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
146148
}
@@ -156,7 +158,7 @@ public ConfigOrError<ExternalProcessorFilterConfig> parseFilterConfig(
156158

157159
@Override
158160
public ConfigOrError<ExternalProcessorFilterOverrideConfig> parseFilterConfigOverride(
159-
Message rawProtoMessage, FilterContext context) {
161+
Message rawProtoMessage, FilterConfigParseContext context) {
160162
if (!(rawProtoMessage instanceof Any)) {
161163
return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
162164
}

‎xds/src/main/java/io/grpc/xds/FaultFilter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.base.Preconditions.checkNotNull;
2022
import static java.util.concurrent.TimeUnit.NANOSECONDS;
2123

@@ -105,7 +107,7 @@ public FaultFilter newInstance(String name) {
105107

106108
@Override
107109
public ConfigOrError<FaultConfig> parseFilterConfig(
108-
Message rawProtoMessage, FilterContext context) {
110+
Message rawProtoMessage, FilterConfigParseContext context) {
109111
HTTPFault httpFaultProto;
110112
if (!(rawProtoMessage instanceof Any)) {
111113
return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
@@ -121,7 +123,7 @@ public ConfigOrError<FaultConfig> parseFilterConfig(
121123

122124
@Override
123125
public ConfigOrError<FaultConfig> parseFilterConfigOverride(
124-
Message rawProtoMessage, FilterContext context) {
126+
Message rawProtoMessage, FilterConfigParseContext context) {
125127
return parseFilterConfig(rawProtoMessage, context);
126128
}
127129

‎xds/src/main/java/io/grpc/xds/Filter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ default boolean isServerFilter() {
9898
* com.google.protobuf.Any} or a {@link com.google.protobuf.Struct}.
9999
*/
100100
ConfigOrError<? extends FilterConfig> parseFilterConfig(
101-
Message rawProtoMessage, FilterContext context);
101+
Message rawProtoMessage, FilterConfigParseContext context);
102102

103103
/**
104104
* Parses the per-filter override filter config from raw proto message. The message may be
105105
* either a {@link com.google.protobuf.Any} or a {@link com.google.protobuf.Struct}.
106106
*/
107107
ConfigOrError<? extends FilterConfig> parseFilterConfigOverride(
108-
Message rawProtoMessage, FilterContext context);
108+
Message rawProtoMessage, FilterConfigParseContext context);
109109
}
110110

111111
/** Uses the FilterConfigs produced above to produce an HTTP filter interceptor for clients. */
@@ -133,13 +133,13 @@ default void close() {}
133133

134134
/** Context carrying dynamic metadata for a filter. */
135135
@AutoValue
136-
abstract static class FilterContext {
136+
abstract static class FilterConfigParseContext {
137137
abstract BootstrapInfo bootstrapInfo();
138138

139139
abstract ServerInfo serverInfo();
140140

141141
static Builder builder() {
142-
return new AutoValue_Filter_FilterContext.Builder();
142+
return new AutoValue_Filter_FilterConfigParseContext.Builder();
143143
}
144144

145145
@AutoValue.Builder
@@ -148,7 +148,7 @@ abstract static class Builder {
148148

149149
abstract Builder serverInfo(ServerInfo info);
150150

151-
abstract FilterContext build();
151+
abstract FilterConfigParseContext build();
152152
}
153153
}
154154

‎xds/src/main/java/io/grpc/xds/GcpAuthenticationFilter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.base.Preconditions.checkNotNull;
2022
import static io.grpc.xds.XdsNameResolver.CLUSTER_SELECTION_KEY;
2123
import static io.grpc.xds.XdsNameResolver.XDS_CONFIG_CALL_OPTION_KEY;
@@ -87,7 +89,7 @@ public GcpAuthenticationFilter newInstance(String name) {
8789

8890
@Override
8991
public ConfigOrError<GcpAuthenticationConfig> parseFilterConfig(
90-
Message rawProtoMessage, FilterContext context) {
92+
Message rawProtoMessage, FilterConfigParseContext context) {
9193
GcpAuthnFilterConfig gcpAuthnProto;
9294
if (!(rawProtoMessage instanceof Any)) {
9395
return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
@@ -122,7 +124,7 @@ public ConfigOrError<GcpAuthenticationConfig> parseFilterConfig(
122124

123125
@Override
124126
public ConfigOrError<GcpAuthenticationConfig> parseFilterConfigOverride(
125-
Message rawProtoMessage, FilterContext context) {
127+
Message rawProtoMessage, FilterConfigParseContext context) {
126128
return parseFilterConfig(rawProtoMessage, context);
127129
}
128130
}

‎xds/src/main/java/io/grpc/xds/RbacFilter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.base.Preconditions.checkNotNull;
2022

2123
import com.google.protobuf.Any;
@@ -95,7 +97,7 @@ public RbacFilter newInstance(String name) {
9597

9698
@Override
9799
public ConfigOrError<RbacConfig> parseFilterConfig(
98-
Message rawProtoMessage, FilterContext context) {
100+
Message rawProtoMessage, FilterConfigParseContext context) {
99101
RBAC rbacProto;
100102
if (!(rawProtoMessage instanceof Any)) {
101103
return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());
@@ -111,7 +113,7 @@ public ConfigOrError<RbacConfig> parseFilterConfig(
111113

112114
@Override
113115
public ConfigOrError<RbacConfig> parseFilterConfigOverride(
114-
Message rawProtoMessage, FilterContext context) {
116+
Message rawProtoMessage, FilterConfigParseContext context) {
115117
RBACPerRoute rbacPerRoute;
116118
if (!(rawProtoMessage instanceof Any)) {
117119
return ConfigOrError.fromError("Invalid config type: " + rawProtoMessage.getClass());

‎xds/src/main/java/io/grpc/xds/RouterFilter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import com.google.protobuf.Message;
2022

2123
/**
@@ -62,13 +64,13 @@ public RouterFilter newInstance(String name) {
6264

6365
@Override
6466
public ConfigOrError<? extends FilterConfig> parseFilterConfig(
65-
Message rawProtoMessage, FilterContext context) {
67+
Message rawProtoMessage, FilterConfigParseContext context) {
6668
return ConfigOrError.fromConfig(ROUTER_CONFIG);
6769
}
6870

6971
@Override
7072
public ConfigOrError<? extends FilterConfig> parseFilterConfigOverride(
71-
Message rawProtoMessage, FilterContext context) {
73+
Message rawProtoMessage, FilterConfigParseContext context) {
7274
return ConfigOrError.fromError("Router Filter should not have override config");
7375
}
7476
}

‎xds/src/main/java/io/grpc/xds/XdsListenerResource.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.base.Preconditions.checkNotNull;
2022
import static io.grpc.xds.XdsClusterResource.validateCommonTlsContext;
2123
import static io.grpc.xds.XdsRouteConfigureResource.extractVirtualHosts;
@@ -618,7 +620,7 @@ static StructOrError<Filter.FilterConfig> parseHttpFilter(
618620
isForClient ? "client" : "server"));
619621
}
620622

621-
Filter.FilterContext filterContext = Filter.FilterContext.builder()
623+
FilterConfigParseContext filterContext = FilterConfigParseContext.builder()
622624
.bootstrapInfo(args.getBootstrapInfo())
623625
.serverInfo(args.getServerInfo())
624626
.build();

‎xds/src/main/java/io/grpc/xds/XdsRouteConfigureResource.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.base.Preconditions.checkNotNull;
2022

2123
import com.github.udpa.udpa.type.v1.TypedStruct;
@@ -212,7 +214,7 @@ private static StructOrError<VirtualHost> parseVirtualHost(
212214
static StructOrError<Map<String, FilterConfig>> parseOverrideFilterConfigs(
213215
Map<String, Any> rawFilterConfigMap, FilterRegistry filterRegistry,
214216
XdsResourceType.Args args) {
215-
Filter.FilterContext context = Filter.FilterContext.builder()
217+
FilterConfigParseContext context = FilterConfigParseContext.builder()
216218
.bootstrapInfo(args.getBootstrapInfo())
217219
.serverInfo(args.getServerInfo())
218220
.build();

‎xds/src/test/java/io/grpc/xds/ExternalProcessorFilterTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.truth.Truth.assertThat;
2022

2123
import com.google.common.util.concurrent.MoreExecutors;
@@ -114,7 +116,7 @@ public class ExternalProcessorFilterTest {
114116
private final FakeClock fakeClock = new FakeClock();
115117
private ScheduledExecutorService scheduler;
116118
private ExternalProcessorFilter.Provider provider;
117-
private Filter.FilterContext filterContext;
119+
private FilterConfigParseContext filterContext;
118120
private Bootstrapper.BootstrapInfo bootstrapInfo;
119121
private Bootstrapper.ServerInfo serverInfo;
120122

@@ -232,7 +234,7 @@ public void setUp() throws Exception {
232234
Bootstrapper.ServerInfo.create(
233235
"test_target", Collections.emptyMap(), false, true, false, false);
234236

235-
filterContext = Filter.FilterContext.builder()
237+
filterContext = FilterConfigParseContext.builder()
236238
.bootstrapInfo(bootstrapInfo)
237239
.serverInfo(serverInfo)
238240
.build();

‎xds/src/test/java/io/grpc/xds/FaultFilterTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package io.grpc.xds;
1818

19+
import io.grpc.xds.Filter.FilterConfigParseContext;
20+
1921
import static com.google.common.truth.Truth.assertThat;
2022

2123
import com.google.protobuf.Any;
@@ -105,8 +107,8 @@ public void parseFaultAbort_withGrpcStatus() {
105107
assertThat(faultAbort.status().getCode()).isEqualTo(Code.DEADLINE_EXCEEDED);
106108
}
107109

108-
private static Filter.FilterContext getFilterContext() {
109-
return Filter.FilterContext.builder()
110+
private static FilterConfigParseContext getFilterContext() {
111+
return FilterConfigParseContext.builder()
110112
.bootstrapInfo(BootstrapInfo.builder()
111113
.servers(Collections.singletonList(
112114
ServerInfo.create(

0 commit comments

Comments
 (0)