Optional prefix in overriden settings

Signed-off-by: Vikas Bansal <43470111+vikasvb90@users.noreply.github.com>
vikasvb90 · Sep 4, 2023 · a494816 · a494816
1 parent 65c4c09
commit a494816
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/plugins/crypto-kms/src/main/java/org/opensearch/crypto/kms/KmsClientSettings.java b/plugins/crypto-kms/src/main/java/org/opensearch/crypto/kms/KmsClientSettings.java
@@ -189,7 +189,7 @@ static KmsClientSettings getClientSettings(Settings settings) {
     KmsClientSettings getMetadataSettings(Settings settings) {
         AwsCredentials newCredentials = loadCredentials(settings);
         newCredentials = newCredentials == null ? this.credentials : newCredentials;
-        final Settings normalizedSettings = Settings.builder().put(settings).build();
+        final Settings normalizedSettings = Settings.builder().put(settings).normalizePrefix("kms.").build();
 
         String newProxyUsername = this.proxyUsername, newProxyPassword = this.proxyPassword;
         if (PROXY_USERNAME_SETTING.exists(normalizedSettings)) {

diff --git a/plugins/crypto-kms/src/test/java/org/opensearch/crypto/kms/CryptoKmsClientSettingsTests.java b/plugins/crypto-kms/src/test/java/org/opensearch/crypto/kms/CryptoKmsClientSettingsTests.java
@@ -86,7 +86,15 @@ public void testSpecificEndpoint() {
         assertEquals(baseSettings.endpoint, "kms.endpoint");
     }
 
-    public void testOverrideWithMetadataSettings() {
+    public void testOverrideWithPrefixedMetadataSettings() {
+        overrideWithMetadataSettings("kms.");
+    }
+
+    public void testOverrideWithNoPrefixMetadataSettings() {
+        overrideWithMetadataSettings("");
+    }
+
+    public void overrideWithMetadataSettings(String prefix) {
         final MockSecureSettings secureSettings = new MockSecureSettings();
         String accessKey = "access_key", secretKey = "secret_key", sessionToken = "session_token";
         secureSettings.setString("kms.access_key", accessKey);
@@ -104,7 +112,7 @@ public void testOverrideWithMetadataSettings() {
         {
             final String endpoint = "some.host";
             final KmsClientSettings refinedSettings = baseSettings.getMetadataSettings(
-                Settings.builder().put("kms.endpoint", endpoint).build()
+                Settings.builder().put(prefix + "endpoint", endpoint).build()
             );
             assertEquals(refinedSettings.endpoint, endpoint);
             validateCredsAreStillSame(refinedSettings, accessKey, secretKey, sessionToken);
@@ -113,7 +121,7 @@ public void testOverrideWithMetadataSettings() {
         {
             String region = "eu-west-1";
             final KmsClientSettings refinedSettings = baseSettings.getMetadataSettings(
-                Settings.builder().put("kms.region", region).build()
+                Settings.builder().put(prefix + "region", region).build()
             );
             assertEquals(refinedSettings.region, region);
             validateCredsAreStillSame(refinedSettings, accessKey, secretKey, sessionToken);
@@ -122,7 +130,7 @@ public void testOverrideWithMetadataSettings() {
         {
             String proxyHost = "proxy-host";
             final KmsClientSettings refinedSettings = baseSettings.getMetadataSettings(
-                Settings.builder().put("kms.proxy.host", proxyHost).build()
+                Settings.builder().put(prefix + "proxy.host", proxyHost).build()
             );
             assertEquals(refinedSettings.proxyHost, proxyHost);
             validateCredsAreStillSame(refinedSettings, accessKey, secretKey, sessionToken);
@@ -131,7 +139,7 @@ public void testOverrideWithMetadataSettings() {
         {
             int proxyPort = 70;
             final KmsClientSettings refinedSettings = baseSettings.getMetadataSettings(
-                Settings.builder().put("kms.proxy.port", proxyPort).build()
+                Settings.builder().put(prefix + "proxy.port", proxyPort).build()
             );
             assertEquals(refinedSettings.proxyPort, proxyPort);
             validateCredsAreStillSame(refinedSettings, accessKey, secretKey, sessionToken);
@@ -140,7 +148,7 @@ public void testOverrideWithMetadataSettings() {
         {
             TimeValue readTimeout = TimeValue.timeValueMillis(5000);
             final KmsClientSettings refinedSettings = baseSettings.getMetadataSettings(
-                Settings.builder().put("kms.read_timeout", readTimeout).build()
+                Settings.builder().put(prefix + "read_timeout", readTimeout).build()
             );
             assertEquals(refinedSettings.readTimeoutMillis, readTimeout.getMillis());
             validateCredsAreStillSame(refinedSettings, accessKey, secretKey, sessionToken);