mirror of
https://github.com/google/nomulus.git
synced 2025-05-16 09:27:16 +02:00
Move restore from backend to tools
Move the "restoreCommitLogs" command from the backend module to the tools module so it's easier to access with nomulus. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156768389
This commit is contained in:
parent
9ee9229456
commit
e6af34301d
7 changed files with 22 additions and 9 deletions
|
@ -12,6 +12,7 @@ java_library(
|
||||||
"//java/google/registry/cron",
|
"//java/google/registry/cron",
|
||||||
"//java/google/registry/model",
|
"//java/google/registry/model",
|
||||||
"//java/google/registry/request",
|
"//java/google/registry/request",
|
||||||
|
"//java/google/registry/request/auth",
|
||||||
"//java/google/registry/util",
|
"//java/google/registry/util",
|
||||||
"//third_party/java/objectify:objectify-v4_1",
|
"//third_party/java/objectify:objectify-v4_1",
|
||||||
"@com_google_appengine_api_1_0_sdk",
|
"@com_google_appengine_api_1_0_sdk",
|
||||||
|
|
|
@ -41,6 +41,8 @@ import google.registry.model.ofy.CommitLogManifest;
|
||||||
import google.registry.model.ofy.CommitLogMutation;
|
import google.registry.model.ofy.CommitLogMutation;
|
||||||
import google.registry.request.Action;
|
import google.registry.request.Action;
|
||||||
import google.registry.request.Parameter;
|
import google.registry.request.Parameter;
|
||||||
|
import google.registry.request.auth.Auth;
|
||||||
|
import google.registry.request.auth.AuthLevel;
|
||||||
import google.registry.util.FormattingLogger;
|
import google.registry.util.FormattingLogger;
|
||||||
import google.registry.util.Retrier;
|
import google.registry.util.Retrier;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -59,7 +61,14 @@ import org.joda.time.DateTime;
|
||||||
@Action(
|
@Action(
|
||||||
path = RestoreCommitLogsAction.PATH,
|
path = RestoreCommitLogsAction.PATH,
|
||||||
method = Action.Method.POST,
|
method = Action.Method.POST,
|
||||||
automaticallyPrintOk = true)
|
automaticallyPrintOk = true,
|
||||||
|
auth =
|
||||||
|
@Auth(
|
||||||
|
methods = {Auth.AuthMethod.INTERNAL, Auth.AuthMethod.API},
|
||||||
|
minimumLevel = AuthLevel.APP,
|
||||||
|
userPolicy = Auth.UserPolicy.ADMIN
|
||||||
|
)
|
||||||
|
)
|
||||||
public class RestoreCommitLogsAction implements Runnable {
|
public class RestoreCommitLogsAction implements Runnable {
|
||||||
|
|
||||||
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
|
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
|
||||||
|
|
|
@ -181,12 +181,6 @@
|
||||||
<url-pattern>/_dr/task/exportCommitLogDiff</url-pattern>
|
<url-pattern>/_dr/task/exportCommitLogDiff</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
<!-- Restores commit logs. -->
|
|
||||||
<servlet-mapping>
|
|
||||||
<servlet-name>backend-servlet</servlet-name>
|
|
||||||
<url-pattern>/_dr/task/restoreCommitLogs</url-pattern>
|
|
||||||
</servlet-mapping>
|
|
||||||
|
|
||||||
<!-- Deletes commit logs. -->
|
<!-- Deletes commit logs. -->
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>backend-servlet</servlet-name>
|
<servlet-name>backend-servlet</servlet-name>
|
||||||
|
|
|
@ -84,6 +84,12 @@
|
||||||
<url-pattern>/_dr/task/killAllCommitLogs</url-pattern>
|
<url-pattern>/_dr/task/killAllCommitLogs</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
|
<!-- Restores commit logs. -->
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>tools-servlet</servlet-name>
|
||||||
|
<url-pattern>/_dr/task/restoreCommitLogs</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
|
||||||
<!-- This path serves up the App Engine results page for mapreduce runs. -->
|
<!-- This path serves up the App Engine results page for mapreduce runs. -->
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>mapreduce</servlet-name>
|
<servlet-name>mapreduce</servlet-name>
|
||||||
|
|
|
@ -20,7 +20,6 @@ import google.registry.backup.BackupModule;
|
||||||
import google.registry.backup.CommitLogCheckpointAction;
|
import google.registry.backup.CommitLogCheckpointAction;
|
||||||
import google.registry.backup.DeleteOldCommitLogsAction;
|
import google.registry.backup.DeleteOldCommitLogsAction;
|
||||||
import google.registry.backup.ExportCommitLogDiffAction;
|
import google.registry.backup.ExportCommitLogDiffAction;
|
||||||
import google.registry.backup.RestoreCommitLogsAction;
|
|
||||||
import google.registry.batch.BatchModule;
|
import google.registry.batch.BatchModule;
|
||||||
import google.registry.batch.DeleteContactsAndHostsAction;
|
import google.registry.batch.DeleteContactsAndHostsAction;
|
||||||
import google.registry.batch.DeleteProberDataAction;
|
import google.registry.batch.DeleteProberDataAction;
|
||||||
|
@ -127,7 +126,6 @@ interface BackendRequestComponent {
|
||||||
RdeReporter rdeReporter();
|
RdeReporter rdeReporter();
|
||||||
RefreshDnsAction refreshDnsAction();
|
RefreshDnsAction refreshDnsAction();
|
||||||
RefreshDnsOnHostRenameAction refreshDnsOnHostRenameAction();
|
RefreshDnsOnHostRenameAction refreshDnsOnHostRenameAction();
|
||||||
RestoreCommitLogsAction restoreCommitLogsAction();
|
|
||||||
SyncGroupMembersAction syncGroupMembersAction();
|
SyncGroupMembersAction syncGroupMembersAction();
|
||||||
SyncRegistrarsSheetAction syncRegistrarsSheetAction();
|
SyncRegistrarsSheetAction syncRegistrarsSheetAction();
|
||||||
TldFanoutAction tldFanoutAction();
|
TldFanoutAction tldFanoutAction();
|
||||||
|
|
|
@ -8,6 +8,7 @@ java_library(
|
||||||
name = "tools",
|
name = "tools",
|
||||||
srcs = glob(["*.java"]),
|
srcs = glob(["*.java"]),
|
||||||
deps = [
|
deps = [
|
||||||
|
"//java/google/registry/backup",
|
||||||
"//java/google/registry/config",
|
"//java/google/registry/config",
|
||||||
"//java/google/registry/dns",
|
"//java/google/registry/dns",
|
||||||
"//java/google/registry/export",
|
"//java/google/registry/export",
|
||||||
|
|
|
@ -16,6 +16,8 @@ package google.registry.module.tools;
|
||||||
|
|
||||||
import dagger.Module;
|
import dagger.Module;
|
||||||
import dagger.Subcomponent;
|
import dagger.Subcomponent;
|
||||||
|
import google.registry.backup.BackupModule;
|
||||||
|
import google.registry.backup.RestoreCommitLogsAction;
|
||||||
import google.registry.dns.DnsModule;
|
import google.registry.dns.DnsModule;
|
||||||
import google.registry.export.PublishDetailReportAction;
|
import google.registry.export.PublishDetailReportAction;
|
||||||
import google.registry.flows.EppToolAction;
|
import google.registry.flows.EppToolAction;
|
||||||
|
@ -50,6 +52,7 @@ import google.registry.tools.server.javascrap.RefreshAllDomainsAction;
|
||||||
@RequestScope
|
@RequestScope
|
||||||
@Subcomponent(
|
@Subcomponent(
|
||||||
modules = {
|
modules = {
|
||||||
|
BackupModule.class,
|
||||||
DnsModule.class,
|
DnsModule.class,
|
||||||
EppToolModule.class,
|
EppToolModule.class,
|
||||||
LoadTestModule.class,
|
LoadTestModule.class,
|
||||||
|
@ -77,6 +80,7 @@ interface ToolsRequestComponent {
|
||||||
PublishDetailReportAction publishDetailReportAction();
|
PublishDetailReportAction publishDetailReportAction();
|
||||||
RefreshAllDomainsAction refreshAllDomainsAction();
|
RefreshAllDomainsAction refreshAllDomainsAction();
|
||||||
ResaveAllEppResourcesAction resaveAllEppResourcesAction();
|
ResaveAllEppResourcesAction resaveAllEppResourcesAction();
|
||||||
|
RestoreCommitLogsAction restoreCommitLogsAction();
|
||||||
UpdatePremiumListAction updatePremiumListAction();
|
UpdatePremiumListAction updatePremiumListAction();
|
||||||
VerifyOteAction verifyOteAction();
|
VerifyOteAction verifyOteAction();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue