Skip to content

Commit

Permalink
fix UTs
Browse files Browse the repository at this point in the history 
Signed-off-by: bansvaru <[email protected]>
  • Loading branch information
@linuxpi
linuxpi committed Sep 7, 2023
1 parent c6cacdd commit 80cc40d
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 29 deletions.
1 change: 1 addition & 0 deletions server/src/test/java/org/opensearch/cluster/coordination/CoordinationStateTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,7 @@ public void testHandlePrePublishAndCommitWhenRemoteStateEnabled() throws IOExcep
.put("node.attr." + REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY, randomRepoName)
.put(stateRepoTypeAttributeKey, FsRepository.TYPE)
.put(stateRepoSettingsAttributeKeyPrefix + "location", "randomRepoPath")
.put(RemoteClusterStateService.REMOTE_CLUSTER_STATE_ENABLED_SETTING.getKey(), true)
.build();

final CoordinationState coordinationState = createCoordinationState(persistedStateRegistry, node1, settings);
Expand Down
83 changes: 54 additions & 29 deletions server/src/test/java/org/opensearch/node/RemoteStoreNodeAttributeTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,49 @@

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Locale;
import java.util.Map;

import static java.util.Collections.emptySet;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_CRYPTO_ATTRIBUTE_KEY_FORMAT;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_CRYPTO_SETTINGS_PREFIX;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY;
import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY;

public class RemoteStoreNodeAttributeTests extends OpenSearchTestCase {

static private final String KEY_ARN = "arn:aws:kms:us-east-1:123456789:key/6e9aa906-2cc3-4924-8ded-f385c78d9dcf";
static private final String REGION = "us-east-1";

public void testCryptoMetadata() throws UnknownHostException {
String repoName = "remote-store-A";
String repoTypeSettingKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT, repoName);
String repoSettingsKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX, repoName);
String repoCryptoMetadataKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_CRYPTO_ATTRIBUTE_KEY_FORMAT, repoName);
String repoCryptoMetadataSettingsKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_CRYPTO_SETTINGS_PREFIX, repoName);
Map<String, String> attr = Map.of(
"remote_store.segment.repository",
"remote-store-A",
"remote_store.translog.repository",
"remote-store-A",
"remote_store.repository.remote-store-A.type",
REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
repoTypeSettingKey,
"s3",
"remote_store.repository.remote-store-A.settings.bucket",
repoSettingsKey,
"abc",
"remote_store.repository.remote-store-A.settings.base_path",
repoSettingsKey + "base_path",
"xyz",
"remote_store.repository.remote-store-A.crypto_metadata.key_provider_name",
repoCryptoMetadataKey + ".key_provider_name",
"store-test",
"remote_store.repository.remote-store-A.crypto_metadata.key_provider_type",
repoCryptoMetadataKey + ".key_provider_type",
"aws-kms",
"remote_store.repository.remote-store-A.crypto_metadata.settings.region",
repoCryptoMetadataSettingsKey + ".region",
REGION,
"remote_store.repository.remote-store-A.crypto_metadata.settings.key_arn",
repoCryptoMetadataSettingsKey + ".key_arn",
KEY_ARN
);
DiscoveryNode node = new DiscoveryNode(
Expand All @@ -68,22 +83,27 @@ public void testCryptoMetadata() throws UnknownHostException {
}

public void testInvalidCryptoMetadata() throws UnknownHostException {
String repoName = "remote-store-A";
String repoTypeSettingKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT, repoName);
String repoSettingsKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX, repoName);
String repoCryptoMetadataKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_CRYPTO_ATTRIBUTE_KEY_FORMAT, repoName);
String repoCryptoMetadataSettingsKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_CRYPTO_SETTINGS_PREFIX, repoName);
Map<String, String> attr = Map.of(
"remote_store.segment.repository",
"remote-store-A",
"remote_store.translog.repository",
"remote-store-A",
"remote_store.repository.remote-store-A.type",
REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
repoTypeSettingKey,
"s3",
"remote_store.repository.remote-store-A.settings.bucket",
repoSettingsKey,
"abc",
"remote_store.repository.remote-store-A.settings.base_path",
repoSettingsKey + "base_path",
"xyz",
"remote_store.repository.remote-store-A.crypto_metadata.key_provider_name",
"store-test",
"remote_store.repository.remote-store-A.crypto_metadata.settings.region",
repoCryptoMetadataSettingsKey + ".region",
REGION,
"remote_store.repository.remote-store-A.crypto_metadata.settings.key_arn",
repoCryptoMetadataSettingsKey + ".key_arn",
KEY_ARN
);
DiscoveryNode node = new DiscoveryNode(
Expand All @@ -98,16 +118,21 @@ public void testInvalidCryptoMetadata() throws UnknownHostException {
}

public void testNoCryptoMetadata() throws UnknownHostException {
String repoName = "remote-store-A";
String repoTypeSettingKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT, repoName);
String repoSettingsKey = String.format(Locale.ROOT, REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX, repoName);
Map<String, String> attr = Map.of(
"remote_store.segment.repository",
"remote-store-A",
"remote_store.translog.repository",
"remote-store-A",
"remote_store.repository.remote-store-A.type",
REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY,
repoName,
repoTypeSettingKey,
"s3",
"remote_store.repository.remote-store-A.settings.bucket",
repoSettingsKey,
"abc",
"remote_store.repository.remote-store-A.settings.base_path",
repoSettingsKey + "base_path",
"xyz"
);
DiscoveryNode node = new DiscoveryNode(
Expand Down

0 comments on commit 80cc40d

Please sign in to comment.