We separate computing and saving the checkpoint from exporting it because the export to GCS - * is retryable but should not require the computation of a new checkpoint. Saving the checkpoint - * and enqueuing the export task are done transactionally, so any checkpoint that is saved will be + *
We separate computing and saving the checkpoint from exporting it because the export to GCS is + * retryable but should not require the computation of a new checkpoint. Saving the checkpoint and + * enqueuing the export task are done transactionally, so any checkpoint that is saved will be * exported to GCS very soon. * *
This action's supported method is GET rather than POST because it gets invoked via cron. */ @Action( - path = "/_dr/cron/commitLogCheckpoint", - method = Action.Method.GET, - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/cron/commitLogCheckpoint", + method = Action.Method.GET, + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_ONLY) public final class CommitLogCheckpointAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/backup/DeleteOldCommitLogsAction.java b/java/google/registry/backup/DeleteOldCommitLogsAction.java index 3efe87876..af1d087ac 100644 --- a/java/google/registry/backup/DeleteOldCommitLogsAction.java +++ b/java/google/registry/backup/DeleteOldCommitLogsAction.java @@ -53,20 +53,18 @@ import org.joda.time.Duration; * except to reconstruct point-in-time snapshots of the database. To make that possible, {@link * EppResource}s have a {@link EppResource#getRevisions} method that returns the commit logs for * older points in time. But that functionality is not useful after a certain amount of time, e.g. - * thirty days, so unneeded revisions are deleted - * (see {@link CommitLogRevisionsTranslatorFactory}). This leaves commit logs in the system that are - * unneeded (have no revisions pointing to them). So this task runs periodically to delete the - * "orphan" commit logs. + * thirty days, so unneeded revisions are deleted (see {@link CommitLogRevisionsTranslatorFactory}). + * This leaves commit logs in the system that are unneeded (have no revisions pointing to them). So + * this task runs periodically to delete the "orphan" commit logs. * *
This action runs a mapreduce that goes over all existing {@link EppResource} and all {@link * CommitLogManifest} older than commitLogDatastreRetention, and erases the commit logs aren't in an * EppResource. - * */ @Action( - path = "/_dr/task/deleteOldCommitLogs", - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/deleteOldCommitLogs", + auth = Auth.AUTH_INTERNAL_ONLY) public final class DeleteOldCommitLogsAction implements Runnable { private static final int NUM_MAP_SHARDS = 20; diff --git a/java/google/registry/backup/ExportCommitLogDiffAction.java b/java/google/registry/backup/ExportCommitLogDiffAction.java index cad4c6f6d..eed7944c6 100644 --- a/java/google/registry/backup/ExportCommitLogDiffAction.java +++ b/java/google/registry/backup/ExportCommitLogDiffAction.java @@ -60,11 +60,11 @@ import org.joda.time.DateTime; /** Action that exports the diff between two commit log checkpoints to GCS. */ @Action( - path = ExportCommitLogDiffAction.PATH, - method = Action.Method.POST, - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = ExportCommitLogDiffAction.PATH, + method = Action.Method.POST, + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_ONLY) public final class ExportCommitLogDiffAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index 37027ed13..ba9456e08 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -57,11 +57,11 @@ import org.joda.time.DateTime; /** Restore Registry 2 commit logs from GCS to Datastore. */ @Action( - path = RestoreCommitLogsAction.PATH, - method = Action.Method.POST, - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_OR_ADMIN -) + service = Action.Service.TOOLS, + path = RestoreCommitLogsAction.PATH, + method = Action.Method.POST, + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_OR_ADMIN) public class RestoreCommitLogsAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/batch/DeleteContactsAndHostsAction.java b/java/google/registry/batch/DeleteContactsAndHostsAction.java index 704badfae..bf32e8f70 100644 --- a/java/google/registry/batch/DeleteContactsAndHostsAction.java +++ b/java/google/registry/batch/DeleteContactsAndHostsAction.java @@ -107,7 +107,10 @@ import org.joda.time.Duration; * A mapreduce that processes batch asynchronous deletions of contact and host resources by mapping * over all domains and checking for any references to the contacts/hosts in pending deletion. */ -@Action(path = "/_dr/task/deleteContactsAndHosts", auth = Auth.AUTH_INTERNAL_ONLY) +@Action( + service = Action.Service.BACKEND, + path = "/_dr/task/deleteContactsAndHosts", + auth = Auth.AUTH_INTERNAL_ONLY) public class DeleteContactsAndHostsAction implements Runnable { static final String KIND_CONTACT = getKind(ContactResource.class); diff --git a/java/google/registry/batch/DeleteLoadTestDataAction.java b/java/google/registry/batch/DeleteLoadTestDataAction.java index bfdb159a0..99428f015 100644 --- a/java/google/registry/batch/DeleteLoadTestDataAction.java +++ b/java/google/registry/batch/DeleteLoadTestDataAction.java @@ -44,13 +44,17 @@ import javax.inject.Inject; * Hard deletes load-test ContactResources, HostResources, their subordinate history entries, and * the associated ForeignKey and EppResourceIndex entities. * - *
This only deletes contacts and hosts, NOT domains. To delete domains, use - * {@link DeleteLoadTestDataAction} and pass it the TLD(s) that the load test domains were created - * on. Note that DeleteLoadTestDataAction is safe enough to run in production whereas this mapreduce - * is not, but this one does not need to be runnable in production because load testing isn't run - * against production. + *
This only deletes contacts and hosts, NOT domains. To delete domains, use {@link + * DeleteLoadTestDataAction} and pass it the TLD(s) that the load test domains were created on. Note + * that DeleteLoadTestDataAction is safe enough to run in production whereas this mapreduce is not, + * but this one does not need to be runnable in production because load testing isn't run against + * production. */ -@Action(path = "/_dr/task/deleteLoadTestData", method = POST, auth = Auth.AUTH_INTERNAL_ONLY) +@Action( + service = Action.Service.BACKEND, + path = "/_dr/task/deleteLoadTestData", + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class DeleteLoadTestDataAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/batch/DeleteProberDataAction.java b/java/google/registry/batch/DeleteProberDataAction.java index 35386a526..051eeffd8 100644 --- a/java/google/registry/batch/DeleteProberDataAction.java +++ b/java/google/registry/batch/DeleteProberDataAction.java @@ -64,10 +64,10 @@ import org.joda.time.Duration; *
See: https://www.youtube.com/watch?v=xuuv0syoHnM */ @Action( - path = "/_dr/task/deleteProberData", - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/deleteProberData", + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class DeleteProberDataAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java b/java/google/registry/batch/ExpandRecurringBillingEventsAction.java index 0490f411c..304c45acd 100644 --- a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java +++ b/java/google/registry/batch/ExpandRecurringBillingEventsAction.java @@ -67,15 +67,14 @@ import org.joda.time.DateTime; /** * A mapreduce that expands {@link Recurring} billing events into synthetic {@link OneTime} events. * - *
The cursor used throughout this mapreduce (overridden if necessary using the parameter - * {@code cursorTime}) represents the inclusive lower bound on the range of billing times that will - * be expanded as a result of the job (the exclusive upper bound being the execution time of the - * job). + *
The cursor used throughout this mapreduce (overridden if necessary using the parameter {@code + * cursorTime}) represents the inclusive lower bound on the range of billing times that will be + * expanded as a result of the job (the exclusive upper bound being the execution time of the job). */ @Action( - path = "/_dr/task/expandRecurringBillingEvents", - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/expandRecurringBillingEvents", + auth = Auth.AUTH_INTERNAL_ONLY) public class ExpandRecurringBillingEventsAction implements Runnable { public static final String PARAM_CURSOR_TIME = "cursorTime"; diff --git a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java b/java/google/registry/batch/RefreshDnsOnHostRenameAction.java index 8858ee19a..59f3b92f6 100644 --- a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java +++ b/java/google/registry/batch/RefreshDnsOnHostRenameAction.java @@ -73,9 +73,9 @@ import org.joda.time.Duration; /** Performs batched DNS refreshes for applicable domains following a host rename. */ @Action( - path = "/_dr/task/refreshDnsOnHostRename", - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/refreshDnsOnHostRename", + auth = Auth.AUTH_INTERNAL_ONLY) public class RefreshDnsOnHostRenameAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/batch/ResaveAllEppResourcesAction.java b/java/google/registry/batch/ResaveAllEppResourcesAction.java index 8ce341837..efa3f3d3f 100644 --- a/java/google/registry/batch/ResaveAllEppResourcesAction.java +++ b/java/google/registry/batch/ResaveAllEppResourcesAction.java @@ -40,9 +40,9 @@ import javax.inject.Inject; * which only admin users can do. */ @Action( - path = "/_dr/task/resaveAllEppResources", - auth = Auth.AUTH_INTERNAL_OR_ADMIN -) + service = Action.Service.BACKEND, + path = "/_dr/task/resaveAllEppResources", + auth = Auth.AUTH_INTERNAL_OR_ADMIN) public class ResaveAllEppResourcesAction implements Runnable { @Inject MapreduceRunner mrRunner; diff --git a/java/google/registry/batch/ResaveEntityAction.java b/java/google/registry/batch/ResaveEntityAction.java index 43222463a..799ef5b25 100644 --- a/java/google/registry/batch/ResaveEntityAction.java +++ b/java/google/registry/batch/ResaveEntityAction.java @@ -38,7 +38,11 @@ import org.joda.time.DateTime; * *
{@link EppResource}s will be projected forward to the current time. */ -@Action(path = ResaveEntityAction.PATH, auth = Auth.AUTH_INTERNAL_OR_ADMIN, method = Method.POST) +@Action( + service = Action.Service.BACKEND, + path = ResaveEntityAction.PATH, + auth = Auth.AUTH_INTERNAL_OR_ADMIN, + method = Method.POST) public class ResaveEntityAction implements Runnable { public static final String PATH = "/_dr/task/resaveEntity"; diff --git a/java/google/registry/cron/CommitLogFanoutAction.java b/java/google/registry/cron/CommitLogFanoutAction.java index 6b18aa5f3..2f799093c 100644 --- a/java/google/registry/cron/CommitLogFanoutAction.java +++ b/java/google/registry/cron/CommitLogFanoutAction.java @@ -30,10 +30,10 @@ import javax.inject.Inject; /** Action for fanning out cron tasks for each commit log bucket. */ @Action( - path = "/_dr/cron/commitLogFanout", - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/cron/commitLogFanout", + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_ONLY) public final class CommitLogFanoutAction implements Runnable { public static final String BUCKET_PARAM = "bucket"; diff --git a/java/google/registry/cron/TldFanoutAction.java b/java/google/registry/cron/TldFanoutAction.java index 3677a8585..821f01983 100644 --- a/java/google/registry/cron/TldFanoutAction.java +++ b/java/google/registry/cron/TldFanoutAction.java @@ -62,29 +62,32 @@ import javax.inject.Inject; *
The following values may be specified inside the "endpoint" param. + * *
Each TLD's active domain names are exported as a newline-delimited flat text file with the * name TLD.txt into the domain-lists bucket. Note that this overwrites the files in place. */ -@Action(path = "/_dr/task/exportDomainLists", method = POST, auth = Auth.AUTH_INTERNAL_ONLY) +@Action( + service = Action.Service.BACKEND, + path = "/_dr/task/exportDomainLists", + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class ExportDomainListsAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/export/ExportPremiumTermsAction.java b/java/google/registry/export/ExportPremiumTermsAction.java index db0e33e38..1e339f3fc 100644 --- a/java/google/registry/export/ExportPremiumTermsAction.java +++ b/java/google/registry/export/ExportPremiumTermsAction.java @@ -45,7 +45,11 @@ import java.util.SortedSet; import javax.inject.Inject; /** Action that exports the premium terms list for a TLD to Google Drive. */ -@Action(path = "/_dr/task/exportPremiumTerms", method = POST, auth = Auth.AUTH_INTERNAL_ONLY) +@Action( + service = Action.Service.BACKEND, + path = "/_dr/task/exportPremiumTerms", + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class ExportPremiumTermsAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/export/ExportReservedTermsAction.java b/java/google/registry/export/ExportReservedTermsAction.java index cafb69c40..c29f6022c 100644 --- a/java/google/registry/export/ExportReservedTermsAction.java +++ b/java/google/registry/export/ExportReservedTermsAction.java @@ -34,10 +34,10 @@ import javax.inject.Inject; /** Action that exports the publicly viewable reserved terms list for a TLD to Google Drive. */ @Action( - path = "/_dr/task/exportReservedTerms", - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/exportReservedTerms", + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class ExportReservedTermsAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/export/ExportSnapshotAction.java b/java/google/registry/export/ExportSnapshotAction.java index fcfea0dee..c47b08fdc 100644 --- a/java/google/registry/export/ExportSnapshotAction.java +++ b/java/google/registry/export/ExportSnapshotAction.java @@ -39,11 +39,11 @@ import javax.inject.Inject; * */ @Action( - path = ExportSnapshotAction.PATH, - method = POST, - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = ExportSnapshotAction.PATH, + method = POST, + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_ONLY) public class ExportSnapshotAction implements Runnable { /** Queue to use for enqueuing the task that will actually launch the backup. */ diff --git a/java/google/registry/export/LoadSnapshotAction.java b/java/google/registry/export/LoadSnapshotAction.java index 91834b7d2..b6b6a178f 100644 --- a/java/google/registry/export/LoadSnapshotAction.java +++ b/java/google/registry/export/LoadSnapshotAction.java @@ -51,10 +51,10 @@ import org.joda.time.DateTime; /** Action to load a Datastore snapshot from Google Cloud Storage into BigQuery. */ @Action( - path = LoadSnapshotAction.PATH, - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = LoadSnapshotAction.PATH, + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class LoadSnapshotAction implements Runnable { /** Parameter names for passing parameters into the servlet. */ diff --git a/java/google/registry/export/SyncGroupMembersAction.java b/java/google/registry/export/SyncGroupMembersAction.java index 66aef806c..ffa1a064c 100644 --- a/java/google/registry/export/SyncGroupMembersAction.java +++ b/java/google/registry/export/SyncGroupMembersAction.java @@ -52,10 +52,10 @@ import javax.inject.Inject; *
This uses the Directory API. */ @Action( - path = "/_dr/task/syncGroupMembers", - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/syncGroupMembers", + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public final class SyncGroupMembersAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/export/UpdateSnapshotViewAction.java b/java/google/registry/export/UpdateSnapshotViewAction.java index e792882f6..715991eb0 100644 --- a/java/google/registry/export/UpdateSnapshotViewAction.java +++ b/java/google/registry/export/UpdateSnapshotViewAction.java @@ -35,7 +35,11 @@ import java.io.IOException; import javax.inject.Inject; /** Update a well-known view to point at a certain Datastore snapshot table in BigQuery. */ -@Action(path = UpdateSnapshotViewAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_ONLY) +@Action( + service = Action.Service.BACKEND, + path = UpdateSnapshotViewAction.PATH, + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class UpdateSnapshotViewAction implements Runnable { /** Headers for passing parameters into the servlet. */ diff --git a/java/google/registry/export/UploadDatastoreBackupAction.java b/java/google/registry/export/UploadDatastoreBackupAction.java index ce2504ba8..474cab2d5 100644 --- a/java/google/registry/export/UploadDatastoreBackupAction.java +++ b/java/google/registry/export/UploadDatastoreBackupAction.java @@ -48,7 +48,11 @@ import java.io.IOException; import javax.inject.Inject; /** Action to load a Datastore backup from Google Cloud Storage into BigQuery. */ -@Action(path = UploadDatastoreBackupAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_ONLY) +@Action( + service = Action.Service.BACKEND, + path = UploadDatastoreBackupAction.PATH, + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class UploadDatastoreBackupAction implements Runnable { /** Parameter names for passing parameters into the servlet. */ diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java index 994baa475..745bc0452 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java @@ -57,10 +57,10 @@ import org.joda.time.Duration; * @see SyncRegistrarsSheet */ @Action( - path = SyncRegistrarsSheetAction.PATH, - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = SyncRegistrarsSheetAction.PATH, + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public class SyncRegistrarsSheetAction implements Runnable { private enum Result { diff --git a/java/google/registry/flows/CheckApiAction.java b/java/google/registry/flows/CheckApiAction.java index 462853197..1b513fe76 100644 --- a/java/google/registry/flows/CheckApiAction.java +++ b/java/google/registry/flows/CheckApiAction.java @@ -69,7 +69,7 @@ import org.joda.time.DateTime; * user controlled, lest it open an XSS vector. Do not modify this to return the domain name in the * response. */ -@Action(path = "/check", auth = Auth.AUTH_PUBLIC_ANONYMOUS) +@Action(service = Action.Service.PUBAPI, path = "/check", auth = Auth.AUTH_PUBLIC_ANONYMOUS) public class CheckApiAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/flows/EppConsoleAction.java b/java/google/registry/flows/EppConsoleAction.java index 23b4c4e24..339d8074d 100644 --- a/java/google/registry/flows/EppConsoleAction.java +++ b/java/google/registry/flows/EppConsoleAction.java @@ -27,10 +27,10 @@ import javax.servlet.http.HttpSession; /** Runs EPP from the console and requires GAE user authentication. */ @Action( - path = "/registrar-xhr", - method = Method.POST, - auth = Auth.AUTH_PUBLIC_LOGGED_IN -) + service = Action.Service.DEFAULT, + path = "/registrar-xhr", + method = Method.POST, + auth = Auth.AUTH_PUBLIC_LOGGED_IN) public class EppConsoleAction implements Runnable { @Inject @Payload byte[] inputXmlBytes; diff --git a/java/google/registry/flows/EppTlsAction.java b/java/google/registry/flows/EppTlsAction.java index 5537d667b..25cc312a0 100644 --- a/java/google/registry/flows/EppTlsAction.java +++ b/java/google/registry/flows/EppTlsAction.java @@ -27,10 +27,10 @@ import javax.servlet.http.HttpSession; * to RFC 5730. Commands must be requested via POST. */ @Action( - path = "/_dr/epp", - method = Method.POST, - auth = Auth.AUTH_PUBLIC_OR_INTERNAL -) + service = Action.Service.DEFAULT, + path = "/_dr/epp", + method = Method.POST, + auth = Auth.AUTH_PUBLIC_OR_INTERNAL) public class EppTlsAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/flows/EppToolAction.java b/java/google/registry/flows/EppToolAction.java index ea13088fd..c51d02025 100644 --- a/java/google/registry/flows/EppToolAction.java +++ b/java/google/registry/flows/EppToolAction.java @@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletRequest; /** Runs EPP commands directly without logging in, verifying an XSRF token from the tool. */ @Action( - path = EppToolAction.PATH, - method = Method.POST, - auth = Auth.AUTH_INTERNAL_OR_ADMIN -) + service = Action.Service.TOOLS, + path = EppToolAction.PATH, + method = Method.POST, + auth = Auth.AUTH_INTERNAL_OR_ADMIN) public class EppToolAction implements Runnable { public static final String PATH = "/_dr/epptool"; diff --git a/java/google/registry/loadtest/LoadTestAction.java b/java/google/registry/loadtest/LoadTestAction.java index 6a6cd995f..b4648809b 100644 --- a/java/google/registry/loadtest/LoadTestAction.java +++ b/java/google/registry/loadtest/LoadTestAction.java @@ -52,11 +52,11 @@ import org.joda.time.DateTime; * least one must be specified in order for load testing to do anything. */ @Action( - path = LoadTestAction.PATH, - method = Action.Method.POST, - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_OR_ADMIN -) + service = Action.Service.TOOLS, + path = LoadTestAction.PATH, + method = Action.Method.POST, + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_OR_ADMIN) public class LoadTestAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/rdap/RdapAutnumAction.java b/java/google/registry/rdap/RdapAutnumAction.java index 3eba76fab..1b749da34 100644 --- a/java/google/registry/rdap/RdapAutnumAction.java +++ b/java/google/registry/rdap/RdapAutnumAction.java @@ -31,11 +31,11 @@ import javax.inject.Inject; * ARIN, not domain registries. */ @Action( - path = RdapAutnumAction.PATH, - method = {GET, HEAD}, - isPrefix = true, - auth = Auth.AUTH_PUBLIC_ANONYMOUS -) + service = Action.Service.PUBAPI, + path = RdapAutnumAction.PATH, + method = {GET, HEAD}, + isPrefix = true, + auth = Auth.AUTH_PUBLIC_ANONYMOUS) public class RdapAutnumAction extends RdapActionBase { public static final String PATH = "/rdap/autnum/"; diff --git a/java/google/registry/rdap/RdapDomainAction.java b/java/google/registry/rdap/RdapDomainAction.java index 2d975f112..01e6bee38 100644 --- a/java/google/registry/rdap/RdapDomainAction.java +++ b/java/google/registry/rdap/RdapDomainAction.java @@ -35,11 +35,11 @@ import org.joda.time.DateTime; /** RDAP (new WHOIS) action for domain requests. */ @Action( - path = RdapDomainAction.PATH, - method = {GET, HEAD}, - isPrefix = true, - auth = Auth.AUTH_PUBLIC -) + service = Action.Service.PUBAPI, + path = RdapDomainAction.PATH, + method = {GET, HEAD}, + isPrefix = true, + auth = Auth.AUTH_PUBLIC) public class RdapDomainAction extends RdapActionBase { public static final String PATH = "/rdap/domain/"; diff --git a/java/google/registry/rdap/RdapDomainSearchAction.java b/java/google/registry/rdap/RdapDomainSearchAction.java index 3999f6660..7d82df32a 100644 --- a/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/java/google/registry/rdap/RdapDomainSearchAction.java @@ -67,10 +67,10 @@ import org.joda.time.DateTime; * Data Access Protocol (RDAP) */ @Action( - path = RdapDomainSearchAction.PATH, - method = {GET, HEAD}, - auth = Auth.AUTH_PUBLIC -) + service = Action.Service.PUBAPI, + path = RdapDomainSearchAction.PATH, + method = {GET, HEAD}, + auth = Auth.AUTH_PUBLIC) public class RdapDomainSearchAction extends RdapSearchActionBase { static final String PATH = "/rdap/domains"; diff --git a/java/google/registry/rdap/RdapEntityAction.java b/java/google/registry/rdap/RdapEntityAction.java index a88050b69..b6c892720 100644 --- a/java/google/registry/rdap/RdapEntityAction.java +++ b/java/google/registry/rdap/RdapEntityAction.java @@ -46,11 +46,11 @@ import org.joda.time.DateTime; * Registrar ID registry. The type value of the publicID object MUST be equal to IANA Registrar ID. */ @Action( - path = RdapEntityAction.PATH, - method = {GET, HEAD}, - isPrefix = true, - auth = Auth.AUTH_PUBLIC -) + service = Action.Service.PUBAPI, + path = RdapEntityAction.PATH, + method = {GET, HEAD}, + isPrefix = true, + auth = Auth.AUTH_PUBLIC) public class RdapEntityAction extends RdapActionBase { public static final String PATH = "/rdap/entity/"; diff --git a/java/google/registry/rdap/RdapEntitySearchAction.java b/java/google/registry/rdap/RdapEntitySearchAction.java index 85a42bc20..ecf568f14 100644 --- a/java/google/registry/rdap/RdapEntitySearchAction.java +++ b/java/google/registry/rdap/RdapEntitySearchAction.java @@ -75,10 +75,10 @@ import org.joda.time.DateTime; * Data Access Protocol (RDAP) */ @Action( - path = RdapEntitySearchAction.PATH, - method = {GET, HEAD}, - auth = Auth.AUTH_PUBLIC -) + service = Action.Service.PUBAPI, + path = RdapEntitySearchAction.PATH, + method = {GET, HEAD}, + auth = Auth.AUTH_PUBLIC) public class RdapEntitySearchAction extends RdapSearchActionBase { public static final String PATH = "/rdap/entities"; diff --git a/java/google/registry/rdap/RdapHelpAction.java b/java/google/registry/rdap/RdapHelpAction.java index 0f7a08158..45000927f 100644 --- a/java/google/registry/rdap/RdapHelpAction.java +++ b/java/google/registry/rdap/RdapHelpAction.java @@ -27,11 +27,11 @@ import javax.inject.Inject; /** RDAP (new WHOIS) action for help requests. */ @Action( - path = RdapHelpAction.PATH, - method = {GET, HEAD}, - isPrefix = true, - auth = Auth.AUTH_PUBLIC_ANONYMOUS -) + service = Action.Service.PUBAPI, + path = RdapHelpAction.PATH, + method = {GET, HEAD}, + isPrefix = true, + auth = Auth.AUTH_PUBLIC_ANONYMOUS) public class RdapHelpAction extends RdapActionBase { public static final String PATH = "/rdap/help"; diff --git a/java/google/registry/rdap/RdapIpAction.java b/java/google/registry/rdap/RdapIpAction.java index 27ce4a6c8..54b844cc3 100644 --- a/java/google/registry/rdap/RdapIpAction.java +++ b/java/google/registry/rdap/RdapIpAction.java @@ -31,11 +31,11 @@ import javax.inject.Inject; * ARIN, not domain registries. */ @Action( - path = RdapIpAction.PATH, - method = {GET, HEAD}, - isPrefix = true, - auth = Auth.AUTH_PUBLIC_ANONYMOUS -) + service = Action.Service.PUBAPI, + path = RdapIpAction.PATH, + method = {GET, HEAD}, + isPrefix = true, + auth = Auth.AUTH_PUBLIC_ANONYMOUS) public class RdapIpAction extends RdapActionBase { public static final String PATH = "/rdap/ip/"; diff --git a/java/google/registry/rdap/RdapNameserverAction.java b/java/google/registry/rdap/RdapNameserverAction.java index 4c898169d..9c13aa7f0 100644 --- a/java/google/registry/rdap/RdapNameserverAction.java +++ b/java/google/registry/rdap/RdapNameserverAction.java @@ -35,11 +35,11 @@ import org.joda.time.DateTime; /** RDAP (new WHOIS) action for nameserver requests. */ @Action( - path = RdapNameserverAction.PATH, - method = {GET, HEAD}, - isPrefix = true, - auth = Auth.AUTH_PUBLIC_ANONYMOUS -) + service = Action.Service.PUBAPI, + path = RdapNameserverAction.PATH, + method = {GET, HEAD}, + isPrefix = true, + auth = Auth.AUTH_PUBLIC_ANONYMOUS) public class RdapNameserverAction extends RdapActionBase { public static final String PATH = "/rdap/nameserver/"; diff --git a/java/google/registry/rdap/RdapNameserverSearchAction.java b/java/google/registry/rdap/RdapNameserverSearchAction.java index b77909d05..624c31b85 100644 --- a/java/google/registry/rdap/RdapNameserverSearchAction.java +++ b/java/google/registry/rdap/RdapNameserverSearchAction.java @@ -57,10 +57,10 @@ import org.joda.time.DateTime; * Data Access Protocol (RDAP) */ @Action( - path = RdapNameserverSearchAction.PATH, - method = {GET, HEAD}, - auth = Auth.AUTH_PUBLIC_ANONYMOUS -) + service = Action.Service.PUBAPI, + path = RdapNameserverSearchAction.PATH, + method = {GET, HEAD}, + auth = Auth.AUTH_PUBLIC_ANONYMOUS) public class RdapNameserverSearchAction extends RdapSearchActionBase { public static final String PATH = "/rdap/nameservers"; diff --git a/java/google/registry/rde/BrdaCopyAction.java b/java/google/registry/rde/BrdaCopyAction.java index 9c8e11325..bae83ffb7 100644 --- a/java/google/registry/rde/BrdaCopyAction.java +++ b/java/google/registry/rde/BrdaCopyAction.java @@ -49,14 +49,16 @@ import org.joda.time.DateTime; * This bucket is special because a separate script will rsync it to the third party escrow provider * SFTP server. This is why the internal staging files are stored in the separate RDE bucket. * - * @see Registry Agreement + * @see Registry + * Agreement */ @Action( - path = BrdaCopyAction.PATH, - method = POST, - automaticallyPrintOk = true, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = BrdaCopyAction.PATH, + method = POST, + automaticallyPrintOk = true, + auth = Auth.AUTH_INTERNAL_ONLY) public final class BrdaCopyAction implements Runnable { static final String PATH = "/_dr/task/brdaCopy"; diff --git a/java/google/registry/rde/RdeReportAction.java b/java/google/registry/rde/RdeReportAction.java index 076f6574d..429240fbd 100644 --- a/java/google/registry/rde/RdeReportAction.java +++ b/java/google/registry/rde/RdeReportAction.java @@ -50,10 +50,10 @@ import org.joda.time.Duration; * Action that uploads a small XML RDE report to ICANN after {@link RdeUploadAction} has finished. */ @Action( - path = RdeReportAction.PATH, - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = RdeReportAction.PATH, + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public final class RdeReportAction implements Runnable, EscrowTask { static final String PATH = "/_dr/task/rdeReport"; diff --git a/java/google/registry/rde/RdeStagingAction.java b/java/google/registry/rde/RdeStagingAction.java index 5edc658bc..790ede76d 100644 --- a/java/google/registry/rde/RdeStagingAction.java +++ b/java/google/registry/rde/RdeStagingAction.java @@ -78,8 +78,8 @@ import org.joda.time.Duration; *
Once a deposit is successfully generated, an {@link RdeUploadAction} is enqueued which will * upload it via SFTP to the third-party escrow provider. * - *
To generate escrow deposits manually and locally, use the {@code nomulus} tool command - * {@code GenerateEscrowDepositCommand}. + *
To generate escrow deposits manually and locally, use the {@code nomulus} tool command {@code + * GenerateEscrowDepositCommand}. * *
If a deposit fails, an error is emitted to the logs for each broken entity. It tells you the * key and shows you its representation in lenient XML. * - *
Failed deposits will be retried indefinitely. This is because RDE and BRDA each have a - * {@link Cursor} for each TLD. Even if the cursor lags for days, it'll catch up gradually on its - * own, once the data becomes valid. + *
Failed deposits will be retried indefinitely. This is because RDE and BRDA each have a {@link + * Cursor} for each TLD. Even if the cursor lags for days, it'll catch up gradually on its own, once + * the data becomes valid. * *
The third-party escrow provider will validate each deposit we send them. They do both schema * validation and reference checking. @@ -143,21 +143,24 @@ import org.joda.time.Duration; * *
The filename of an escrow deposit is determistic for a given (TLD, watermark, - * {@linkplain RdeMode mode}) triplet. Its generated contents is deterministic in all the ways that - * we care about. Its view of the database is strongly consistent. + *
The filename of an escrow deposit is determistic for a given (TLD, watermark, {@linkplain + * RdeMode mode}) triplet. Its generated contents is deterministic in all the ways that we care + * about. Its view of the database is strongly consistent. * *
This is because: + * *
Here's what's not deterministic: + * *
The manual, directory, mode, tld and watermark parameters must be present for manual @@ -181,14 +185,16 @@ import org.joda.time.Duration; * set to false). The revision parameter is optional in manual operation, and must be absent for * standard operation. * - * @see Registry Data Escrow Specification - * @see Domain Name Registration Data Objects Mapping + * @see Registry + * Data Escrow Specification + * @see Domain + * Name Registration Data Objects Mapping */ @Action( - path = RdeStagingAction.PATH, - method = {GET, POST}, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = RdeStagingAction.PATH, + method = {GET, POST}, + auth = Auth.AUTH_INTERNAL_ONLY) public final class RdeStagingAction implements Runnable { public static final String PATH = "/_dr/task/rdeStaging"; diff --git a/java/google/registry/rde/RdeUploadAction.java b/java/google/registry/rde/RdeUploadAction.java index 385b3f223..b2d446d5e 100644 --- a/java/google/registry/rde/RdeUploadAction.java +++ b/java/google/registry/rde/RdeUploadAction.java @@ -76,14 +76,14 @@ import org.joda.time.Duration; *
This action is invoked by {@link RdeStagingAction} once it's created the files we need. The * date is calculated from {@link CursorType#RDE_UPLOAD}. * - *
Once this action completes, it rolls the cursor forward a day and triggers - * {@link RdeReportAction}. + *
Once this action completes, it rolls the cursor forward a day and triggers {@link + * RdeReportAction}. */ @Action( - path = RdeUploadAction.PATH, - method = POST, - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = RdeUploadAction.PATH, + method = POST, + auth = Auth.AUTH_INTERNAL_ONLY) public final class RdeUploadAction implements Runnable, EscrowTask { static final String PATH = "/_dr/task/rdeUpload"; diff --git a/java/google/registry/rde/imports/RdeContactImportAction.java b/java/google/registry/rde/imports/RdeContactImportAction.java index e237e3129..a57bcda17 100644 --- a/java/google/registry/rde/imports/RdeContactImportAction.java +++ b/java/google/registry/rde/imports/RdeContactImportAction.java @@ -45,9 +45,9 @@ import javax.inject.Inject; *
Specify the escrow file to import with the "path" parameter. */ @Action( - path = "/_dr/task/importRdeContacts", - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/importRdeContacts", + auth = Auth.AUTH_INTERNAL_ONLY) public class RdeContactImportAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/rde/imports/RdeDomainImportAction.java b/java/google/registry/rde/imports/RdeDomainImportAction.java index 3dda71d65..cc558a0c6 100644 --- a/java/google/registry/rde/imports/RdeDomainImportAction.java +++ b/java/google/registry/rde/imports/RdeDomainImportAction.java @@ -69,9 +69,9 @@ import org.joda.time.DateTime; *
Specify the escrow file to import with the "path" parameter. */ @Action( - path = "/_dr/task/importRdeDomains", - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/importRdeDomains", + auth = Auth.AUTH_INTERNAL_ONLY) public class RdeDomainImportAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/rde/imports/RdeHostImportAction.java b/java/google/registry/rde/imports/RdeHostImportAction.java index 53e2fa59f..3882f5359 100644 --- a/java/google/registry/rde/imports/RdeHostImportAction.java +++ b/java/google/registry/rde/imports/RdeHostImportAction.java @@ -45,9 +45,9 @@ import javax.inject.Inject; *
Specify the escrow file to import with the "path" parameter. */ @Action( - path = "/_dr/task/importRdeHosts", - auth = Auth.AUTH_INTERNAL_ONLY -) + service = Action.Service.BACKEND, + path = "/_dr/task/importRdeHosts", + auth = Auth.AUTH_INTERNAL_ONLY) public class RdeHostImportAction implements Runnable { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); diff --git a/java/google/registry/rde/imports/RdeHostLinkAction.java b/java/google/registry/rde/imports/RdeHostLinkAction.java index 6abe732c4..a47f5ab67 100644 --- a/java/google/registry/rde/imports/RdeHostLinkAction.java +++ b/java/google/registry/rde/imports/RdeHostLinkAction.java @@ -56,9 +56,9 @@ import org.joda.time.DateTime; *
Specify the escrow file to import with the "path" parameter.
*/
@Action(
- path = "/_dr/task/linkRdeHosts",
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.BACKEND,
+ path = "/_dr/task/linkRdeHosts",
+ auth = Auth.AUTH_INTERNAL_ONLY)
public class RdeHostLinkAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/reporting/billing/CopyDetailReportsAction.java b/java/google/registry/reporting/billing/CopyDetailReportsAction.java
index 1e3ebd60c..7bb6ae321 100644
--- a/java/google/registry/reporting/billing/CopyDetailReportsAction.java
+++ b/java/google/registry/reporting/billing/CopyDetailReportsAction.java
@@ -39,7 +39,11 @@ import java.util.Optional;
import javax.inject.Inject;
/** Copy all registrar detail reports in a given bucket's subdirectory from GCS to Drive. */
-@Action(path = CopyDetailReportsAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@Action(
+ service = Action.Service.BACKEND,
+ path = CopyDetailReportsAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public final class CopyDetailReportsAction implements Runnable {
public static final String PATH = "/_dr/task/copyDetailReports";
diff --git a/java/google/registry/reporting/billing/GenerateInvoicesAction.java b/java/google/registry/reporting/billing/GenerateInvoicesAction.java
index 8d573eaeb..e171d29a7 100644
--- a/java/google/registry/reporting/billing/GenerateInvoicesAction.java
+++ b/java/google/registry/reporting/billing/GenerateInvoicesAction.java
@@ -46,7 +46,11 @@ import org.joda.time.YearMonth;
* staged at gs:// This relies on the retry semantics in {@code queue.xml} to ensure proper upload, in spite of
* fluctuations in generation timing.
*
- * @see
- * Job States
+ * @see
+ * Job States
*/
-@Action(path = PublishInvoicesAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@Action(
+ service = Action.Service.BACKEND,
+ path = PublishInvoicesAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public class PublishInvoicesAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/reporting/icann/IcannReportingStagingAction.java b/java/google/registry/reporting/icann/IcannReportingStagingAction.java
index 7949b61fb..9012257f5 100644
--- a/java/google/registry/reporting/icann/IcannReportingStagingAction.java
+++ b/java/google/registry/reporting/icann/IcannReportingStagingAction.java
@@ -55,7 +55,11 @@ import org.joda.time.YearMonth;
* reportTypes: the type of reports to generate. You can specify either 'activity' or
* 'transactions'. Defaults to generating both.
*/
-@Action(path = IcannReportingStagingAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_ONLY)
+@Action(
+ service = Action.Service.BACKEND,
+ path = IcannReportingStagingAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public final class IcannReportingStagingAction implements Runnable {
static final String PATH = "/_dr/task/icannReportingStaging";
diff --git a/java/google/registry/reporting/icann/IcannReportingUploadAction.java b/java/google/registry/reporting/icann/IcannReportingUploadAction.java
index 1cd6c5371..fa01d594b 100644
--- a/java/google/registry/reporting/icann/IcannReportingUploadAction.java
+++ b/java/google/registry/reporting/icann/IcannReportingUploadAction.java
@@ -52,7 +52,11 @@ import javax.inject.Inject;
* example: "manual/dir" means reports will be stored under gs://[project-id]-reporting/manual/dir.
* Defaults to "icann/monthly/[last month in yyyy-MM format]".
*/
-@Action(path = IcannReportingUploadAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@Action(
+ service = Action.Service.BACKEND,
+ path = IcannReportingUploadAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public final class IcannReportingUploadAction implements Runnable {
static final String PATH = "/_dr/task/icannReportingUpload";
diff --git a/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java b/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
index 57d701519..798582c57 100644
--- a/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
+++ b/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
@@ -43,7 +43,11 @@ import org.joda.time.LocalDate;
* This action runs the {@link google.registry.beam.spec11.Spec11Pipeline} template, which
* generates the specified month's Spec11 report and stores it on GCS.
*/
-@Action(path = GenerateSpec11ReportAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_ONLY)
+@Action(
+ service = Action.Service.BACKEND,
+ path = GenerateSpec11ReportAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public class GenerateSpec11ReportAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java b/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
index 6e6d99856..a8d9df6ed 100644
--- a/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
+++ b/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
@@ -52,7 +52,11 @@ import org.json.JSONException;
* This calls {@link Spec11EmailUtils#emailSpec11Reports(SoyTemplateInfo, String, Set)} on
* success or {@link Spec11EmailUtils#sendAlertEmail(String, String)} on failure.
*/
-@Action(path = PublishSpec11ReportAction.PATH, method = POST, auth = Auth.AUTH_INTERNAL_OR_ADMIN)
+@Action(
+ service = Action.Service.BACKEND,
+ path = PublishSpec11ReportAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public class PublishSpec11ReportAction implements Runnable {
static final String PATH = "/_dr/task/publishSpec11";
diff --git a/java/google/registry/request/Action.java b/java/google/registry/request/Action.java
index dc9a446e6..fa475486f 100644
--- a/java/google/registry/request/Action.java
+++ b/java/google/registry/request/Action.java
@@ -28,6 +28,28 @@ public @interface Action {
/** HTTP methods recognized by the request processor. */
enum Method { GET, HEAD, POST }
+ /** App Engine services supported by the request processor. */
+ enum Service {
+ DEFAULT("default"),
+ TOOLS("tools"),
+ BACKEND("backend"),
+ PUBAPI("pubapi");
+
+ private final String serviceId;
+
+ Service(String serviceId) {
+ this.serviceId = serviceId;
+ }
+
+ /** Returns the actual service id in App Engine. */
+ public String getServiceId() {
+ return serviceId;
+ }
+ }
+
+ /** Which App Engine service this action lives on. */
+ Service service();
+
/** HTTP path to serve the action from. The path components must be percent-escaped. */
String path();
diff --git a/java/google/registry/request/RouterDisplayHelper.java b/java/google/registry/request/RouterDisplayHelper.java
index 9684f0aa3..c03d8d140 100644
--- a/java/google/registry/request/RouterDisplayHelper.java
+++ b/java/google/registry/request/RouterDisplayHelper.java
@@ -14,9 +14,11 @@
package google.registry.request;
+import static com.google.common.collect.ImmutableList.toImmutableList;
import static java.util.stream.Collectors.joining;
import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Streams;
import java.util.Map;
@@ -62,6 +64,18 @@ public class RouterDisplayHelper {
return formatRoutes(Router.extractRoutesFromComponent(componentClass).values());
}
+ public static ImmutableList Every three hours (max twenty-six hours) we generate CSV files for each TLD which we need
- * to upload to MarksDB. The upload is a two-phase process. We send the CSV data as a POST request
- * and get back a 202 Accepted. This response will give us a URL in the Location header, where
- * we'll check back later for the actual result.
+ * Every three hours (max twenty-six hours) we generate CSV files for each TLD which we need to
+ * upload to MarksDB. The upload is a two-phase process. We send the CSV data as a POST request and
+ * get back a 202 Accepted. This response will give us a URL in the Location header, where we'll
+ * check back later for the actual result.
*
* @see NordnUploadAction
* @see
- * http://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-5.2.3.3
+ * http://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-5.2.3.3
*/
@Action(
- path = NordnVerifyAction.PATH,
- method = Action.Method.POST,
- automaticallyPrintOk = true,
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.BACKEND,
+ path = NordnVerifyAction.PATH,
+ method = Action.Method.POST,
+ automaticallyPrintOk = true,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public final class NordnVerifyAction implements Runnable {
static final String PATH = "/_dr/task/nordnVerify";
diff --git a/java/google/registry/tmch/TmchCrlAction.java b/java/google/registry/tmch/TmchCrlAction.java
index a67e6190c..dc9a0eb52 100644
--- a/java/google/registry/tmch/TmchCrlAction.java
+++ b/java/google/registry/tmch/TmchCrlAction.java
@@ -28,11 +28,11 @@ import javax.inject.Inject;
/** Action to download the latest ICANN TMCH CRL from MarksDB. */
@Action(
- path = "/_dr/task/tmchCrl",
- method = POST,
- automaticallyPrintOk = true,
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.BACKEND,
+ path = "/_dr/task/tmchCrl",
+ method = POST,
+ automaticallyPrintOk = true,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public final class TmchCrlAction implements Runnable {
@Inject Marksdb marksdb;
diff --git a/java/google/registry/tmch/TmchDnlAction.java b/java/google/registry/tmch/TmchDnlAction.java
index 7f73684ac..353b5a773 100644
--- a/java/google/registry/tmch/TmchDnlAction.java
+++ b/java/google/registry/tmch/TmchDnlAction.java
@@ -30,11 +30,11 @@ import org.bouncycastle.openpgp.PGPException;
/** Action to download the latest domain name list (aka claims list) from MarksDB. */
@Action(
- path = "/_dr/task/tmchDnl",
- method = POST,
- automaticallyPrintOk = true,
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.BACKEND,
+ path = "/_dr/task/tmchDnl",
+ method = POST,
+ automaticallyPrintOk = true,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public final class TmchDnlAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/tmch/TmchSmdrlAction.java b/java/google/registry/tmch/TmchSmdrlAction.java
index 64d137d5e..0ddfd4ca2 100644
--- a/java/google/registry/tmch/TmchSmdrlAction.java
+++ b/java/google/registry/tmch/TmchSmdrlAction.java
@@ -30,11 +30,11 @@ import org.bouncycastle.openpgp.PGPException;
/** Action to download the latest signed mark revocation list from MarksDB. */
@Action(
- path = "/_dr/task/tmchSmdrl",
- method = POST,
- automaticallyPrintOk = true,
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.BACKEND,
+ path = "/_dr/task/tmchSmdrl",
+ method = POST,
+ automaticallyPrintOk = true,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public final class TmchSmdrlAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/tools/AppEngineConnection.java b/java/google/registry/tools/AppEngineConnection.java
index 2a71272fe..eb866a513 100644
--- a/java/google/registry/tools/AppEngineConnection.java
+++ b/java/google/registry/tools/AppEngineConnection.java
@@ -33,6 +33,7 @@ import com.google.common.net.MediaType;
import com.google.re2j.Matcher;
import com.google.re2j.Pattern;
import google.registry.config.RegistryConfig;
+import google.registry.request.Action.Service;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
@@ -65,24 +66,6 @@ class AppEngineConnection {
this.requestFactory = requestFactory;
}
- enum Service {
- DEFAULT("default"),
- TOOLS("tools"),
- BACKEND("backend"),
- PUBAPI("pubapi");
-
- private final String serviceId;
-
- Service(String serviceId) {
- this.serviceId = serviceId;
- }
-
- /** Returns the actual service id in App Engine. */
- String getServiceId() {
- return serviceId;
- }
- }
-
/** Returns a copy of this connection that talks to a different service. */
public AppEngineConnection withService(Service service) {
return new AppEngineConnection(service, requestFactory);
diff --git a/java/google/registry/tools/CurlCommand.java b/java/google/registry/tools/CurlCommand.java
index 9e0e744e5..f2bd39096 100644
--- a/java/google/registry/tools/CurlCommand.java
+++ b/java/google/registry/tools/CurlCommand.java
@@ -26,7 +26,7 @@ import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.MediaType;
-import google.registry.tools.AppEngineConnection.Service;
+import google.registry.request.Action.Service;
import java.util.List;
@Parameters(separators = " =", commandDescription = "Send an HTTP command to the nomulus server.")
diff --git a/java/google/registry/tools/SetNumInstancesCommand.java b/java/google/registry/tools/SetNumInstancesCommand.java
index 76c64fa43..64efc258f 100644
--- a/java/google/registry/tools/SetNumInstancesCommand.java
+++ b/java/google/registry/tools/SetNumInstancesCommand.java
@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSetMultimap;
import com.google.common.flogger.FluentLogger;
import google.registry.config.RegistryConfig.Config;
-import google.registry.tools.AppEngineConnection.Service;
+import google.registry.request.Action.Service;
import google.registry.util.AppEngineServiceUtils;
import java.io.IOException;
import java.util.List;
diff --git a/java/google/registry/tools/server/CreateGroupsAction.java b/java/google/registry/tools/server/CreateGroupsAction.java
index 49b17b1a6..e7d53b60f 100644
--- a/java/google/registry/tools/server/CreateGroupsAction.java
+++ b/java/google/registry/tools/server/CreateGroupsAction.java
@@ -41,10 +41,10 @@ import javax.inject.Inject;
/** Action that creates Google Groups for a registrar's mailing lists. */
@Action(
- path = CreateGroupsAction.PATH,
- method = POST,
- auth = Auth.AUTH_INTERNAL_OR_ADMIN
-)
+ service = Action.Service.TOOLS,
+ path = CreateGroupsAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public class CreateGroupsAction implements Runnable {
public static final String PATH = "/_dr/admin/createGroups";
diff --git a/java/google/registry/tools/server/CreatePremiumListAction.java b/java/google/registry/tools/server/CreatePremiumListAction.java
index bbbc46db3..13663f2d3 100644
--- a/java/google/registry/tools/server/CreatePremiumListAction.java
+++ b/java/google/registry/tools/server/CreatePremiumListAction.java
@@ -35,10 +35,10 @@ import javax.inject.Inject;
* command.
*/
@Action(
- path = CreatePremiumListAction.PATH,
- method = POST,
- auth = Auth.AUTH_INTERNAL_OR_ADMIN
-)
+ service = Action.Service.TOOLS,
+ path = CreatePremiumListAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public class CreatePremiumListAction extends CreateOrUpdatePremiumListAction {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/tools/server/DeleteEntityAction.java b/java/google/registry/tools/server/DeleteEntityAction.java
index fd83a8913..2491f951f 100644
--- a/java/google/registry/tools/server/DeleteEntityAction.java
+++ b/java/google/registry/tools/server/DeleteEntityAction.java
@@ -48,9 +48,9 @@ import javax.inject.Inject;
* exists an entity-specific deletion command, then use that one instead.
*/
@Action(
- path = DeleteEntityAction.PATH,
- auth = Auth.AUTH_INTERNAL_OR_ADMIN
-)
+ service = Action.Service.TOOLS,
+ path = DeleteEntityAction.PATH,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public class DeleteEntityAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/java/google/registry/tools/server/GenerateZoneFilesAction.java b/java/google/registry/tools/server/GenerateZoneFilesAction.java
index 5f575f35d..b6a273ec8 100644
--- a/java/google/registry/tools/server/GenerateZoneFilesAction.java
+++ b/java/google/registry/tools/server/GenerateZoneFilesAction.java
@@ -65,14 +65,14 @@ import org.joda.time.Duration;
* MapReduce that requests generation of BIND zone files for a set of TLDs at a given time.
*
* Zone files for each requested TLD are written to GCS. TLDs without entries produce zone files
- * with only a header. The export time must be at least two minutes in the past and no more than
- * 29 days in the past, and must be at midnight UTC.
+ * with only a header. The export time must be at least two minutes in the past and no more than 29
+ * days in the past, and must be at midnight UTC.
*/
@Action(
- path = GenerateZoneFilesAction.PATH,
- method = POST,
- auth = Auth.AUTH_INTERNAL_OR_ADMIN
-)
+ service = Action.Service.TOOLS,
+ path = GenerateZoneFilesAction.PATH,
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonAction {
public static final String PATH = "/_dr/task/generateZoneFiles";
diff --git a/java/google/registry/tools/server/KillAllCommitLogsAction.java b/java/google/registry/tools/server/KillAllCommitLogsAction.java
index 6aa78da4f..bb8a8bbaa 100644
--- a/java/google/registry/tools/server/KillAllCommitLogsAction.java
+++ b/java/google/registry/tools/server/KillAllCommitLogsAction.java
@@ -45,10 +45,10 @@ import javax.inject.Inject;
* the drastic consequences of accidental execution.
*/
@Action(
- path = "/_dr/task/killAllCommitLogs",
- method = POST,
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.TOOLS,
+ path = "/_dr/task/killAllCommitLogs",
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public class KillAllCommitLogsAction implements Runnable {
@Inject MapreduceRunner mrRunner;
diff --git a/java/google/registry/tools/server/KillAllEppResourcesAction.java b/java/google/registry/tools/server/KillAllEppResourcesAction.java
index c71e8355a..e3483a6e1 100644
--- a/java/google/registry/tools/server/KillAllEppResourcesAction.java
+++ b/java/google/registry/tools/server/KillAllEppResourcesAction.java
@@ -41,10 +41,10 @@ import javax.inject.Inject;
* the drastic consequences of accidental execution.
*/
@Action(
- path = "/_dr/task/killAllEppResources",
- method = POST,
- auth = Auth.AUTH_INTERNAL_ONLY
-)
+ service = Action.Service.TOOLS,
+ path = "/_dr/task/killAllEppResources",
+ method = POST,
+ auth = Auth.AUTH_INTERNAL_ONLY)
public class KillAllEppResourcesAction implements Runnable {
@Inject MapreduceRunner mrRunner;
diff --git a/java/google/registry/tools/server/ListDomainsAction.java b/java/google/registry/tools/server/ListDomainsAction.java
index 7d2a22c78..495ce82c0 100644
--- a/java/google/registry/tools/server/ListDomainsAction.java
+++ b/java/google/registry/tools/server/ListDomainsAction.java
@@ -41,6 +41,7 @@ import org.joda.time.DateTime;
/** An action that lists domains, for use by the {@code nomulus list_domains} command. */
@Action(
+ service = Action.Service.TOOLS,
path = ListDomainsAction.PATH,
method = {GET, POST},
auth = Auth.AUTH_INTERNAL_OR_ADMIN)
diff --git a/java/google/registry/tools/server/ListHostsAction.java b/java/google/registry/tools/server/ListHostsAction.java
index 0c5f4dd52..2b589619e 100644
--- a/java/google/registry/tools/server/ListHostsAction.java
+++ b/java/google/registry/tools/server/ListHostsAction.java
@@ -32,10 +32,10 @@ import org.joda.time.DateTime;
/** An action that lists hosts, for use by the {@code nomulus list_hosts} command. */
@Action(
- path = ListHostsAction.PATH,
- method = {GET, POST},
- auth = Auth.AUTH_INTERNAL_OR_ADMIN
-)
+ service = Action.Service.TOOLS,
+ path = ListHostsAction.PATH,
+ method = {GET, POST},
+ auth = Auth.AUTH_INTERNAL_OR_ADMIN)
public final class ListHostsAction extends ListObjectsAction