resolved conflicts

Signed-off-by: Amardeepsingh Siglani <[email protected]>
amsiglan · May 30, 2024 · d4f1b8d · d4f1b8d
2 parents a88b676 + c3ab50f
commit d4f1b8d
Show file tree

Hide file tree

Showing 51 changed files with 605 additions and 733 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -1,3 +1,3 @@
 ## Reporting a Vulnerability
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue.
+If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.
diff --git a/common/types/data_connections.ts b/common/types/data_connections.ts
@@ -253,3 +253,26 @@ export interface StartLoadingParams {
   databaseName?: string;
   tableName?: string;
 }
+
+export interface RenderAccelerationFlyoutParams {
+  dataSource: string;
+  dataSourceMDSId?: string;
+  databaseName?: string;
+  tableName?: string;
+  handleRefresh?: () => void;
+}
+
+export interface RenderAssociatedObjectsDetailsFlyoutParams {
+  tableDetail: AssociatedObject;
+  dataSourceName: string;
+  handleRefresh?: () => void;
+  dataSourceMDSId?: string;
+  isS3ConnectionWithLakeFormation?: boolean;
+}
+
+export interface RenderAccelerationDetailsFlyoutParams {
+  acceleration: CachedAcceleration;
+  dataSourceName: string;
+  handleRefresh?: () => void;
+  dataSourceMDSId?: string;
+}
diff --git a/public/components/datasources/components/manage/accelerations/acceleration_table.tsx b/public/components/datasources/components/manage/accelerations/acceleration_table.tsx
@@ -136,7 +136,7 @@ export const AccelerationTable = ({
   const handleRefresh = useCallback(() => {
     if (!isCatalogCacheFetching(accelerationsLoadStatus)) {
       setIsRefreshing(true);
-      startLoadingAccelerations(dataSourceName);
+      startLoadingAccelerations({ dataSourceName });
     }
   }, [accelerationsLoadStatus]);
 
@@ -250,7 +250,11 @@ export const AccelerationTable = ({
         return (
           <EuiLink
             onClick={() => {
-              renderAccelerationDetailsFlyout(acceleration, dataSourceName, handleRefresh);
+              renderAccelerationDetailsFlyout({
+                acceleration,
+                dataSourceName,
+                handleRefresh,
+              });
             }}
           >
             {displayName}

diff --git a/...e/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_databases.tsx b/...e/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_databases.tsx
@@ -24,6 +24,7 @@ interface SelectorLoadDatabasesProps {
     }>
   >;
   tableFieldsLoading: boolean;
+  dataSourceMDSId?: string;
 }
 
 export const SelectorLoadDatabases = ({
@@ -32,6 +33,7 @@ export const SelectorLoadDatabases = ({
   loadingComboBoxes,
   setLoadingComboBoxes,
   tableFieldsLoading,
+  dataSourceMDSId,
 }: SelectorLoadDatabasesProps) => {
   const [isLoading, setIsLoading] = useState(false);
   const {
@@ -42,7 +44,7 @@ export const SelectorLoadDatabases = ({
 
   const onClickRefreshDatabases = () => {
     setIsLoading(true);
-    startDatabasesLoading({ dataSourceName });
+    startDatabasesLoading({ dataSourceName, dataSourceMDSId });
   };
 
   useEffect(() => {

diff --git a/...age/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_objects.tsx b/...age/accelerations/create_accelerations_flyout/selectors/selector_helpers/load_objects.tsx
@@ -29,6 +29,7 @@ interface SelectorLoadDatabasesProps {
     }>
   >;
   tableFieldsLoading: boolean;
+  dataSourceMDSId?: string;
 }
 
 export const SelectorLoadObjects = ({
@@ -38,6 +39,7 @@ export const SelectorLoadObjects = ({
   loadingComboBoxes,
   setLoadingComboBoxes,
   tableFieldsLoading,
+  dataSourceMDSId,
 }: SelectorLoadDatabasesProps) => {
   const { setToast } = useToast();
   const [isLoading, setIsLoading] = useState({
@@ -65,8 +67,8 @@ export const SelectorLoadObjects = ({
       tableStatus: true,
       accelerationsStatus: true,
     });
-    startLoadingTables({ dataSourceName, databaseName });
-    startLoadingAccelerations({ dataSourceName });
+    startLoadingTables({ dataSourceName, databaseName, dataSourceMDSId });
+    startLoadingAccelerations({ dataSourceName, dataSourceMDSId });
   };
 
   useEffect(() => {

diff --git a/...components/manage/accelerations/create_accelerations_flyout/selectors/source_selector.tsx b/...components/manage/accelerations/create_accelerations_flyout/selectors/source_selector.tsx
@@ -87,7 +87,7 @@ export const DataSourceSelector: React.FC<DataSourceSelectorProps> = ({
   const loadDataSource = () => {
     setLoadingComboBoxes({ ...loadingComboBoxes, dataSource: true });
     http
-      .get(DATACONNECTIONS_BASE + `/dataSourceMDSId=${dataSourceMDSId}`)
+      .get(`${DATACONNECTIONS_BASE}/dataSourceMDSId=${dataSourceMDSId ?? ''}`)
       .then((res) => {
         const isValidDataSource = res.some(
           (connection: any) =>
@@ -245,6 +245,7 @@ export const DataSourceSelector: React.FC<DataSourceSelectorProps> = ({
                   loadingComboBoxes={loadingComboBoxes}
                   setLoadingComboBoxes={setLoadingComboBoxes}
                   tableFieldsLoading={tableFieldsLoading}
+                  dataSourceMDSId={dataSourceMDSId}
                 />
               </EuiFlexItem>
             </EuiFlexGroup>
@@ -294,6 +295,7 @@ export const DataSourceSelector: React.FC<DataSourceSelectorProps> = ({
                   loadingComboBoxes={loadingComboBoxes}
                   setLoadingComboBoxes={setLoadingComboBoxes}
                   tableFieldsLoading={tableFieldsLoading}
+                  dataSourceMDSId={dataSourceMDSId}
                 />
               </EuiFlexItem>
             </EuiFlexGroup>

diff --git a/public/components/datasources/components/manage/accelerations/utils/acceleration_utils.tsx b/public/components/datasources/components/manage/accelerations/utils/acceleration_utils.tsx
@@ -6,12 +6,14 @@
 import { EuiButton, EuiHealth } from '@elastic/eui';
 import React from 'react';
 import { DATA_SOURCE_TYPES } from '../../../../../../../common/constants/data_sources';
-import { CachedAcceleration } from '../../../../../../../common/types/data_connections';
+import {
+  CachedAcceleration,
+  RenderAccelerationFlyoutParams,
+} from '../../../../../../../common/types/data_connections';
 import {
   redirectToExplorerOSIdx,
   redirectToExplorerWithDataSrc,
 } from '../../associated_objects/utils/associated_objects_tab_utils';
-
 export const ACC_PANEL_TITLE = 'Accelerations';
 export const ACC_PANEL_DESC =
   'Accelerations optimize query performance by indexing external data into OpenSearch.';
@@ -91,26 +93,23 @@ export const CreateAccelerationFlyoutButton = ({
   handleRefresh,
 }: {
   dataSourceName: string;
-  renderCreateAccelerationFlyout: (
-    dataSource: string,
-    dataSourceMDSId?: string,
-    databaseName?: string,
-    tableName?: string,
-    handleRefresh?: () => void
-  ) => void;
+  renderCreateAccelerationFlyout: ({
+    dataSource,
+    databaseName,
+    tableName,
+    handleRefresh,
+    dataSourceMDSId,
+  }: RenderAccelerationFlyoutParams) => void;
   handleRefresh: () => void;
 }) => {
   return (
     <>
       <EuiButton
         onClick={() =>
-          renderCreateAccelerationFlyout(
-            dataSourceName,
-            undefined,
-            undefined,
-            undefined,
-            handleRefresh
-          )
+          renderCreateAccelerationFlyout({
+            dataSource: dataSourceName,
+            handleRefresh,
+          })
         }
         fill
       >

diff --git a/...ts/datasources/components/manage/associated_objects/associated_objects_details_flyout.tsx b/...ts/datasources/components/manage/associated_objects/associated_objects_details_flyout.tsx
@@ -94,13 +94,12 @@ export const AssociatedObjectsDetailsFlyout = ({
   };
 
   const onCreateAcceleration = () =>
-    renderCreateAccelerationFlyout(
-      datasourceName,
-      '',
-      tableDetail.database,
-      tableDetail.name,
-      handleRefresh
-    );
+    renderCreateAccelerationFlyout({
+      dataSource: datasourceName,
+      databaseName: tableDetail.database,
+      tableName: tableDetail.name,
+      handleRefresh,
+    });
 
   const AccelerateButton = () => {
     return (
@@ -164,7 +163,12 @@ export const AssociatedObjectsDetailsFlyout = ({
         return (
           <EuiLink
             onClick={() =>
-              renderAccelerationDetailsFlyout(item, datasourceName, handleRefresh, dataSourceMDSId)
+              renderAccelerationDetailsFlyout({
+                acceleration: item,
+                dataSourceName: datasourceName,
+                handleRefresh,
+                dataSourceMDSId,
+              })
             }
           >
             {name}
@@ -204,13 +208,12 @@ export const AssociatedObjectsDetailsFlyout = ({
           color="primary"
           fill
           onClick={() =>
-            renderCreateAccelerationFlyout(
-              datasourceName,
-              '',
-              tableDetail.database,
-              tableDetail.name,
-              handleRefresh
-            )
+            renderCreateAccelerationFlyout({
+              dataSource: datasourceName,
+              databaseName: tableDetail.database,
+              tableName: tableDetail.name,
+              handleRefresh,
+            })
           }
           iconType="popout"
           iconSide="left"

diff --git a/...ic/components/datasources/components/manage/associated_objects/associated_objects_tab.tsx b/...ic/components/datasources/components/manage/associated_objects/associated_objects_tab.tsx
@@ -105,7 +105,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
 
   const onRefreshButtonClick = () => {
     if (!isCatalogCacheFetching(databasesLoadStatus, tablesLoadStatus, accelerationsLoadStatus)) {
-      startLoadingDatabases({ databaseName: datasource.name });
+      startLoadingDatabases({ dataSourceName: datasource.name });
       setIsRefreshing(true);
     }
   };
@@ -178,7 +178,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
           datasourceCache.status === CachedDataSourceStatus.Failed) &&
         !isCatalogCacheFetching(databasesLoadStatus)
       ) {
-        startLoadingDatabases(datasource.name);
+        startLoadingDatabases({ dataSourceName: datasource.name });
       } else if (datasourceCache.status === CachedDataSourceStatus.Updated) {
         setCachedDatabases(datasourceCache.databases);
         setIsFirstTimeLoading(false);
@@ -235,7 +235,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
           databaseCache.status === CachedDataSourceStatus.Failed) &&
         !isCatalogCacheFetching(tablesLoadStatus)
       ) {
-        startLoadingTables(datasource.name, selectedDatabase);
+        startLoadingTables({ dataSourceName: datasource.name, databaseName: selectedDatabase });
         setIsObjectsLoading(true);
       } else if (databaseCache.status === CachedDataSourceStatus.Updated) {
         setCachedTables(databaseCache.tables);
@@ -246,7 +246,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
           isRefreshing) &&
         !isCatalogCacheFetching(accelerationsLoadStatus)
       ) {
-        startLoadingAccelerations(datasource.name);
+        startLoadingAccelerations({ dataSourceName: datasource.name });
         setIsObjectsLoading(true);
       } else if (accelerationsCache.status === CachedDataSourceStatus.Updated) {
         setCachedAccelerations(accelerationsCache.accelerations);