Fix global tenant id not set default value bypassing issue (#260)

* Fix global tenant id not set  default value bypassing issue

Signed-off-by: zane-neo <[email protected]>

* Add UT to cover

Signed-off-by: zane-neo <[email protected]>

---------

Signed-off-by: zane-neo <[email protected]>

Author: zane-neo

core/src/main/java/org/opensearch/remote/metadata/client/AbstractSdkClient.java

@@ -195,7 +195,7 @@ private GetDataObjectResponse replaceGlobalTenantId(GetDataObjectRequest request
 
     @Override
     public CompletionStage<Boolean> isGlobalResource(String index, String id, Executor executor, Boolean isMultiTenancyEnabled) {
-        if (Boolean.FALSE.equals(isMultiTenancyEnabled) || globalTenantId == null) {
+        if (Boolean.FALSE.equals(isMultiTenancyEnabled) || Strings.isNullOrEmpty(globalTenantId)) {
             return CompletableFuture.completedFuture(false);
         }
         GetDataObjectRequest request = GetDataObjectRequest.builder().index(index).id(id).tenantId(globalTenantId).build();

core/src/main/java/org/opensearch/remote/metadata/client/impl/LocalClusterIndicesClient.java

@@ -166,7 +166,7 @@ public CompletionStage<GetDataObjectResponse> getDataObjectAsync(
         Boolean isMultiTenancyEnabled
     ) {
         return doPrivileged(() -> {
-            if (Boolean.FALSE.equals(isMultiTenancyEnabled) || globalTenantId == null) {
+            if (Boolean.FALSE.equals(isMultiTenancyEnabled) || Strings.isNullOrEmpty(globalTenantId)) {
                 return innerGetDataObjectAsync(request, executor, isMultiTenancyEnabled);
             }
 

ddb-client/src/main/java/org/opensearch/remote/metadata/client/impl/DDBOpenSearchClient.java

@@ -283,7 +283,7 @@ public CompletionStage<GetDataObjectResponse> getDataObjectAsync(
         Executor executor,
         Boolean isMultiTenancyEnabled
     ) {
-        if (Boolean.FALSE.equals(isMultiTenancyEnabled) || globalTenantId == null) {
+        if (Boolean.FALSE.equals(isMultiTenancyEnabled) || Strings.isNullOrEmpty(globalTenantId)) {
             return innerGetDataObjectAsync(request, executor, isMultiTenancyEnabled);
         }
         // Try fetch from global cache.

ddb-client/src/test/java/org/opensearch/remote/metadata/client/impl/DDBOpenSearchClientTests.java

@@ -1236,6 +1236,19 @@ public void testGetDataObject_globalTenantIdDisabled_foundGlobalResourceFromDDB(
         assertEquals(TEST_TENANT_ID, getDataObjectResponse.getResponse().getSourceAsMap().get(TENANT_ID_FIELD_KEY));
     }
 
+    @Test
+    public void testGetDataObject_globalTenantIdDisabled_fetchNonExistsResource_noException() {
+        GetDataObjectRequest getRequest = GetDataObjectRequest.builder().index(TEST_INDEX).id(TEST_ID).tenantId(TEST_TENANT_ID).build();
+        Map<String, AttributeValue> itemResponse = new HashMap<>();
+        GetItemResponse getItemResponse = GetItemResponse.builder().item(itemResponse).build();
+        when(dynamoDbAsyncClient.getItem(any(GetItemRequest.class))).thenReturn(CompletableFuture.completedFuture(getItemResponse));
+        GetDataObjectResponse getDataObjectResponse = sdkClient.getDataObjectAsync(getRequest, testThreadPool.executor(TEST_THREAD_POOL))
+            .toCompletableFuture()
+            .join();
+        verify(dynamoDbAsyncClient, times(1)).getItem(getItemRequestArgumentCaptor.capture());
+        assertFalse(getDataObjectResponse.getResponse().isExists());
+    }
+
     @Test
     public void testGetDataObject_globalTenantIdEnabled_foundGlobalResourceFromCache() {
         GetDataObjectRequest getRequest = GetDataObjectRequest.builder().index(TEST_INDEX).id(TEST_ID).tenantId(TEST_TENANT_ID).build();

remote-client/src/main/java/org/opensearch/remote/metadata/client/impl/RemoteClusterIndicesClient.java

@@ -244,7 +244,7 @@ public CompletionStage<GetDataObjectResponse> getDataObjectAsync(
         Executor executor,
         Boolean isMultiTenancyEnabled
     ) {
-        if (Boolean.FALSE.equals(isMultiTenancyEnabled) || globalTenantId == null) {
+        if (Boolean.FALSE.equals(isMultiTenancyEnabled) || Strings.isNullOrEmpty(globalTenantId)) {
             return innerGetDataObjectAsync(request, executor, isMultiTenancyEnabled);
         }
         // First check cache for global resource