mirror of
https://github.com/google/nomulus.git
synced 2025-04-29 19:47:51 +02:00
Add routing for ReadDnsRefreshRequestsAction (#1990)
It looks like we forgot this crucial part to actually add the necessary routing the new action... Also fixes a linter warning.
This commit is contained in:
parent
ae1c829b46
commit
dcc7e65813
6 changed files with 27 additions and 6 deletions
|
@ -19,6 +19,7 @@ import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME;
|
||||||
import static google.registry.dns.RefreshDnsOnHostRenameAction.PARAM_HOST_KEY;
|
import static google.registry.dns.RefreshDnsOnHostRenameAction.PARAM_HOST_KEY;
|
||||||
import static google.registry.request.RequestParameters.extractEnumParameter;
|
import static google.registry.request.RequestParameters.extractEnumParameter;
|
||||||
import static google.registry.request.RequestParameters.extractIntParameter;
|
import static google.registry.request.RequestParameters.extractIntParameter;
|
||||||
|
import static google.registry.request.RequestParameters.extractOptionalIntParameter;
|
||||||
import static google.registry.request.RequestParameters.extractOptionalParameter;
|
import static google.registry.request.RequestParameters.extractOptionalParameter;
|
||||||
import static google.registry.request.RequestParameters.extractRequiredParameter;
|
import static google.registry.request.RequestParameters.extractRequiredParameter;
|
||||||
import static google.registry.request.RequestParameters.extractSetOfParameters;
|
import static google.registry.request.RequestParameters.extractSetOfParameters;
|
||||||
|
@ -34,6 +35,7 @@ import google.registry.dns.DnsConstants.TargetType;
|
||||||
import google.registry.dns.writer.DnsWriterZone;
|
import google.registry.dns.writer.DnsWriterZone;
|
||||||
import google.registry.request.Parameter;
|
import google.registry.request.Parameter;
|
||||||
import google.registry.request.RequestParameters;
|
import google.registry.request.RequestParameters;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
@ -50,6 +52,9 @@ public abstract class DnsModule {
|
||||||
public static final String PARAM_HOSTS = "hosts";
|
public static final String PARAM_HOSTS = "hosts";
|
||||||
public static final String PARAM_PUBLISH_TASK_ENQUEUED = "enqueued";
|
public static final String PARAM_PUBLISH_TASK_ENQUEUED = "enqueued";
|
||||||
public static final String PARAM_REFRESH_REQUEST_TIME = "requestTime";
|
public static final String PARAM_REFRESH_REQUEST_TIME = "requestTime";
|
||||||
|
// This parameter cannot be named "jitterSeconds", which will be read by TldFanoutAction and not
|
||||||
|
// be passed down to actions.
|
||||||
|
public static final String PARAM_DNS_JITTER_SECONDS = "dnsJitterSeconds";
|
||||||
|
|
||||||
@Binds
|
@Binds
|
||||||
@DnsWriterZone
|
@DnsWriterZone
|
||||||
|
@ -129,6 +134,12 @@ public abstract class DnsModule {
|
||||||
return extractRequiredParameter(req, PARAM_HOST_KEY);
|
return extractRequiredParameter(req, PARAM_HOST_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Provides
|
||||||
|
@Parameter(PARAM_DNS_JITTER_SECONDS)
|
||||||
|
static Optional<Integer> provideJitterSeconds(HttpServletRequest req) {
|
||||||
|
return extractOptionalIntParameter(req, PARAM_DNS_JITTER_SECONDS);
|
||||||
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@Parameter("domainOrHostName")
|
@Parameter("domainOrHostName")
|
||||||
static String provideName(HttpServletRequest req) {
|
static String provideName(HttpServletRequest req) {
|
||||||
|
|
|
@ -16,6 +16,7 @@ package google.registry.dns;
|
||||||
|
|
||||||
import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
|
import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
|
||||||
import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
|
import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
|
||||||
|
import static google.registry.dns.DnsModule.PARAM_DNS_JITTER_SECONDS;
|
||||||
import static google.registry.dns.DnsModule.PARAM_DNS_WRITER;
|
import static google.registry.dns.DnsModule.PARAM_DNS_WRITER;
|
||||||
import static google.registry.dns.DnsModule.PARAM_DOMAINS;
|
import static google.registry.dns.DnsModule.PARAM_DOMAINS;
|
||||||
import static google.registry.dns.DnsModule.PARAM_HOSTS;
|
import static google.registry.dns.DnsModule.PARAM_HOSTS;
|
||||||
|
@ -23,6 +24,7 @@ import static google.registry.dns.DnsModule.PARAM_LOCK_INDEX;
|
||||||
import static google.registry.dns.DnsModule.PARAM_NUM_PUBLISH_LOCKS;
|
import static google.registry.dns.DnsModule.PARAM_NUM_PUBLISH_LOCKS;
|
||||||
import static google.registry.dns.DnsModule.PARAM_PUBLISH_TASK_ENQUEUED;
|
import static google.registry.dns.DnsModule.PARAM_PUBLISH_TASK_ENQUEUED;
|
||||||
import static google.registry.dns.DnsModule.PARAM_REFRESH_REQUEST_TIME;
|
import static google.registry.dns.DnsModule.PARAM_REFRESH_REQUEST_TIME;
|
||||||
|
import static google.registry.request.Action.Method.POST;
|
||||||
import static google.registry.request.RequestParameters.PARAM_TLD;
|
import static google.registry.request.RequestParameters.PARAM_TLD;
|
||||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||||
import static google.registry.util.DomainNameUtils.getSecondLevelDomain;
|
import static google.registry.util.DomainNameUtils.getSecondLevelDomain;
|
||||||
|
@ -59,12 +61,10 @@ import org.joda.time.Duration;
|
||||||
service = Service.BACKEND,
|
service = Service.BACKEND,
|
||||||
path = "/_dr/task/readDnsRefreshRequests",
|
path = "/_dr/task/readDnsRefreshRequests",
|
||||||
automaticallyPrintOk = true,
|
automaticallyPrintOk = true,
|
||||||
|
method = POST,
|
||||||
auth = Auth.AUTH_INTERNAL_OR_ADMIN)
|
auth = Auth.AUTH_INTERNAL_OR_ADMIN)
|
||||||
public final class ReadDnsRefreshRequestsAction implements Runnable {
|
public final class ReadDnsRefreshRequestsAction implements Runnable {
|
||||||
|
|
||||||
// This parameter cannot be named "jitterSeconds", which will be read by TldFanoutAction and not
|
|
||||||
// be passed to this action.
|
|
||||||
private static final String PARAM_JITTER_SECONDS = "dnsJitterSeconds";
|
|
||||||
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
|
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
|
||||||
|
|
||||||
private final int tldUpdateBatchSize;
|
private final int tldUpdateBatchSize;
|
||||||
|
@ -80,7 +80,7 @@ public final class ReadDnsRefreshRequestsAction implements Runnable {
|
||||||
ReadDnsRefreshRequestsAction(
|
ReadDnsRefreshRequestsAction(
|
||||||
@Config("dnsTldUpdateBatchSize") int tldUpdateBatchSize,
|
@Config("dnsTldUpdateBatchSize") int tldUpdateBatchSize,
|
||||||
@Config("readDnsRefreshRequestsActionRuntime") Duration requestedMaximumDuration,
|
@Config("readDnsRefreshRequestsActionRuntime") Duration requestedMaximumDuration,
|
||||||
@Parameter(PARAM_JITTER_SECONDS) Optional<Integer> jitterSeconds,
|
@Parameter(PARAM_DNS_JITTER_SECONDS) Optional<Integer> jitterSeconds,
|
||||||
@Parameter(PARAM_TLD) String tld,
|
@Parameter(PARAM_TLD) String tld,
|
||||||
Clock clock,
|
Clock clock,
|
||||||
DnsUtils dnsUtils,
|
DnsUtils dnsUtils,
|
||||||
|
|
|
@ -157,6 +157,12 @@
|
||||||
<url-pattern>/_dr/cron/readDnsQueue</url-pattern>
|
<url-pattern>/_dr/cron/readDnsQueue</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
|
<!-- Reads the DNS refresh requests and kick off the appropriate tasks to update zone. -->
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>backend-servlet</servlet-name>
|
||||||
|
<url-pattern>/_dr/task/readDnsRefreshRequests</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
|
||||||
<!-- Publishes DNS updates. -->
|
<!-- Publishes DNS updates. -->
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>backend-servlet</servlet-name>
|
<servlet-name>backend-servlet</servlet-name>
|
||||||
|
|
|
@ -33,6 +33,7 @@ import google.registry.cron.TldFanoutAction;
|
||||||
import google.registry.dns.DnsModule;
|
import google.registry.dns.DnsModule;
|
||||||
import google.registry.dns.PublishDnsUpdatesAction;
|
import google.registry.dns.PublishDnsUpdatesAction;
|
||||||
import google.registry.dns.ReadDnsQueueAction;
|
import google.registry.dns.ReadDnsQueueAction;
|
||||||
|
import google.registry.dns.ReadDnsRefreshRequestsAction;
|
||||||
import google.registry.dns.RefreshDnsAction;
|
import google.registry.dns.RefreshDnsAction;
|
||||||
import google.registry.dns.RefreshDnsOnHostRenameAction;
|
import google.registry.dns.RefreshDnsOnHostRenameAction;
|
||||||
import google.registry.dns.writer.VoidDnsWriterModule;
|
import google.registry.dns.writer.VoidDnsWriterModule;
|
||||||
|
@ -144,6 +145,8 @@ interface BackendRequestComponent {
|
||||||
|
|
||||||
ReadDnsQueueAction readDnsQueueAction();
|
ReadDnsQueueAction readDnsQueueAction();
|
||||||
|
|
||||||
|
ReadDnsRefreshRequestsAction readDnsRefreshRequestsAction();
|
||||||
|
|
||||||
RdeReportAction rdeReportAction();
|
RdeReportAction rdeReportAction();
|
||||||
|
|
||||||
RdeStagingAction rdeStagingAction();
|
RdeStagingAction rdeStagingAction();
|
||||||
|
|
|
@ -441,7 +441,7 @@ public class DomainPricingLogicTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void
|
void
|
||||||
testGetDomainRenewPrice_oneYear_premiumDomain_anchorTenant__withToken_isDiscountedNonPremiumPrice()
|
testGetDomainRenewPrice_oneYear_premiumDomain_anchorTenant_withToken_isDiscountedNonPremiumPrice()
|
||||||
throws EppException {
|
throws EppException {
|
||||||
AllocationToken allocationToken =
|
AllocationToken allocationToken =
|
||||||
persistResource(
|
persistResource(
|
||||||
|
@ -488,7 +488,7 @@ public class DomainPricingLogicTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void
|
void
|
||||||
testGetDomainRenewPrice_multiYear_premiumDomain_anchorTenant__withToken_isDiscountedNonPremiumPrice()
|
testGetDomainRenewPrice_multiYear_premiumDomain_anchorTenant_withToken_isDiscountedNonPremiumPrice()
|
||||||
throws EppException {
|
throws EppException {
|
||||||
AllocationToken allocationToken =
|
AllocationToken allocationToken =
|
||||||
persistResource(
|
persistResource(
|
||||||
|
|
|
@ -24,6 +24,7 @@ PATH CLASS
|
||||||
/_dr/task/rdeReport RdeReportAction POST n INTERNAL,API APP ADMIN
|
/_dr/task/rdeReport RdeReportAction POST n INTERNAL,API APP ADMIN
|
||||||
/_dr/task/rdeStaging RdeStagingAction GET,POST n INTERNAL,API APP ADMIN
|
/_dr/task/rdeStaging RdeStagingAction GET,POST n INTERNAL,API APP ADMIN
|
||||||
/_dr/task/rdeUpload RdeUploadAction POST n INTERNAL,API APP ADMIN
|
/_dr/task/rdeUpload RdeUploadAction POST n INTERNAL,API APP ADMIN
|
||||||
|
/_dr/task/readDnsRefreshRequests ReadDnsRefreshRequestsAction POST y INTERNAL,API APP ADMIN
|
||||||
/_dr/task/refreshDnsOnHostRename RefreshDnsOnHostRenameAction POST n INTERNAL,API APP ADMIN
|
/_dr/task/refreshDnsOnHostRename RefreshDnsOnHostRenameAction POST n INTERNAL,API APP ADMIN
|
||||||
/_dr/task/relockDomain RelockDomainAction POST y INTERNAL,API APP ADMIN
|
/_dr/task/relockDomain RelockDomainAction POST y INTERNAL,API APP ADMIN
|
||||||
/_dr/task/resaveAllEppResourcesPipeline ResaveAllEppResourcesPipelineAction GET n INTERNAL,API APP ADMIN
|
/_dr/task/resaveAllEppResourcesPipeline ResaveAllEppResourcesPipelineAction GET n INTERNAL,API APP ADMIN
|
||||||
|
|
Loading…
Add table
Reference in a new issue