Retire AttachmentControllerV3

signalapp · Oct 17, 2024 · eb80305 · eb80305
1 parent 865e3c5
commit eb80305
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 79 deletions.
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -111,7 +111,6 @@
 import org.whispersystems.textsecuregcm.controllers.ArchiveController;
 import org.whispersystems.textsecuregcm.controllers.ArtController;
 import org.whispersystems.textsecuregcm.controllers.AttachmentControllerV2;
-import org.whispersystems.textsecuregcm.controllers.AttachmentControllerV3;
 import org.whispersystems.textsecuregcm.controllers.AttachmentControllerV4;
 import org.whispersystems.textsecuregcm.controllers.CallLinkController;
 import org.whispersystems.textsecuregcm.controllers.CallRoutingController;
@@ -1101,7 +1100,6 @@ protected void configureServer(final ServerBuilder<?> serverBuilder) {
             config.getAwsAttachmentsConfiguration().credentials().accessKeyId().value(),
             config.getAwsAttachmentsConfiguration().credentials().secretAccessKey().value(),
             config.getAwsAttachmentsConfiguration().region(), config.getAwsAttachmentsConfiguration().bucket()),
-        new AttachmentControllerV3(rateLimiters, gcsAttachmentGenerator),
         new AttachmentControllerV4(rateLimiters, gcsAttachmentGenerator, tusAttachmentGenerator,
             experimentEnrollmentManager),
         new ArchiveController(backupAuthManager, backupManager),

diff --git a/...ce/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerV3.java b/...ce/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerV3.java
diff --git a/.../src/test/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerTest.java b/.../src/test/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerTest.java
@@ -95,7 +95,6 @@ class AttachmentControllerTest {
           .setTestContainerFactory(new GrizzlyWebTestContainerFactory())
           .addResource(new AttachmentControllerV2(RATE_LIMITERS, "accessKey", "accessSecret", "us-east-1",
               "attachmentv2-bucket"))
-          .addResource(new AttachmentControllerV3(RATE_LIMITERS, gcsAttachmentGenerator))
           .addProvider(new AttachmentControllerV4(RATE_LIMITERS,
               gcsAttachmentGenerator,
               new TusAttachmentGenerator(new TusConfiguration(new SecretBytes(TUS_SECRET), TUS_URL)),
@@ -132,16 +131,6 @@ void testV4GcsForm() {
     assertValidCdn2Response(descriptor);
   }
 
-  @Test
-  void testV3Form() {
-    AttachmentDescriptorV3 descriptor = resources.getJerseyTest()
-            .target("/v3/attachments/form/upload")
-            .request()
-            .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
-            .get(AttachmentDescriptorV3.class);
-    assertValidCdn2Response(descriptor);
-  }
-
   private static void assertValidCdn2Response(final AttachmentDescriptorV3 descriptor) {
     assertThat(descriptor.key()).isNotBlank();
     assertThat(descriptor.cdn()).isEqualTo(2);