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.

core/src/main/java/google/registry/dns/DnsModule.java

@@ -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.request.RequestParameters.extractEnumParameter;
 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.extractRequiredParameter;
 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.request.Parameter;
 import google.registry.request.RequestParameters;
+import java.util.Optional;
 import java.util.Set;
 import javax.inject.Named;
 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_PUBLISH_TASK_ENQUEUED = "enqueued";
   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
   @DnsWriterZone
@@ -129,6 +134,12 @@ public abstract class DnsModule {
     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
   @Parameter("domainOrHostName")
   static String provideName(HttpServletRequest req) {

core/src/main/java/google/registry/dns/ReadDnsRefreshRequestsAction.java

@@ -16,6 +16,7 @@ package google.registry.dns;
 
 import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
 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_DOMAINS;
 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_PUBLISH_TASK_ENQUEUED;
 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.util.DateTimeUtils.END_OF_TIME;
 import static google.registry.util.DomainNameUtils.getSecondLevelDomain;
@@ -59,12 +61,10 @@ import org.joda.time.Duration;
     service = Service.BACKEND,
     path = "/_dr/task/readDnsRefreshRequests",
     automaticallyPrintOk = true,
+    method = POST,
     auth = Auth.AUTH_INTERNAL_OR_ADMIN)
 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 final int tldUpdateBatchSize;
@@ -80,7 +80,7 @@ public final class ReadDnsRefreshRequestsAction implements Runnable {
   ReadDnsRefreshRequestsAction(
       @Config("dnsTldUpdateBatchSize") int tldUpdateBatchSize,
       @Config("readDnsRefreshRequestsActionRuntime") Duration requestedMaximumDuration,
-      @Parameter(PARAM_JITTER_SECONDS) Optional<Integer> jitterSeconds,
+      @Parameter(PARAM_DNS_JITTER_SECONDS) Optional<Integer> jitterSeconds,
       @Parameter(PARAM_TLD) String tld,
       Clock clock,
       DnsUtils dnsUtils,

core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml

@@ -157,6 +157,12 @@
     <url-pattern>/_dr/cron/readDnsQueue</url-pattern>
   </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. -->
   <servlet-mapping>
     <servlet-name>backend-servlet</servlet-name>

core/src/main/java/google/registry/model/tld/Registry.java

@@ -785,13 +785,13 @@ public class Registry extends ImmutableObject implements Buildable, UnsafeSerial
       return this;
     }
 
-    public Builder setDnsNsAtl(Duration dnsNsAtl) {
-      getInstance().dnsNsTtl = dnsNsAtl;
+    public Builder setDnsNsTtl(Duration dnsNsTtl) {
+      getInstance().dnsNsTtl = dnsNsTtl;
       return this;
     }
 
-    public Builder setDnsDsAtl(Duration dnsDsAtl) {
-      getInstance().dnsDsTtl = dnsDsAtl;
+    public Builder setDnsDsTtl(Duration dnsDsTtl) {
+      getInstance().dnsDsTtl = dnsDsTtl;
       return this;
     }
 

core/src/main/java/google/registry/module/backend/BackendRequestComponent.java

@@ -33,6 +33,7 @@ import google.registry.cron.TldFanoutAction;
 import google.registry.dns.DnsModule;
 import google.registry.dns.PublishDnsUpdatesAction;
 import google.registry.dns.ReadDnsQueueAction;
+import google.registry.dns.ReadDnsRefreshRequestsAction;
 import google.registry.dns.RefreshDnsAction;
 import google.registry.dns.RefreshDnsOnHostRenameAction;
 import google.registry.dns.writer.VoidDnsWriterModule;
@@ -144,6 +145,8 @@ interface BackendRequestComponent {
 
   ReadDnsQueueAction readDnsQueueAction();
 
+  ReadDnsRefreshRequestsAction readDnsRefreshRequestsAction();
+
   RdeReportAction rdeReportAction();
 
   RdeStagingAction rdeStagingAction();

core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java

@@ -237,6 +237,24 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
   )
   Integer numDnsPublishShards;
 
+  @Nullable
+  @Parameter(
+      names = {"--dns_a_plus_aaaa_ttl"},
+      description = "The time to live for DNS A and AAAA records (Ex: PT240S)")
+  Duration dnsAPlusAaaaTtl;
+
+  @Nullable
+  @Parameter(
+      names = {"--dns_ns_ttl"},
+      description = "The time to live for DNS NS records (Ex: PT240S)")
+  Duration dnsNsTtl;
+
+  @Nullable
+  @Parameter(
+      names = {"--dns_ds_ttl"},
+      description = "The time to live for DNS DS records (Ex: PT240S)")
+  Duration dnsDsTtl;
+
   @Nullable
   @Parameter(
       names = "--default_tokens",
@@ -364,6 +382,9 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
       Optional.ofNullable(lordnUsername).ifPresent(u -> builder.setLordnUsername(u.orElse(null)));
       Optional.ofNullable(claimsPeriodEnd).ifPresent(builder::setClaimsPeriodEnd);
       Optional.ofNullable(numDnsPublishShards).ifPresent(builder::setNumDnsPublishLocks);
+      Optional.ofNullable(dnsAPlusAaaaTtl).ifPresent(builder::setDnsAPlusAaaaTtl);
+      Optional.ofNullable(dnsNsTtl).ifPresent(builder::setDnsNsTtl);
+      Optional.ofNullable(dnsDsTtl).ifPresent(builder::setDnsDsTtl);
 
       if (premiumListName != null) {
         if (premiumListName.isPresent()) {

core/src/test/java/google/registry/flows/domain/DomainPricingLogicTest.java

@@ -441,7 +441,7 @@ public class DomainPricingLogicTest {
 
   @Test
   void
-      testGetDomainRenewPrice_oneYear_premiumDomain_anchorTenant__withToken_isDiscountedNonPremiumPrice()
+      testGetDomainRenewPrice_oneYear_premiumDomain_anchorTenant_withToken_isDiscountedNonPremiumPrice()
           throws EppException {
     AllocationToken allocationToken =
         persistResource(
@@ -488,7 +488,7 @@ public class DomainPricingLogicTest {
 
   @Test
   void
-      testGetDomainRenewPrice_multiYear_premiumDomain_anchorTenant__withToken_isDiscountedNonPremiumPrice()
+      testGetDomainRenewPrice_multiYear_premiumDomain_anchorTenant_withToken_isDiscountedNonPremiumPrice()
           throws EppException {
     AllocationToken allocationToken =
         persistResource(

core/src/test/java/google/registry/tools/CreateTldCommandTest.java

@@ -76,6 +76,22 @@ class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
         .isEqualTo(Registry.DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST);
   }
 
+  @Test
+  void testSuccess_ttls() throws Exception {
+    runCommandForced(
+        "xn--q9jyb4c",
+        "--roid_suffix=Q9JYB4C",
+        "--dns_writers=FooDnsWriter",
+        "--dns_a_plus_aaaa_ttl=PT300S",
+        "--dns_ds_ttl=PT240S",
+        "--dns_ns_ttl=PT180S");
+    Registry registry = Registry.get("xn--q9jyb4c");
+    assertThat(registry).isNotNull();
+    assertThat(registry.getDnsAPlusAaaaTtl()).isEqualTo(standardMinutes(5));
+    assertThat(registry.getDnsDsTtl()).isEqualTo(standardMinutes(4));
+    assertThat(registry.getDnsNsTtl()).isEqualTo(standardMinutes(3));
+  }
+
   @Test
   void testFailure_multipleArguments() {
     IllegalArgumentException thrown =

core/src/test/java/google/registry/tools/UpdateTldCommandTest.java

@@ -1095,6 +1095,19 @@ class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
     assertThat(thrown).hasMessageThat().contains("The premium list 'phonies' doesn't exist");
   }
 
+  @Test
+  void testSuccess_setTtls() throws Exception {
+    runCommandForced(
+        "--dns_a_plus_aaaa_ttl=PT300S",
+        "--dns_ds_ttl=PT240S",
+        "--dns_ns_ttl=PT180S",
+        "xn--q9jyb4c");
+    Registry registry = Registry.get("xn--q9jyb4c");
+    assertThat(registry.getDnsAPlusAaaaTtl()).isEqualTo(standardMinutes(5));
+    assertThat(registry.getDnsDsTtl()).isEqualTo(standardMinutes(4));
+    assertThat(registry.getDnsNsTtl()).isEqualTo(standardMinutes(3));
+  }
+
   private void runSuccessfulReservedListsTest(String reservedLists) throws Exception {
     runCommandForced("--reserved_lists", reservedLists, "xn--q9jyb4c");
   }

core/src/test/resources/google/registry/module/backend/backend_routing.txt

@@ -24,6 +24,7 @@ PATH                                               CLASS
 /_dr/task/rdeReport                                RdeReportAction                                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/readDnsRefreshRequests                   ReadDnsRefreshRequestsAction                   POST     y  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/resaveAllEppResourcesPipeline            ResaveAllEppResourcesPipelineAction            GET      n  INTERNAL,API APP ADMIN

release/builder/cloudSchedulerDeployer.go

@@ -93,7 +93,7 @@ func main() {
 			"http", taskRecord.Name,
 			"--location", "us-central1",
 			"--schedule", taskRecord.Schedule,
-			"--uri", fmt.Sprintf("https://backend-dot-%s.appspot.com%s", projectName, taskRecord.URL),
+			"--uri", fmt.Sprintf("https://backend-dot-%s.appspot.com%s", projectName, strings.TrimSpace(taskRecord.URL)),
 			"--description", description,
 			"--http-method", "get",
 			"--oidc-service-account-email", serviceAccountEmail,