Data connections clean up

ashley-o0o · Mar 4, 2025 · 0937ac4 · 0937ac4
1 parent 9b6b7a6
commit 0937ac4
Show file tree

Hide file tree

Showing 39 changed files with 19 additions and 1,567 deletions.
diff --git a/frontend/src/__mocks__/mockDataConnection.ts b/frontend/src/__mocks__/mockDataConnection.ts
diff --git a/...ypress/cypress/tests/e2e/dataScienceProjects/connections/testDataConnectionCreation.cy.ts b/...ypress/cypress/tests/e2e/dataScienceProjects/connections/testDataConnectionCreation.cy.ts
diff --git a/frontend/src/concepts/connectionTypes/utils.ts b/frontend/src/concepts/connectionTypes/utils.ts
@@ -14,8 +14,7 @@ import {
   ConnectionTypeValueType,
 } from '~/concepts/connectionTypes/types';
 import { enumIterator } from '~/utilities/utils';
-import { AWSDataEntry, EnvVariableDataEntry } from '~/pages/projects/types';
-import { AwsKeys } from '~/pages/projects/dataConnections/const';
+import { EnvVariableDataEntry } from '~/pages/projects/types';
 
 export const isConnectionTypeDataFieldType = (
   type: ConnectionTypeFieldTypeUnion | string,
@@ -420,24 +419,3 @@ export const validateEnvVarName = (name: string): string | undefined => {
   }
   return undefined;
 };
-
-export const convertObjectStorageSecretData = (dataConnection: Connection): AWSDataEntry => {
-  let convertedData: { key: AwsKeys; value: string }[] = [];
-  const secretData = dataConnection.data;
-  if (secretData) {
-    convertedData = Object.values(AwsKeys)
-      .filter((key) => key !== AwsKeys.NAME)
-      .map((key: AwsKeys) => ({
-        key,
-        value: secretData[key] ? window.atob(secretData[key]) : '',
-      }));
-  }
-  const convertedSecret: AWSDataEntry = [
-    {
-      key: AwsKeys.NAME,
-      value: getDisplayNameFromK8sResource(dataConnection),
-    },
-    ...convertedData,
-  ];
-  return convertedSecret;
-};
diff --git a/...src/concepts/pipelines/content/configurePipelinesServer/ConfigurePipelinesServerModal.tsx b/...src/concepts/pipelines/content/configurePipelinesServer/ConfigurePipelinesServerModal.tsx
@@ -3,11 +3,8 @@ import { Alert, Form, Stack, StackItem } from '@patternfly/react-core';
 import { Modal } from '@patternfly/react-core/deprecated';
 import { usePipelinesAPI } from '~/concepts/pipelines/context';
 import { createPipelinesCR, deleteSecret } from '~/api';
-import useDataConnections from '~/pages/projects/screens/detail/data-connections/useDataConnections';
-import { EMPTY_AWS_PIPELINE_DATA } from '~/pages/projects/dataConnections/const';
 import DashboardModalFooter from '~/concepts/dashboard/DashboardModalFooter';
 import { PipelinesDatabaseSection } from './PipelinesDatabaseSection';
-import { ObjectStorageSection } from './ObjectStorageSection';
 import {
   DATABASE_CONNECTION_FIELDS,
   EMPTY_DATABASE_CONNECTION,
@@ -22,14 +19,13 @@ type ConfigurePipelinesServerModalProps = {
 
 const FORM_DEFAULTS: PipelineServerConfigType = {
   database: { useDefault: true, value: EMPTY_DATABASE_CONNECTION },
-  objectStorage: { newValue: EMPTY_AWS_PIPELINE_DATA },
+  objectStorage: { newValue: EMPTY_DATABASE_CONNECTION },
 };
 
 export const ConfigurePipelinesServerModal: React.FC<ConfigurePipelinesServerModalProps> = ({
   onClose,
 }) => {
   const { project, namespace } = usePipelinesAPI();
-  const [dataConnections, loaded] = useDataConnections(namespace);
   const [fetching, setFetching] = React.useState(false);
   const [error, setError] = React.useState<Error>();
   const [config, setConfig] = React.useState<PipelineServerConfigType>(FORM_DEFAULTS);
@@ -123,12 +119,6 @@ export const ConfigurePipelinesServerModal: React.FC<ConfigurePipelinesServerMod
               submit();
             }}
           >
-            <ObjectStorageSection
-              setConfig={setConfig}
-              config={config}
-              loaded={loaded}
-              dataConnections={dataConnections}
-            />
             <PipelinesDatabaseSection setConfig={setConfig} config={config} />
           </Form>
         </StackItem>

diff --git a/frontend/src/pages/modelRegistry/screens/components/DeployRegisteredModelModal.tsx b/frontend/src/pages/modelRegistry/screens/components/DeployRegisteredModelModal.tsx
@@ -17,7 +17,6 @@ import {
 } from '~/concepts/modelRegistry/context/ModelRegistryContext';
 import { ModelRegistrySelectorContext } from '~/concepts/modelRegistry/context/ModelRegistrySelectorContext';
 import { getKServeTemplates } from '~/pages/modelServing/customServingRuntimes/utils';
-import useDataConnections from '~/pages/projects/screens/detail/data-connections/useDataConnections';
 import { bumpBothTimestamps } from '~/concepts/modelRegistry/utils/updateTimestamps';
 import useConnections from '~/pages/projects/screens/detail/connections/useConnections';
 
@@ -48,7 +47,6 @@ const DeployRegisteredModelModal: React.FC<DeployRegisteredModelModalProps> = ({
   );
   const { loaded: projectDeployStatusLoaded, error: projectError } =
     useProjectErrorForRegisteredModel(selectedProject?.metadata.name, platform);
-  const [dataConnections] = useDataConnections(selectedProject?.metadata.name);
   const [connections] = useConnections(selectedProject?.metadata.name, true);
   const error = platformError || projectError;
 
@@ -159,7 +157,7 @@ const DeployRegisteredModelModal: React.FC<DeployRegisteredModelModalProps> = ({
       onClose={onClose}
       shouldFormHidden={!!error}
       registeredModelDeployInfo={registeredModelDeployInfo}
-      projectContext={{ currentProject: selectedProject, dataConnections, connections }}
+      projectContext={{ currentProject: selectedProject, connections }}
       projectSection={projectSection}
     />
   );

diff --git a/frontend/src/pages/modelServing/ModelServingContext.tsx b/frontend/src/pages/modelServing/ModelServingContext.tsx
@@ -19,8 +19,6 @@ import { DEFAULT_CONTEXT_DATA, DEFAULT_LIST_WATCH_RESULT } from '~/utilities/con
 import { ContextResourceData, CustomWatchK8sResult } from '~/types';
 import { useContextResourceData } from '~/utilities/useContextResourceData';
 import { useDashboardNamespace } from '~/redux/selectors';
-import { DataConnection } from '~/pages/projects/types';
-import useDataConnections from '~/pages/projects/screens/detail/data-connections/useDataConnections';
 import useSyncPreferredProject from '~/concepts/projects/useSyncPreferredProject';
 import { byName, ProjectsContext } from '~/concepts/projects/ProjectsContext';
 import { conditionalArea, SupportedArea } from '~/concepts/areas';
@@ -38,7 +36,6 @@ import useServingRuntimeSecrets from './screens/projects/useServingRuntimeSecret
 type ModelServingContextType = {
   refreshAllData: () => void;
   filterTokens: (servingRuntime?: string) => SecretKind[];
-  dataConnections: ContextResourceData<DataConnection>;
   connections: ContextResourceData<Connection>;
   servingRuntimeTemplates: CustomWatchK8sResult<TemplateKind[]>;
   servingRuntimeTemplateOrder: ContextResourceData<string>;
@@ -60,7 +57,6 @@ type ModelServingContextProviderProps = {
 export const ModelServingContext = React.createContext<ModelServingContextType>({
   refreshAllData: () => undefined,
   filterTokens: () => [],
-  dataConnections: DEFAULT_CONTEXT_DATA,
   connections: DEFAULT_CONTEXT_DATA,
   servingRuntimeTemplates: DEFAULT_LIST_WATCH_RESULT,
   servingRuntimeTemplateOrder: DEFAULT_CONTEXT_DATA,
@@ -95,19 +91,16 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
   const inferenceServices = useContextResourceData<InferenceServiceKind>(
     useInferenceServices(namespace),
   );
-  const dataConnections = useContextResourceData<DataConnection>(useDataConnections(namespace));
   const connections = useContextResourceData<Connection>(useConnections(namespace));
 
   const servingRuntimeRefresh = servingRuntimes.refresh;
   const inferenceServiceRefresh = inferenceServices.refresh;
-  const dataConnectionRefresh = dataConnections.refresh;
   const connectionRefresh = connections.refresh;
   const refreshAllData = React.useCallback(() => {
     servingRuntimeRefresh();
     inferenceServiceRefresh();
-    dataConnectionRefresh();
     connectionRefresh();
-  }, [servingRuntimeRefresh, inferenceServiceRefresh, dataConnectionRefresh, connectionRefresh]);
+  }, [servingRuntimeRefresh, inferenceServiceRefresh, connectionRefresh]);
 
   const {
     kServe: { installed: kServeInstalled },
@@ -145,7 +138,6 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
     servingRuntimeTemplateOrder.error ||
     servingRuntimeTemplateDisablement.error ||
     serverSecrets.error ||
-    dataConnections.error ||
     connections.error
   ) {
     return getErrorComponent ? (
@@ -156,7 +148,6 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
           servingRuntimeTemplates[2]?.message ||
           servingRuntimeTemplateOrder.error?.message ||
           servingRuntimeTemplateDisablement.error?.message ||
-          dataConnections.error?.message ||
           connections.error?.message,
       )
     ) : (
@@ -174,7 +165,6 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
               servingRuntimeTemplateOrder.error?.message ||
               servingRuntimeTemplateDisablement.error?.message ||
               serverSecrets.error?.message ||
-              dataConnections.error?.message ||
               connections.error?.message}
           </EmptyStateBody>
           <EmptyStateFooter>
@@ -195,7 +185,6 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
         servingRuntimeTemplates,
         servingRuntimeTemplateOrder,
         servingRuntimeTemplateDisablement,
-        dataConnections,
         connections,
         refreshAllData,
         filterTokens,

diff --git a/frontend/src/pages/modelServing/screens/global/ServeModelButton.tsx b/frontend/src/pages/modelServing/screens/global/ServeModelButton.tsx
@@ -26,7 +26,6 @@ const ServeModelButton: React.FC = () => {
     servingRuntimeTemplates: [templates],
     servingRuntimeTemplateOrder: { data: templateOrder },
     servingRuntimeTemplateDisablement: { data: templateDisablement },
-    dataConnections: { data: dataConnections },
     connections: { data: connections },
   } = React.useContext(ModelServingContext);
   const { projects } = React.useContext(ProjectsContext);
@@ -89,7 +88,6 @@ const ServeModelButton: React.FC = () => {
         <ManageInferenceServiceModal
           projectContext={{
             currentProject: project,
-            dataConnections,
             connections,
           }}
           onClose={(submit: boolean) => {
@@ -100,7 +98,6 @@ const ServeModelButton: React.FC = () => {
       {platformSelected === ServingRuntimePlatform.SINGLE ? (
         isKServeNIMEnabled ? (
           <ManageNIMServingModal
-            projectContext={{ currentProject: project, dataConnections }}
             onClose={onSubmit}
           />
         ) : (

diff --git a/...pages/modelServing/screens/projects/InferenceServiceModal/ManageInferenceServiceModal.tsx b/...pages/modelServing/screens/projects/InferenceServiceModal/ManageInferenceServiceModal.tsx
@@ -8,7 +8,6 @@ import {
   useCreateInferenceServiceObject,
 } from '~/pages/modelServing/screens/projects/utils';
 import { InferenceServiceKind, ProjectKind, ServingRuntimeKind } from '~/k8sTypes';
-import { DataConnection } from '~/pages/projects/types';
 import DashboardModalFooter from '~/concepts/dashboard/DashboardModalFooter';
 import { InferenceServiceStorageType } from '~/pages/modelServing/screens/types';
 import { getDisplayNameFromK8sResource } from '~/concepts/k8s/utils';
@@ -35,7 +34,6 @@ type ManageInferenceServiceModalProps = {
     projectContext?: {
       currentProject: ProjectKind;
       currentServingRuntime?: ServingRuntimeKind;
-      dataConnections: DataConnection[];
       connections: Connection[];
     };
   }

diff --git a/...ing/screens/projects/InferenceServiceModal/__tests__/ManageInferenceServiceModal.spec.tsx b/...ing/screens/projects/InferenceServiceModal/__tests__/ManageInferenceServiceModal.spec.tsx
@@ -45,7 +45,6 @@ describe('ManageInferenceServiceModal', () => {
       <ManageInferenceServiceModal
         projectContext={{
           currentProject,
-          dataConnections: [],
           connections: [],
         }}
         onClose={jest.fn()}
@@ -69,7 +68,6 @@ describe('ManageInferenceServiceModal', () => {
         <ManageInferenceServiceModal
           projectContext={{
             currentProject: projectChange,
-            dataConnections: [],
             connections: [],
           }}
           onClose={jest.fn()}