From d7a3c12bbe504260ec03a8ff6d485907a909ce1f Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Mon, 3 Jan 2022 14:23:25 -0800 Subject: [PATCH] Drop unused DynamoDB class rules --- .../storage/KeysDynamoDbRule.java | 44 --------------- .../tests/util/LocalDynamoDbRule.java | 54 ------------------- 2 files changed, 98 deletions(-) delete mode 100644 service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDbRule.java delete mode 100644 service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocalDynamoDbRule.java diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDbRule.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDbRule.java deleted file mode 100644 index 297daf432..000000000 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDbRule.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2021 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.whispersystems.textsecuregcm.storage; - -import org.whispersystems.textsecuregcm.tests.util.LocalDynamoDbRule; -import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; -import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; -import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; -import software.amazon.awssdk.services.dynamodb.model.KeyType; -import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput; -import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; - -public class KeysDynamoDbRule extends LocalDynamoDbRule { - public static final String TABLE_NAME = "Signal_Keys_Test"; - - @Override - protected void before() throws Throwable { - super.before(); - getDynamoDbClient().createTable(CreateTableRequest.builder() - .tableName(TABLE_NAME) - .keySchema( - KeySchemaElement.builder().attributeName(Keys.KEY_ACCOUNT_UUID).keyType(KeyType.HASH).build(), - KeySchemaElement.builder().attributeName(Keys.KEY_DEVICE_ID_KEY_ID).keyType(KeyType.RANGE) - .build()) - .attributeDefinitions(AttributeDefinition.builder() - .attributeName(Keys.KEY_ACCOUNT_UUID) - .attributeType(ScalarAttributeType.B) - .build(), - AttributeDefinition.builder() - .attributeName(Keys.KEY_DEVICE_ID_KEY_ID) - .attributeType(ScalarAttributeType.B) - .build()) - .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(20L).writeCapacityUnits(20L).build()) - .build()); - } - - @Override - protected void after() { - super.after(); - } -} diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocalDynamoDbRule.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocalDynamoDbRule.java deleted file mode 100644 index 1b494ee6f..000000000 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/LocalDynamoDbRule.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2021 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.whispersystems.textsecuregcm.tests.util; - -import com.almworks.sqlite4java.SQLite; -import com.amazonaws.services.dynamodbv2.local.main.ServerRunner; -import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer; -import org.junit.rules.ExternalResource; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.dynamodb.DynamoDbClient; - -import java.net.ServerSocket; -import java.net.URI; - -public class LocalDynamoDbRule extends ExternalResource { - private DynamoDBProxyServer server; - private int port; - - @Override - protected void before() throws Throwable { - super.before(); - SQLite.setLibraryPath("target/lib"); // if you see a library failed to load error, you need to run mvn test-compile at least once first - ServerSocket serverSocket = new ServerSocket(0); - serverSocket.setReuseAddress(false); - port = serverSocket.getLocalPort(); - serverSocket.close(); - server = ServerRunner.createServerFromCommandLineArgs(new String[]{"-inMemory", "-port", String.valueOf(port)}); - server.start(); - } - - @Override - protected void after() { - try { - server.stop(); - } catch (Exception e) { - throw new RuntimeException(e); - } - super.after(); - } - - public DynamoDbClient getDynamoDbClient() { - return DynamoDbClient.builder() - .endpointOverride(URI.create("http://localhost:" + port)) - .region(Region.of("local-test-region")) - .credentialsProvider(StaticCredentialsProvider.create( - AwsBasicCredentials.create("accessKey", "secretKey"))) - .build(); - } -}