Remove dependency from async-query-core to datasources

Signed-off-by: Tomoyuki Morita <[email protected]>
opensearch-project · Aug 1, 2024 · ae9e19b · ae9e19b
1 parent 14a80a9
commit ae9e19b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/async-query-core/build.gradle b/async-query-core/build.gradle
@@ -49,7 +49,6 @@ dependencies {
 
     implementation project(':core')
     implementation project(':spark') // TODO: dependency to spark should be eliminated
-    implementation project(':datasources') // TODO: dependency to datasources should be eliminated
     implementation 'org.json:json:20231013'
     implementation 'com.google.code.gson:gson:2.8.9'
 

diff --git a/...query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryCoreIntegTest.java b/...query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryCoreIntegTest.java
@@ -14,8 +14,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH;
-import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI;
 import static org.opensearch.sql.spark.dispatcher.IndexDMLHandler.DML_QUERY_JOB_ID;
 import static org.opensearch.sql.spark.dispatcher.IndexDMLHandler.DROP_INDEX_JOB_ID;
 
@@ -41,7 +39,6 @@
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.datasources.auth.AuthenticationType;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata.AsyncQueryJobMetadataBuilder;
@@ -522,10 +519,7 @@ private void givenValidDataSourceMetadataExist() {
                 .setName(DATASOURCE_NAME)
                 .setConnector(DataSourceType.S3GLUE)
                 .setProperties(
-                    ImmutableMap.<String, String>builder()
-                        .put(GLUE_INDEX_STORE_OPENSEARCH_URI, "https://open.search.cluster:9200/")
-                        .put(GLUE_INDEX_STORE_OPENSEARCH_AUTH, AuthenticationType.NOAUTH.getName())
-                        .build())
+                    ImmutableMap.<String, String>builder().put("PARAM_NAME", "PARAM_VALUE").build())
                 .build());
   }