set cluster info type to Catalog Type (#569)

* set cluster info type to Catalog Type

* adjust test

---------

Co-authored-by: Yingjian Wu <[email protected]>

Author: yingjianwu98

metacat-common-server/src/main/java/com/netflix/metacat/common/server/spi/MetacatCatalogConfig.java

@@ -109,7 +109,7 @@ public static MetacatCatalogConfig createFromMapAndRemoveProperties(
         final String clusterEnv = properties.get(Keys.CLUSTER_ENV);
         final String clusterRegion = properties.get(Keys.CLUSTER_REGION);
         final ClusterInfo clusterInfo =
-            new ClusterInfo(clusterName, type, clusterAccount, clusterAccountId, clusterEnv, clusterRegion);
+            new ClusterInfo(clusterName, catalogType, clusterAccount, clusterAccountId, clusterEnv, clusterRegion);
 
         return new MetacatCatalogConfig(catalogType, catalogName, clusterInfo, includeViewsWithTables, schemaWhitelist,
             schemaBlacklist, thriftPort, cacheEnabled, interceptorEnabled, hasDataExternal);

metacat-main/src/test/groovy/com/netflix/metacat/main/services/impl/TableServiceImplSpec.groovy

@@ -71,8 +71,8 @@ class TableServiceImplSpec extends Specification {
     def usermetadataService = Mock(UserMetadataService)
     def eventBus = Mock(MetacatEventBus)
     def converterUtil = Mock(ConverterUtil)
-    def catalogConfig = MetacatCatalogConfig.createFromMapAndRemoveProperties('hive', 'a', ['metacat.interceptor.enabled': 'true', 'metacat.has-data-external':'true'])
-    def catalogConfigFalse = MetacatCatalogConfig.createFromMapAndRemoveProperties('hive', 'a', ['metacat.interceptor.enabled': 'false', 'metacat.has-data-external':'false'])
+    def catalogConfig = MetacatCatalogConfig.createFromMapAndRemoveProperties('migration', 'a', ['metacat.interceptor.enabled': 'true', 'metacat.has-data-external':'true', 'metacat.type': 'hive'])
+    def catalogConfigFalse = MetacatCatalogConfig.createFromMapAndRemoveProperties('migration', 'a', ['metacat.interceptor.enabled': 'false', 'metacat.has-data-external':'false', 'metacat.type': 'hive'])
     def registry = new NoopRegistry()
     def config = Mock(Config)
     def tableDto = DataDtoProvider.getTable('a', 'b', 'c', "amajumdar", "s3:/a/b")