diff --git a/src/commonRunTestsHandler.ts b/src/commonRunTestsHandler.ts index 9362f0c..7a78846 100644 --- a/src/commonRunTestsHandler.ts +++ b/src/commonRunTestsHandler.ts @@ -1,5 +1,6 @@ import * as vscode from 'vscode'; -import { allTestRuns, extensionId, IServerSpec, osAPI } from './extension'; +import { IServerSpec } from "@intersystems-community/intersystems-servermanager"; +import { allTestRuns, extensionId, osAPI } from './extension'; import { relativeTestRoot } from './localTests'; import logger from './logger'; import { makeRESTRequest } from './makeRESTRequest'; diff --git a/src/extension.ts b/src/extension.ts index a98ba3a..aafe9fa 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -19,28 +19,6 @@ export interface TestRun extends vscode.TestRun { } export const allTestRuns: (TestRun | undefined)[] = []; -export interface IWebServerSpec { - scheme?: string; - host: string; - port: number; - pathPrefix?: string; -} - -export interface IServerSpec { - name: string; - webServer: IWebServerSpec; - username?: string; - password?: string; - description?: string; -} - -export interface IJSONServerSpec { - webServer: IWebServerSpec; - username?: string; - password?: string; - description?: string; -} - async function getServerManagerAPI(): Promise { const targetExtension = vscode.extensions.getExtension("intersystems-community.servermanager"); if (!targetExtension) { diff --git a/src/historyExplorer.ts b/src/historyExplorer.ts index 53f6549..b340967 100644 --- a/src/historyExplorer.ts +++ b/src/historyExplorer.ts @@ -1,5 +1,6 @@ import * as vscode from 'vscode'; -import { historyBrowserController, IServerSpec, osAPI, smAPI } from './extension'; +import { IServerSpec } from "@intersystems-community/intersystems-servermanager"; +import { historyBrowserController, osAPI, smAPI } from './extension'; import logger from './logger'; import { makeRESTRequest } from './makeRESTRequest'; diff --git a/src/makeRESTRequest.ts b/src/makeRESTRequest.ts index 9e79e64..1c1efca 100644 --- a/src/makeRESTRequest.ts +++ b/src/makeRESTRequest.ts @@ -2,7 +2,8 @@ import axios, { AxiosResponse } from "axios"; import axiosCookieJarSupport from "axios-cookiejar-support"; import tough = require("tough-cookie"); import * as vscode from "vscode"; -import { IServerSpec, smAPI } from "./extension"; +import { IServerSpec } from "@intersystems-community/intersystems-servermanager"; +import { smAPI } from "./extension"; import * as https from 'https'; const AUTHENTICATION_PROVIDER = "intersystems-server-credentials";