Update build.gradle to actually check tenantaware property value

Signed-off-by: Daniel Widdis <[email protected]>

Author: dbwiddis

plugin/build.gradle

@@ -189,17 +189,13 @@ integTest {
     systemProperty "password", System.getProperty("password")
 
     // Only tenant aware test if set
-    if (System.getProperty("tests.rest.tenantaware") != null) {
+    if (System.getProperty("tests.rest.tenantaware") == "true") {
         filter {
             includeTestsMatching "org.opensearch.ml.rest.*TenantAwareIT"
         }
         systemProperty "plugins.ml_commons.multi_tenancy_enabled", "true"
     }
 
-    if (System.getProperty("tests.rest.tenantaware") != null) {
-        environment "plugins.ml_commons.multi_tenancy_enabled", "true"
-    }
-
     // Only rest case can run with remote cluster
     if (System.getProperty("tests.rest.cluster") != null && System.getProperty("tests.rest.tenantaware") == null) {
         filter {
@@ -226,32 +222,28 @@ integTest {
 
     // The 'doFirst' delays till execution time.
     doFirst {
-        if (System.getProperty("tests.rest.tenantaware") != null) {
+        if (System.getProperty("tests.rest.tenantaware") == "true") {
             def ymlFile = file("$buildDir/testclusters/integTest-0/config/opensearch.yml")
             if (ymlFile.exists()) {
                 ymlFile.withWriterAppend {
                     writer ->
                     writer.write("\n# Set multitenancy\n")
                     writer.write("plugins.ml_commons.multi_tenancy_enabled: true\n")
                 }
-            } else {
-                throw new GradleException("opensearch.yml not found at: $ymlFile")
-            }
-        }
-    
-        // TODO this properly uses the remote client factory but needs a remote cluster set up
-        if (System.getProperty("tests.rest.cluster") != null && System.getProperty("tests.rest.tenantaware") != null) {
-            def ymlFile = file("$buildDir/testclusters/integTest-0/config/opensearch.yml")
-            if (ymlFile.exists()) {
-                ymlFile.withWriterAppend { writer ->
-                    writer.write("\n# Use a remote cluster\n")
-                    writer.write("plugins.ml_commons.remote_metadata_type: RemoteOpenSearch\n")
-                    writer.write("plugins.ml_commons.remote_metadata_endpoint: https://127.0.0.1:9200\n")
+                // TODO this properly uses the remote client factory but needs a remote cluster set up
+                // TODO get the endpoint from a system property
+                if (System.getProperty("tests.rest.cluster") != null) {
+                    ymlFile.withWriterAppend { writer ->
+                        writer.write("\n# Use a remote cluster\n")
+                        writer.write("plugins.ml_commons.remote_metadata_type: RemoteOpenSearch\n")
+                        writer.write("plugins.ml_commons.remote_metadata_endpoint: https://127.0.0.1:9200\n")
+                    }
                 }
             } else {
                 throw new GradleException("opensearch.yml not found at: $ymlFile")
             }
         }
+    
         // Tell the test JVM if the cluster JVM is running under a debugger so that tests can
         // use longer timeouts for requests.
         def isDebuggingCluster = getDebug() || System.getProperty("test.debug") != null

plugin/src/main/java/org/opensearch/ml/sdkclient/SdkClientFactory.java

@@ -87,14 +87,6 @@ public static SdkClient createSdkClient(Client client, NamedXContentRegistry xCo
         String serviceName = REMOTE_METADATA_SERVICE_NAME.get(settings);
         Boolean multiTenancy = ML_COMMONS_MULTI_TENANCY_ENABLED.get(settings);
 
-        /*
-        // TODO Temp to force DDB for testing purposes
-        remoteMetadataType = AWS_DYNAMO_DB;
-        remoteMetadataEndpoint = "https://pkg8g8qwyrlggws3v4bk.us-west-2.aoss.amazonaws.com:443";
-        region = Region.US_WEST_2.id();
-        serviceName = "aoss";
-        */
-
         switch (remoteMetadataType) {
             case REMOTE_OPENSEARCH:
                 if (Strings.isBlank(remoteMetadataEndpoint)) {

plugin/src/test/java/org/opensearch/ml/rest/MLCommonsTenantAwareRestTestCase.java

@@ -36,7 +36,8 @@
 public abstract class MLCommonsTenantAwareRestTestCase extends MLCommonsRestTestCase {
 
     // Toggle to run DDB tests
-    protected static final boolean DDB = true;
+    // TODO: Get this from a property
+    protected static final boolean DDB = false;
 
     protected static final String DOC_ID = "_id";
 
@@ -81,7 +82,7 @@ public abstract class MLCommonsTenantAwareRestTestCase extends MLCommonsRestTest
     protected final RestRequest nullTenantMatchAllRequest = getRestRequestWithHeadersAndContent(null, MATCH_ALL_QUERY);
 
     protected static boolean isMultiTenancyEnabled() throws IOException {
-        // pass -Dtests.rest.tenantaware on gradle command line to enable
+        // pass -Dtests.rest.tenantaware=true on gradle command line to enable
         return Boolean.parseBoolean(System.getProperty(ML_COMMONS_MULTI_TENANCY_ENABLED.getKey()))
             || Boolean.parseBoolean(System.getenv(ML_COMMONS_MULTI_TENANCY_ENABLED.getKey()));
     }