refactor: move integration storage logic to platform for proper import limits

jankuca · jankuca · commit c04c27685117 · 2025-10-17T16:19:48.000+02:00
diff --git a/src/kernels/deepnote/deepnoteServerStarter.node.ts b/src/kernels/deepnote/deepnoteServerStarter.node.ts
@@ -17,7 +17,7 @@ import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as path from '../../platform/vscode-path/path';
 import { generateUuid } from '../../platform/common/uuid';
-import { SqlIntegrationEnvironmentVariablesProvider } from '../../notebooks/deepnote/integrations/sqlIntegrationEnvironmentVariablesProvider';
+import { SqlIntegrationEnvironmentVariablesProvider } from '../../platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider';
 
 /**
  * Lock file data structure for tracking server ownership
diff --git a/src/kernels/raw/launcher/kernelEnvVarsService.node.ts b/src/kernels/raw/launcher/kernelEnvVarsService.node.ts
@@ -18,7 +18,7 @@ import { IJupyterKernelSpec } from '../../types';
 import { CancellationToken, Uri } from 'vscode';
 import { PYTHON_LANGUAGE } from '../../../platform/common/constants';
 import { trackKernelResourceInformation } from '../../telemetry/helper';
-import { SqlIntegrationEnvironmentVariablesProvider } from '../../../notebooks/deepnote/integrations/sqlIntegrationEnvironmentVariablesProvider';
+import { SqlIntegrationEnvironmentVariablesProvider } from '../../../platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider';
 
 /**
  * Class used to fetch environment variables for a kernel.
diff --git a/src/kernels/serviceRegistry.node.ts b/src/kernels/serviceRegistry.node.ts
@@ -48,7 +48,7 @@ import { LastCellExecutionTracker } from './execution/lastCellExecutionTracker';
 import { ClearJupyterServersCommand } from './jupyter/clearJupyterServersCommand';
 import { KernelChatStartupCodeProvider } from './chat/kernelStartupCodeProvider';
 import { KernelWorkingDirectory } from './raw/session/kernelWorkingDirectory.node';
-import { SqlIntegrationEnvironmentVariablesProvider } from '../notebooks/deepnote/integrations/sqlIntegrationEnvironmentVariablesProvider';
+import { SqlIntegrationEnvironmentVariablesProvider } from '../platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider';
 
 export function registerTypes(serviceManager: IServiceManager, isDevMode: boolean) {
     serviceManager.addSingleton<IExtensionSyncActivationService>(IExtensionSyncActivationService, Activation);
diff --git a/src/notebooks/deepnote/integrations/integrationDetector.ts b/src/notebooks/deepnote/integrations/integrationDetector.ts
@@ -2,7 +2,7 @@ import { inject, injectable } from 'inversify';
 
 import { logger } from '../../../platform/logging';
 import { IDeepnoteNotebookManager } from '../../types';
-import { IntegrationStatus, IntegrationWithStatus } from './integrationTypes';
+import { IntegrationStatus, IntegrationWithStatus } from '../../../platform/notebooks/deepnote/integrationTypes';
 import { IIntegrationDetector, IIntegrationStorage } from './types';
 import { BlockWithIntegration, scanBlocksForIntegrations } from './integrationUtils';
 
diff --git a/src/notebooks/deepnote/integrations/integrationManager.ts b/src/notebooks/deepnote/integrations/integrationManager.ts
@@ -5,7 +5,7 @@ import { IExtensionContext } from '../../../platform/common/types';
 import { Commands } from '../../../platform/common/constants';
 import { logger } from '../../../platform/logging';
 import { IIntegrationDetector, IIntegrationManager, IIntegrationStorage, IIntegrationWebviewProvider } from './types';
-import { IntegrationStatus, IntegrationWithStatus } from './integrationTypes';
+import { IntegrationStatus, IntegrationWithStatus } from '../../../platform/notebooks/deepnote/integrationTypes';
 import { BlockWithIntegration, scanBlocksForIntegrations } from './integrationUtils';
 
 /**
diff --git a/src/notebooks/deepnote/integrations/integrationUtils.ts b/src/notebooks/deepnote/integrations/integrationUtils.ts
@@ -1,6 +1,10 @@
 import { logger } from '../../../platform/logging';
 import { IIntegrationStorage } from './types';
-import { DATAFRAME_SQL_INTEGRATION_ID, IntegrationStatus, IntegrationWithStatus } from './integrationTypes';
+import {
+    DATAFRAME_SQL_INTEGRATION_ID,
+    IntegrationStatus,
+    IntegrationWithStatus
+} from '../../../platform/notebooks/deepnote/integrationTypes';
 
 /**
  * Represents a block with SQL integration metadata
diff --git a/src/notebooks/deepnote/integrations/integrationWebview.ts b/src/notebooks/deepnote/integrations/integrationWebview.ts
@@ -6,7 +6,11 @@ import * as localize from '../../../platform/common/utils/localize';
 import { logger } from '../../../platform/logging';
 import { LocalizedMessages, SharedMessages } from '../../../messageTypes';
 import { IIntegrationStorage, IIntegrationWebviewProvider } from './types';
-import { IntegrationConfig, IntegrationStatus, IntegrationWithStatus } from './integrationTypes';
+import {
+    IntegrationConfig,
+    IntegrationStatus,
+    IntegrationWithStatus
+} from '../../../platform/notebooks/deepnote/integrationTypes';
 
 /**
  * Manages the webview panel for integration configuration
diff --git a/src/notebooks/deepnote/integrations/sqlIntegrationStartupCodeProvider.ts b/src/notebooks/deepnote/integrations/sqlIntegrationStartupCodeProvider.ts
@@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify';
 import { IStartupCodeProvider, IStartupCodeProviders, StartupCodePriority, IKernel } from '../../../kernels/types';
 import { JupyterNotebookView } from '../../../platform/common/constants';
 import { IExtensionSyncActivationService } from '../../../platform/activation/types';
-import { SqlIntegrationEnvironmentVariablesProvider } from './sqlIntegrationEnvironmentVariablesProvider';
+import { SqlIntegrationEnvironmentVariablesProvider } from '../../../platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider';
 import { logger } from '../../../platform/logging';
 import { isPythonKernelConnection } from '../../../kernels/helpers';
 import { DEEPNOTE_NOTEBOOK_TYPE } from '../../../kernels/deepnote/types';
diff --git a/src/notebooks/deepnote/integrations/types.ts b/src/notebooks/deepnote/integrations/types.ts
@@ -1,27 +1,7 @@
-import { Event } from 'vscode';
-import { IDisposable } from '../../../platform/common/types';
-import { IntegrationConfig, IntegrationWithStatus } from './integrationTypes';
+import { IntegrationWithStatus } from '../../../platform/notebooks/deepnote/integrationTypes';
 
-export const IIntegrationStorage = Symbol('IIntegrationStorage');
-export interface IIntegrationStorage extends IDisposable {
-    /**
-     * Event fired when integrations change
-     */
-    readonly onDidChangeIntegrations: Event<void>;
-
-    getAll(): Promise<IntegrationConfig[]>;
-    get(integrationId: string): Promise<IntegrationConfig | undefined>;
-
-    /**
-     * Get integration configuration for a specific project and integration
-     */
-    getIntegrationConfig(projectId: string, integrationId: string): Promise<IntegrationConfig | undefined>;
-
-    save(config: IntegrationConfig): Promise<void>;
-    delete(integrationId: string): Promise<void>;
-    exists(integrationId: string): Promise<boolean>;
-    clear(): Promise<void>;
-}
+// Re-export IIntegrationStorage from platform layer
+export { IIntegrationStorage } from '../../../platform/notebooks/deepnote/types';
 
 export const IIntegrationDetector = Symbol('IIntegrationDetector');
 export interface IIntegrationDetector {
diff --git a/src/notebooks/deepnote/sqlCellStatusBarProvider.ts b/src/notebooks/deepnote/sqlCellStatusBarProvider.ts
@@ -15,7 +15,7 @@ import { IExtensionSyncActivationService } from '../../platform/activation/types
 import { IDisposableRegistry } from '../../platform/common/types';
 import { Commands } from '../../platform/common/constants';
 import { IIntegrationStorage } from './integrations/types';
-import { DATAFRAME_SQL_INTEGRATION_ID } from './integrations/integrationTypes';
+import { DATAFRAME_SQL_INTEGRATION_ID } from '../../platform/notebooks/deepnote/integrationTypes';
 
 /**
  * Provides status bar items for SQL cells showing the integration name
diff --git a/src/notebooks/deepnote/sqlCellStatusBarProvider.unit.test.ts b/src/notebooks/deepnote/sqlCellStatusBarProvider.unit.test.ts
@@ -13,7 +13,7 @@ import {
 import { IDisposableRegistry } from '../../platform/common/types';
 import { IIntegrationStorage } from './integrations/types';
 import { SqlCellStatusBarProvider } from './sqlCellStatusBarProvider';
-import { DATAFRAME_SQL_INTEGRATION_ID, IntegrationType } from './integrations/integrationTypes';
+import { DATAFRAME_SQL_INTEGRATION_ID, IntegrationType } from '../../platform/notebooks/deepnote/integrationTypes';
 
 suite('SqlCellStatusBarProvider', () => {
     let provider: SqlCellStatusBarProvider;
diff --git a/src/notebooks/serviceRegistry.node.ts b/src/notebooks/serviceRegistry.node.ts
@@ -43,7 +43,7 @@ import { INotebookEditorProvider, INotebookPythonEnvironmentService } from './ty
 import { DeepnoteActivationService } from './deepnote/deepnoteActivationService';
 import { DeepnoteNotebookManager } from './deepnote/deepnoteNotebookManager';
 import { IDeepnoteNotebookManager } from './types';
-import { IntegrationStorage } from './deepnote/integrations/integrationStorage';
+import { IntegrationStorage } from '../platform/notebooks/deepnote/integrationStorage';
 import { IntegrationDetector } from './deepnote/integrations/integrationDetector';
 import { IntegrationManager } from './deepnote/integrations/integrationManager';
 import { IntegrationWebviewProvider } from './deepnote/integrations/integrationWebview';
diff --git a/src/notebooks/serviceRegistry.web.ts b/src/notebooks/serviceRegistry.web.ts
@@ -38,7 +38,7 @@ import { INotebookEditorProvider, INotebookPythonEnvironmentService } from './ty
 import { DeepnoteActivationService } from './deepnote/deepnoteActivationService';
 import { DeepnoteNotebookManager } from './deepnote/deepnoteNotebookManager';
 import { IDeepnoteNotebookManager } from './types';
-import { IntegrationStorage } from './deepnote/integrations/integrationStorage';
+import { IntegrationStorage } from '../platform/notebooks/deepnote/integrationStorage';
 import { IntegrationDetector } from './deepnote/integrations/integrationDetector';
 import { IntegrationManager } from './deepnote/integrations/integrationManager';
 import { IntegrationWebviewProvider } from './deepnote/integrations/integrationWebview';
diff --git a/src/platform/notebooks/deepnote/integrationStorage.ts b/src/platform/notebooks/deepnote/integrationStorage.ts
@@ -1,9 +1,9 @@
 import { inject, injectable } from 'inversify';
 import { EventEmitter } from 'vscode';
 
-import { IEncryptedStorage } from '../../../platform/common/application/types';
-import { IAsyncDisposableRegistry } from '../../../platform/common/types';
-import { logger } from '../../../platform/logging';
+import { IEncryptedStorage } from '../../common/application/types';
+import { IAsyncDisposableRegistry } from '../../common/types';
+import { logger } from '../../logging';
 import { IntegrationConfig, IntegrationType } from './integrationTypes';
 import { IIntegrationStorage } from './types';
 
diff --git a/src/platform/notebooks/deepnote/integrationTypes.ts b/src/platform/notebooks/deepnote/integrationTypes.ts
diff --git a/src/platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider.ts b/src/platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider.ts
@@ -1,9 +1,9 @@
 import { inject, injectable } from 'inversify';
 import { CancellationToken, Event, EventEmitter, NotebookDocument, workspace } from 'vscode';
 
-import { IDisposableRegistry, Resource } from '../../../platform/common/types';
-import { EnvironmentVariables } from '../../../platform/common/variables/types';
-import { logger } from '../../../platform/logging';
+import { IDisposableRegistry, Resource } from '../../common/types';
+import { EnvironmentVariables } from '../../common/variables/types';
+import { logger } from '../../logging';
 import { IIntegrationStorage } from './types';
 import { DATAFRAME_SQL_INTEGRATION_ID, IntegrationConfig, IntegrationType } from './integrationTypes';
 
diff --git a/src/platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider.unit.test.ts b/src/platform/notebooks/deepnote/sqlIntegrationEnvironmentVariablesProvider.unit.test.ts
@@ -2,7 +2,7 @@ import { assert } from 'chai';
 import { instance, mock, when } from 'ts-mockito';
 import { EventEmitter, NotebookCell, NotebookCellKind, NotebookDocument, Uri } from 'vscode';
 
-import { IDisposableRegistry } from '../../../platform/common/types';
+import { IDisposableRegistry } from '../../common/types';
 import { IntegrationStorage } from './integrationStorage';
 import { SqlIntegrationEnvironmentVariablesProvider } from './sqlIntegrationEnvironmentVariablesProvider';
 import { IntegrationType, PostgresIntegrationConfig, BigQueryIntegrationConfig } from './integrationTypes';
diff --git a/src/platform/notebooks/deepnote/types.ts b/src/platform/notebooks/deepnote/types.ts
@@ -0,0 +1,25 @@
+import { Event } from 'vscode';
+import { IDisposable } from '../../common/types';
+import { IntegrationConfig } from './integrationTypes';
+
+export const IIntegrationStorage = Symbol('IIntegrationStorage');
+export interface IIntegrationStorage extends IDisposable {
+    /**
+     * Event fired when integrations change
+     */
+    readonly onDidChangeIntegrations: Event<void>;
+
+    getAll(): Promise<IntegrationConfig[]>;
+    get(integrationId: string): Promise<IntegrationConfig | undefined>;
+
+    /**
+     * Get integration configuration for a specific project and integration
+     */
+    getIntegrationConfig(projectId: string, integrationId: string): Promise<IntegrationConfig | undefined>;
+
+    save(config: IntegrationConfig): Promise<void>;
+    delete(integrationId: string): Promise<void>;
+    exists(integrationId: string): Promise<boolean>;
+    clear(): Promise<void>;
+}
+
