diff --git a/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java b/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
index aefaf2674c..f51792dec1 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
@@ -61,10 +61,10 @@
 import org.opensearch.sql.ast.tree.TableFunction;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.ast.tree.Values;
-import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.data.model.ExprMissingValue;
 import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
@@ -147,12 +147,15 @@ public LogicalPlan visitRelation(Relation node, AnalysisContext context) {
     if (CATALOGS_TABLE_NAME.equals(tableName)) {
       table = new DataSourceTable(dataSourceService);
     } else {
-      table = dataSourceService
-          .getDataSource(dataSourceSchemaIdentifierNameResolver.getDataSourceName())
-          .getStorageEngine()
-          .getTable(new CatalogSchemaName(dataSourceSchemaIdentifierNameResolver.getDataSourceName(),
-                  dataSourceSchemaIdentifierNameResolver.getSchemaName()),
-              dataSourceSchemaIdentifierNameResolver.getIdentifierName());
+      table =
+          dataSourceService
+              .getDataSource(dataSourceSchemaIdentifierNameResolver.getDataSourceName())
+              .getStorageEngine()
+              .getTable(
+                  new CatalogSchemaName(
+                      dataSourceSchemaIdentifierNameResolver.getDataSourceName(),
+                      dataSourceSchemaIdentifierNameResolver.getSchemaName()),
+                  dataSourceSchemaIdentifierNameResolver.getIdentifierName());
     }
     table.getFieldTypes().forEach((k, v) -> curEnv.define(new Symbol(Namespace.FIELD_NAME, k), v));
 
diff --git a/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java b/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java
index febf63e475..bb93994001 100644
--- a/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java
+++ b/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java
@@ -24,7 +24,7 @@
  */
 public class DataSourceServiceImpl implements DataSourceService {
 
-  private static String CATALOG_NAME_REGEX = "[@*A-Za-z]+?[*a-zA-Z_\\-0-9]*";
+  private static String DATASOURCE_NAME_REGEX = "[@*A-Za-z]+?[*a-zA-Z_\\-0-9]*";
 
   private static final Logger LOG = LogManager.getLogger();
 
@@ -79,7 +79,7 @@ private void validateDataSource(DataSourceMetadata metadata) {
       throw new IllegalArgumentException(
           "Missing Name Field from a DataSource. Name is a required parameter.");
     }
-    if (!metadata.getName().matches(CATALOG_NAME_REGEX)) {
+    if (!metadata.getName().matches(DATASOURCE_NAME_REGEX)) {
       throw new IllegalArgumentException(
           String.format(
               "DataSource Name: %s contains illegal characters. Allowed characters: a-zA-Z0-9_-*@.",
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java
index c0b3a5bba7..2dabbaa6fa 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java
@@ -11,8 +11,8 @@
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
-import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.planner.DefaultImplementor;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalRelation;
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java
index 6092f35f33..9d8216da05 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java
@@ -14,11 +14,11 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
-import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.storage.TableScanOperator;
 
 /**
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
index f119d2a4cc..9040a50523 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
@@ -19,12 +19,12 @@
 import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.analysis.symbol.SymbolTable;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
+import org.opensearch.sql.config.TestConfig;
+import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.config.TestConfig;
-import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
diff --git a/core/src/test/java/org/opensearch/sql/datasource/model/auth/AuthenticationTypeTest.java b/core/src/test/java/org/opensearch/sql/datasource/model/auth/AuthenticationTypeTest.java
new file mode 100644
index 0000000000..f9e4f3ce59
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/datasource/model/auth/AuthenticationTypeTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource.model.auth;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+class AuthenticationTypeTest {
+  @Test
+  void getAuthType() {
+    assertEquals(
+        AuthenticationType.BASICAUTH,
+        AuthenticationType.get(AuthenticationType.BASICAUTH.getName()));
+    assertEquals(
+        AuthenticationType.AWSSIGV4AUTH,
+        AuthenticationType.get(AuthenticationType.AWSSIGV4AUTH.getName()));
+  }
+
+  @Test
+  void getNotExistAuthType() {
+    assertNull(AuthenticationType.get("mock"));
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java
index 5c1bda2497..9a0300c256 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java
@@ -21,11 +21,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.data.model.ExprTupleValue;
-import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.storage.StorageEngine;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java
index caacc63666..c70d06b2ad 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java
@@ -17,9 +17,9 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java
index db6b626c29..011f6236fb 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java
@@ -6,10 +6,10 @@
 package org.opensearch.sql.opensearch.storage;
 
 import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.storage.DataSourceFactory;
 
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactoryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactoryTest.java
new file mode 100644
index 0000000000..a9e4e153fc
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactoryTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+
+@ExtendWith(MockitoExtension.class)
+class OpenSearchDataSourceFactoryTest {
+
+  @Mock private OpenSearchClient client;
+
+  @Mock private Settings settings;
+
+  @Mock private DataSourceMetadata dataSourceMetadata;
+
+  private OpenSearchDataSourceFactory factory;
+
+  @BeforeEach
+  public void setup() {
+    factory = new OpenSearchDataSourceFactory(client, settings);
+  }
+
+  @Test
+  void getDataSourceType() {
+    assertEquals(DataSourceType.OPENSEARCH, factory.getDataSourceType());
+  }
+
+  @Test
+  void createDataSource() {
+    when(dataSourceMetadata.getName()).thenReturn("opensearch");
+
+    DataSource dataSource = factory.createDataSource(dataSourceMetadata);
+    assertEquals("opensearch", dataSource.getName());
+    assertEquals(DataSourceType.OPENSEARCH, dataSource.getConnectorType());
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java
index 5c9284e980..bd39ab2703 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java
@@ -33,7 +33,8 @@ class OpenSearchStorageEngineTest {
   @Test
   public void getTable() {
     OpenSearchStorageEngine engine = new OpenSearchStorageEngine(client, settings);
-    Table table = engine.getTable(new CatalogSchemaName(DEFAULT_DATASOURCE_NAME, "default"), "test");
+    Table table =
+        engine.getTable(new CatalogSchemaName(DEFAULT_DATASOURCE_NAME, "default"), "test");
     assertNotNull(table);
   }
 
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
index fca004196f..7dde7578db 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
@@ -16,8 +16,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.executor.DefaultQueryManager;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java
index 0c73afa8f3..4e8b30af2f 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java
@@ -22,8 +22,8 @@
 import org.opensearch.sql.prometheus.authinterceptors.BasicAuthenticationInterceptor;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
 import org.opensearch.sql.prometheus.client.PrometheusClientImpl;
-import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.sql.storage.StorageEngine;
 
 public class PrometheusStorageFactory implements DataSourceFactory {
 
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java
index ff5d1ac977..91cb8df1ea 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java
@@ -13,6 +13,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
 import org.opensearch.sql.storage.StorageEngine;
 
@@ -22,7 +24,8 @@ public class PrometheusStorageFactoryTest {
   @Test
   void testGetConnectorType() {
     PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
-    Assertions.assertEquals(DataSourceType.PROMETHEUS, prometheusStorageFactory.getDataSourceType());
+    Assertions.assertEquals(
+        DataSourceType.PROMETHEUS, prometheusStorageFactory.getDataSourceType());
   }
 
   @Test
@@ -130,6 +133,21 @@ void testGetStorageEngineWithInvalidURISyntax() {
         exception.getMessage().contains("Prometheus Client creation failed due to:"));
   }
 
+  @Test
+  void createDataSourceSuccess() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "http://dummyprometheus:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "admin");
+    properties.put("prometheus.auth.password", "admin");
 
+    DataSourceMetadata metadata = new DataSourceMetadata();
+    metadata.setName("prometheus");
+    metadata.setConnector(DataSourceType.PROMETHEUS);
+    metadata.setProperties(properties);
+
+    DataSource dataSource = new PrometheusStorageFactory().createDataSource(metadata);
+    Assertions.assertTrue(dataSource.getStorageEngine() instanceof PrometheusStorageEngine);
+  }
 }