diff --git a/core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml index d7ef4fe5c..9b1411a3f 100644 --- a/core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml +++ b/core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml @@ -337,12 +337,18 @@ /_dr/task/refreshDnsOnHostRename - + backend-servlet /_dr/task/expandRecurringBillingEvents + + + backend-servlet + /_dr/task/deleteExpiredDomains + + backend-servlet diff --git a/core/src/main/java/google/registry/module/backend/BackendComponent.java b/core/src/main/java/google/registry/module/backend/BackendComponent.java index 82cee8857..bab38c2dc 100644 --- a/core/src/main/java/google/registry/module/backend/BackendComponent.java +++ b/core/src/main/java/google/registry/module/backend/BackendComponent.java @@ -24,6 +24,8 @@ import google.registry.dns.writer.VoidDnsWriterModule; import google.registry.export.DriveModule; import google.registry.export.datastore.DatastoreAdminModule; import google.registry.export.sheet.SheetsServiceModule; +import google.registry.flows.ServerTridProviderModule; +import google.registry.flows.custom.CustomLogicFactoryModule; import google.registry.gcs.GcsServiceModule; import google.registry.groups.DirectoryModule; import google.registry.groups.GroupsModule; @@ -54,6 +56,7 @@ import javax.inject.Singleton; BigqueryModule.class, ConfigModule.class, CredentialModule.class, + CustomLogicFactoryModule.class, DatastoreAdminModule.class, DatastoreServiceModule.class, DirectoryModule.class, @@ -68,6 +71,7 @@ import javax.inject.Singleton; KeyringModule.class, KmsModule.class, NetHttpTransportModule.class, + ServerTridProviderModule.class, SheetsServiceModule.class, StackdriverModule.class, URLFetchServiceModule.class, diff --git a/core/src/main/java/google/registry/module/backend/BackendRequestComponent.java b/core/src/main/java/google/registry/module/backend/BackendRequestComponent.java index 061fadaf8..8bcb551d0 100644 --- a/core/src/main/java/google/registry/module/backend/BackendRequestComponent.java +++ b/core/src/main/java/google/registry/module/backend/BackendRequestComponent.java @@ -22,6 +22,7 @@ import google.registry.backup.DeleteOldCommitLogsAction; import google.registry.backup.ExportCommitLogDiffAction; import google.registry.batch.BatchModule; import google.registry.batch.DeleteContactsAndHostsAction; +import google.registry.batch.DeleteExpiredDomainsAction; import google.registry.batch.DeleteLoadTestDataAction; import google.registry.batch.DeleteProberDataAction; import google.registry.batch.ExpandRecurringBillingEventsAction; @@ -52,6 +53,7 @@ import google.registry.export.UpdateSnapshotViewAction; import google.registry.export.UploadDatastoreBackupAction; import google.registry.export.sheet.SheetModule; import google.registry.export.sheet.SyncRegistrarsSheetAction; +import google.registry.flows.FlowComponent; import google.registry.mapreduce.MapreduceModule; import google.registry.monitoring.whitebox.WhiteboxModule; import google.registry.rdap.UpdateRegistrarRdapBaseUrlsAction; @@ -127,6 +129,8 @@ interface BackendRequestComponent { DeleteContactsAndHostsAction deleteContactsAndHostsAction(); + DeleteExpiredDomainsAction deleteExpiredDomainsAction(); + DeleteLoadTestDataAction deleteLoadTestDataAction(); DeleteOldCommitLogsAction deleteOldCommitLogsAction(); @@ -143,6 +147,8 @@ interface BackendRequestComponent { ExportReservedTermsAction exportReservedTermsAction(); + FlowComponent.Builder flowComponentBuilder(); + GenerateInvoicesAction generateInvoicesAction(); GenerateSpec11ReportAction generateSpec11ReportAction(); diff --git a/core/src/test/resources/google/registry/module/backend/backend_routing.txt b/core/src/test/resources/google/registry/module/backend/backend_routing.txt index e65577530..6ee85fba4 100644 --- a/core/src/test/resources/google/registry/module/backend/backend_routing.txt +++ b/core/src/test/resources/google/registry/module/backend/backend_routing.txt @@ -9,6 +9,7 @@ PATH CLASS METHOD /_dr/task/checkDatastoreBackup CheckBackupAction POST,GET y INTERNAL,API APP ADMIN /_dr/task/copyDetailReports CopyDetailReportsAction POST n INTERNAL,API APP ADMIN /_dr/task/deleteContactsAndHosts DeleteContactsAndHostsAction GET n INTERNAL,API APP ADMIN +/_dr/task/deleteExpiredDomains DeleteExpiredDomainsAction POST n INTERNAL,API APP ADMIN /_dr/task/deleteLoadTestData DeleteLoadTestDataAction POST n INTERNAL,API APP ADMIN /_dr/task/deleteOldCommitLogs DeleteOldCommitLogsAction GET n INTERNAL,API APP ADMIN /_dr/task/deleteProberData DeleteProberDataAction POST n INTERNAL,API APP ADMIN