Correcting setupSslOnlyMode to use AbstractSecurityUnitTest.hasCustom…

…TransportSettings() (#1057) (cherry picked from commit 70a4f70)
opensearch-project · Jun 21, 2021 · 5704fba · 5704fba
1 parent fc15073
commit 5704fba
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...st/java/com/amazon/opendistroforelasticsearch/security/test/AbstractSecurityUnitTest.java b/...st/java/com/amazon/opendistroforelasticsearch/security/test/AbstractSecurityUnitTest.java
@@ -219,15 +219,15 @@ protected void initialize(ClusterInfo info, Settings initTransportClientSettings
         }
     }
 
-    protected Settings.Builder minimumSecuritySettingsBuilder(int node, boolean sslOnly, boolean hasCustomTransportSettings) {
+    protected Settings.Builder minimumSecuritySettingsBuilder(int node, boolean sslOnly, Settings other) {
 
         final String prefix = getResourceFolder()==null?"":getResourceFolder()+"/";
         Settings.Builder builder = Settings.builder()
                 .put(SSLConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_ENABLE_OPENSSL_IF_AVAILABLE, allowOpenSSL)
                 .put(SSLConfigConstants.OPENDISTRO_SECURITY_SSL_TRANSPORT_ENABLE_OPENSSL_IF_AVAILABLE, allowOpenSSL);
 
         // If custom transport settings are not defined use defaults
-        if (!hasCustomTransportSettings) {
+        if (!hasCustomTransportSettings(other)) {
             builder.put(SSLConfigConstants.OPENDISTRO_SECURITY_SSL_TRANSPORT_KEYSTORE_ALIAS, "node-0")
                 .put(SSLConfigConstants.OPENDISTRO_SECURITY_SSL_TRANSPORT_KEYSTORE_FILEPATH,
                     FileHelper.getAbsoluteFilePathFromClassPath(prefix+"node-0-keystore.jks"))
@@ -240,14 +240,16 @@ protected Settings.Builder minimumSecuritySettingsBuilder(int node, boolean sslO
                     builder.put(ConfigConstants.OPENDISTRO_SECURITY_BACKGROUND_INIT_IF_SECURITYINDEX_NOT_EXIST, false);
         }
 
+        builder.put(other);
+
         return builder;
     }
 
     protected NodeSettingsSupplier minimumSecuritySettings(Settings other) {
         return new NodeSettingsSupplier() {
             @Override
             public Settings get(int i) {
-                return minimumSecuritySettingsBuilder(i, false, hasCustomTransportSettings(other)).put(other).build();
+                return minimumSecuritySettingsBuilder(i, false, other).build();
             }
         };
     }
@@ -256,7 +258,7 @@ protected NodeSettingsSupplier minimumSecuritySettingsSslOnly(Settings other) {
         return new NodeSettingsSupplier() {
             @Override
             public Settings get(int i) {
-                return minimumSecuritySettingsBuilder(i, true, false).put(other).build();
+                return minimumSecuritySettingsBuilder(i, true, other).build();
             }
         };
     }
@@ -269,7 +271,7 @@ public Settings get(int i) {
                 if (i == nonSSLNodeNum) {
                     return Settings.builder().build();
                 }
-                return minimumSecuritySettingsBuilder(i, true, false).put(other).build();
+                return minimumSecuritySettingsBuilder(i, true, other).build();
             }
         };
     }