diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java index bfb2f8754..a050583fb 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java @@ -32,7 +32,6 @@ import org.whispersystems.textsecuregcm.configuration.DeviceCheckConfiguration; import org.whispersystems.textsecuregcm.configuration.DirectoryV2Configuration; import org.whispersystems.textsecuregcm.configuration.DynamoDbClientFactory; import org.whispersystems.textsecuregcm.configuration.DynamoDbTables; -import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicGrpcAllowListConfiguration; import org.whispersystems.textsecuregcm.configuration.ExternalRequestFilterConfiguration; import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClientFactory; import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClusterFactory; @@ -355,11 +354,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private GrpcConfiguration grpc; - @NotNull - @Valid - @JsonProperty - private DynamicGrpcAllowListConfiguration grpcAllowList = new DynamicGrpcAllowListConfiguration(); - @Valid @NotNull @JsonProperty @@ -605,10 +599,6 @@ public class WhisperServerConfiguration extends Configuration { return grpc; } - public DynamicGrpcAllowListConfiguration getGrpcAllowList() { - return grpcAllowList; - } - public S3ObjectMonitorFactory getAsnTableConfiguration() { return asnTable; } diff --git a/service/src/test/resources/config/test.yml b/service/src/test/resources/config/test.yml index 5f387f3fa..99c760c2f 100644 --- a/service/src/test/resources/config/test.yml +++ b/service/src/test/resources/config/test.yml @@ -519,9 +519,6 @@ idlePrimaryDeviceReminder: grpc: port: 50051 -grpcAllowList: - enableAll: true - asnTable: s3Region: a-region s3Bucket: a-bucket