Remove application-space backup creation in favor of automated backups

signalapp · Dec 13, 2024 · 2e06a67 · 2e06a67
1 parent 9763ffe
commit 2e06a67
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 260 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 configuration_repo = ../configuration
-configuration_files = config/production.yml config/staging.yml config/staging-build.properties config/production-build.properties config/appengine-production/app.yaml config/appengine-production/cron.yaml config/appengine-staging/app.yaml config/appengine-staging/cron.yaml
+configuration_files = config/production.yml config/staging.yml config/staging-build.properties config/production-build.properties config/appengine-production/app.yaml config/appengine-staging/app.yaml
 
 .NOTPARALLEL:
 .PHONY: help copy-config deploy-staging deploy-production

diff --git a/src/main/java/org/signal/storageservice/StorageService.java b/src/main/java/org/signal/storageservice/StorageService.java
@@ -11,8 +11,6 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
-import com.google.cloud.bigtable.admin.v2.BigtableTableAdminSettings;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
 import com.google.common.collect.ImmutableMap;
@@ -29,7 +27,6 @@
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.datadog.DatadogMeterRegistry;
 import java.time.Clock;
-import java.util.List;
 import java.util.Set;
 import org.signal.libsignal.zkgroup.ServerSecretParams;
 import org.signal.libsignal.zkgroup.auth.ServerZkAuthOperations;
@@ -39,7 +36,6 @@
 import org.signal.storageservice.auth.GroupUserAuthenticator;
 import org.signal.storageservice.auth.User;
 import org.signal.storageservice.auth.UserAuthenticator;
-import org.signal.storageservice.controllers.BackupsController;
 import org.signal.storageservice.controllers.GroupsController;
 import org.signal.storageservice.controllers.GroupsV1Controller;
 import org.signal.storageservice.controllers.HealthCheckController;
@@ -58,7 +54,6 @@
 import org.signal.storageservice.providers.ProtocolBufferValidationErrorMessageBodyWriter;
 import org.signal.storageservice.s3.PolicySigner;
 import org.signal.storageservice.s3.PostPolicyGenerator;
-import org.signal.storageservice.storage.BackupsManager;
 import org.signal.storageservice.storage.GroupsManager;
 import org.signal.storageservice.storage.StorageManager;
 import org.signal.storageservice.util.HostnameUtil;
@@ -90,12 +85,6 @@ public void run(StorageServiceConfiguration config, Environment environment) thr
 
     UncaughtExceptionHandler.register();
 
-    BigtableTableAdminSettings bigtableTableAdminSettings = BigtableTableAdminSettings.newBuilder()
-                                                                                      .setProjectId(config.getBigTableConfiguration().getProjectId())
-                                                                                      .setInstanceId(config.getBigTableConfiguration().getInstanceId())
-                                                                                      .build();
-    BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create(bigtableTableAdminSettings);
-
     BigtableDataSettings bigtableDataSettings = BigtableDataSettings.newBuilder()
                                                                     .setProjectId(config.getBigTableConfiguration().getProjectId())
                                                                     .setInstanceId(config.getBigTableConfiguration().getInstanceId())
@@ -104,11 +93,6 @@ public void run(StorageServiceConfiguration config, Environment environment) thr
     ServerSecretParams serverSecretParams = new ServerSecretParams(config.getZkConfiguration().getServerSecret());
     StorageManager     storageManager     = new StorageManager(bigtableDataClient, config.getBigTableConfiguration().getContactManifestsTableId(), config.getBigTableConfiguration().getContactsTableId());
     GroupsManager      groupsManager      = new GroupsManager(bigtableDataClient, config.getBigTableConfiguration().getGroupsTableId(), config.getBigTableConfiguration().getGroupLogsTableId());
-    BackupsManager backupsManager = new BackupsManager(bigtableTableAdminClient, config.getBigTableConfiguration().getClusterId(), List.of(
-            config.getBigTableConfiguration().getContactManifestsTableId(),
-            config.getBigTableConfiguration().getContactsTableId(),
-            config.getBigTableConfiguration().getGroupLogsTableId(),
-            config.getBigTableConfiguration().getGroupsTableId()));
 
     environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     environment.getObjectMapper().setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
@@ -141,7 +125,6 @@ public void run(StorageServiceConfiguration config, Environment environment) thr
             config.getBigTableConfiguration().getContactsTableId(),
             config.getBigTableConfiguration().getContactManifestsTableId()),
         config.getWarmUpConfiguration().count()));
-    environment.jersey().register(new BackupsController(backupsManager));
     environment.jersey().register(new StorageController(storageManager));
     environment.jersey().register(new GroupsController(Clock.systemUTC(), groupsManager, serverSecretParams, policySigner, postPolicyGenerator, config.getGroupConfiguration(), externalGroupCredentialGenerator));
     environment.jersey().register(new GroupsV1Controller(Clock.systemUTC(), groupsManager, serverSecretParams, policySigner, postPolicyGenerator, config.getGroupConfiguration(), externalGroupCredentialGenerator));

diff --git a/src/main/java/org/signal/storageservice/configuration/BigTableConfiguration.java b/src/main/java/org/signal/storageservice/configuration/BigTableConfiguration.java
@@ -19,10 +19,6 @@ public class BigTableConfiguration {
   @NotEmpty
   private String instanceId;
 
-  @JsonProperty
-  @NotEmpty
-  private String clusterId;
-
   @JsonProperty
   @NotEmpty
   private String contactManifestsTableId;
@@ -48,10 +44,6 @@ public String getInstanceId() {
     return instanceId;
   }
 
-  public String getClusterId() {
-    return clusterId;
-  }
-
   public String getContactManifestsTableId() {
     return contactManifestsTableId;
   }

diff --git a/src/main/java/org/signal/storageservice/controllers/BackupsController.java b/src/main/java/org/signal/storageservice/controllers/BackupsController.java
diff --git a/src/main/java/org/signal/storageservice/storage/BackupsManager.java b/src/main/java/org/signal/storageservice/storage/BackupsManager.java
diff --git a/src/test/java/org/signal/storageservice/controllers/BackupsControllerTest.java b/src/test/java/org/signal/storageservice/controllers/BackupsControllerTest.java