Remove tests for legacy keystore format

distribution/tools/keystore-cli/src/test/java/org/opensearch/tools/cli/keystore/KeyStoreWrapperTests.java

@@ -61,12 +61,10 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.MessageDigest;
@@ -413,31 +411,6 @@ public void testStringAndFileDistinction() throws Exception {
         assertThat(toByteArray(afterSave.getFile("file_setting")), equalTo("file_value".getBytes(StandardCharsets.UTF_8)));
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/468")
-    public void testLegacyV3() throws GeneralSecurityException, IOException {
-        final Path configDir = createTempDir();
-        final Path keystore = configDir.resolve("opensearch.keystore");
-        try (
-            InputStream is = KeyStoreWrapperTests.class.getResourceAsStream("/format-v3-opensearch.keystore");
-            OutputStream os = Files.newOutputStream(keystore)
-        ) {
-            final byte[] buffer = new byte[4096];
-            int readBytes;
-            while ((readBytes = is.read(buffer)) > 0) {
-                os.write(buffer, 0, readBytes);
-            }
-        }
-        final KeyStoreWrapper wrapper = KeyStoreWrapper.load(configDir);
-        assertNotNull(wrapper);
-        wrapper.decrypt(new char[0]);
-        assertThat(wrapper.getFormatVersion(), equalTo(3));
-        assertThat(wrapper.getSettingNames(), equalTo(new HashSet<>(Arrays.asList("keystore.seed", "string_setting", "file_setting"))));
-        assertThat(wrapper.getString("string_setting"), equalTo("string_value"));
-        assertThat(toByteArray(wrapper.getFile("string_setting")), equalTo("string_value".getBytes(StandardCharsets.UTF_8)));
-        assertThat(wrapper.getString("file_setting"), equalTo("file_value"));
-        assertThat(toByteArray(wrapper.getFile("file_setting")), equalTo("file_value".getBytes(StandardCharsets.UTF_8)));
-    }
-
     private void generateV1() throws IOException, NoSuchAlgorithmException, NoSuchProviderException, CertificateException,
         InvalidKeySpecException, KeyStoreException {
         Path configDir = env.configDir();

distribution/tools/keystore-cli/src/test/java/org/opensearch/tools/cli/keystore/UpgradeKeyStoreCommandTests.java

@@ -37,15 +37,9 @@
 import org.opensearch.common.settings.KeyStoreWrapper;
 import org.opensearch.env.Environment;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Map;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasToString;
 
 public class UpgradeKeyStoreCommandTests extends KeyStoreCommandTestCase {
@@ -62,32 +56,6 @@ protected Environment createEnv(final Map<String, String> settings) {
         };
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/468")
-    public void testKeystoreUpgrade() throws Exception {
-        final Path keystore = KeyStoreWrapper.keystorePath(env.configDir());
-        try (
-            InputStream is = KeyStoreWrapperTests.class.getResourceAsStream("/format-v3-opensearch.keystore");
-            OutputStream os = Files.newOutputStream(keystore)
-        ) {
-            final byte[] buffer = new byte[4096];
-            int read;
-            while ((read = is.read(buffer, 0, buffer.length)) >= 0) {
-                os.write(buffer, 0, read);
-            }
-        }
-        try (KeyStoreWrapper beforeUpgrade = KeyStoreWrapper.load(env.configDir())) {
-            assertNotNull(beforeUpgrade);
-            assertThat(beforeUpgrade.getFormatVersion(), equalTo(3));
-        }
-        execute();
-        try (KeyStoreWrapper afterUpgrade = KeyStoreWrapper.load(env.configDir())) {
-            assertNotNull(afterUpgrade);
-            assertThat(afterUpgrade.getFormatVersion(), equalTo(KeyStoreWrapper.FORMAT_VERSION));
-            afterUpgrade.decrypt(new char[0]);
-            assertThat(afterUpgrade.getSettingNames(), hasItem(KeyStoreWrapper.SEED_SETTING.getKey()));
-        }
-    }
-
     public void testKeystoreDoesNotExist() {
         final UserException e = expectThrows(UserException.class, this::execute);
         assertThat(e, hasToString(containsString("keystore not found at [" + KeyStoreWrapper.keystorePath(env.configDir()) + "]")));