Use new container client package (microsoft#3982)

package.json

@@ -3033,6 +3033,7 @@
         "@microsoft/vscode-azext-azureappservice": "^1.0.2",
         "@microsoft/vscode-azext-azureutils": "^1.1.5",
         "@microsoft/vscode-azext-utils": "^1.2.2",
+        "@microsoft/vscode-container-client": "^0.1.0",
         "dayjs": "^1.11.7",
         "dockerfile-language-server-nodejs": "^0.10.2",
         "fs-extra": "^11.1.1",
@@ -3041,7 +3042,6 @@
         "node-fetch": "^2.6.9",
         "semver": "^7.5.2",
         "tar": "^6.1.13",
-        "tree-kill": "^1.2.2",
         "vscode-languageclient": "^8.1.0",
         "vscode-tas-client": "^0.1.63",
         "xml2js": "^0.5.0"

src/commands/containers/attachShellContainer.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext } from '@microsoft/vscode-azext-utils';
+import { ContainerOS, VoidCommandResponse } from '@microsoft/vscode-container-client';
 import { l10n } from 'vscode';
 import { ext } from '../../extensionVariables';
-import { ContainerOS, VoidCommandResponse } from '../../runtimes/docker';
 import { TaskCommandRunnerFactory } from '../../runtimes/runners/TaskCommandRunnerFactory';
 import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';
 import { getDockerOSType } from '../../utils/osUtils';

src/commands/containers/browseContainer.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PortBinding } from '../../runtimes/docker';
 import { IActionContext, IAzureQuickPickItem, TelemetryProperties } from '@microsoft/vscode-azext-utils';
+import { PortBinding } from '@microsoft/vscode-container-client';
 import * as vscode from 'vscode';
 import { ext } from "../../extensionVariables";
 import { ContainerTreeItem } from "../../tree/containers/ContainerTreeItem";

src/commands/containers/composeGroup.ts

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext } from '@microsoft/vscode-azext-utils';
+import { CommonOrchestratorCommandOptions, IContainerOrchestratorClient, LogsCommandOptions, VoidCommandResponse } from '@microsoft/vscode-container-client';
 import * as path from 'path';
 import { l10n } from 'vscode';
 import { ext } from '../../extensionVariables';
-import { CommonOrchestratorCommandOptions, IContainerOrchestratorClient, LogsCommandOptions, VoidCommandResponse } from '../../runtimes/docker';
 import { TaskCommandRunnerFactory } from '../../runtimes/runners/TaskCommandRunnerFactory';
 import { ContainerGroupTreeItem } from '../../tree/containers/ContainerGroupTreeItem';
 import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';

src/commands/images/runAzureCliImage.ts

@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DialogResponses, IActionContext } from '@microsoft/vscode-azext-utils';
+import { RunContainerBindMount } from '@microsoft/vscode-container-client';
 import * as fse from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { l10n } from 'vscode';
 import { ext } from '../../extensionVariables';
-import { RunContainerBindMount } from '../../runtimes/docker';
 import { TaskCommandRunnerFactory } from '../../runtimes/runners/TaskCommandRunnerFactory';
 import { getDockerOSType } from '../../utils/osUtils';
 

src/commands/registries/azure/deployImageToAca.ts

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext, nonNullProp, UserCancelledError } from '@microsoft/vscode-azext-utils';
+import { parseDockerLikeImageName } from '@microsoft/vscode-container-client';
 import * as semver from 'semver';
 import * as vscode from 'vscode';
 import { ext } from '../../../extensionVariables';
-import { parseDockerLikeImageName } from '../../../runtimes/docker/clients/DockerClientBase/parseDockerLikeImageName';
 import { AzureRegistryTreeItem } from '../../../tree/registries/azure/AzureRegistryTreeItem';
 import { DockerHubNamespaceTreeItem } from '../../../tree/registries/dockerHub/DockerHubNamespaceTreeItem';
 import { registryExpectedContextValues } from '../../../tree/registries/registryContextValues';

src/commands/selectCommandTemplate.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext, IAzureQuickPickItem, IAzureQuickPickOptions, UserCancelledError } from '@microsoft/vscode-azext-utils';
+import { PortBinding, VoidCommandResponse } from '@microsoft/vscode-container-client';
 import * as vscode from 'vscode';
 import { ext } from '../extensionVariables';
-import { PortBinding, VoidCommandResponse } from '../runtimes/docker';
 import { isDockerComposeClient } from '../runtimes/OrchestratorRuntimeManager';
 import { resolveVariables } from '../utils/resolveVariables';
 

src/debugging/netcore/NetCoreDebugHelper.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DialogResponses, IActionContext, UserCancelledError } from '@microsoft/vscode-azext-utils';
+import { CommandLineArgs, ContainerOS, VoidCommandResponse, composeArgs, withArg, withQuotedArg } from '@microsoft/vscode-container-client';
 import * as fse from 'fs-extra';
 import * as path from 'path';
 import { DebugConfiguration, MessageItem, ProgressLocation, l10n, window } from 'vscode';
 import { ext } from '../../extensionVariables';
-import { CommandLineArgs, ContainerOS, VoidCommandResponse, composeArgs, withArg, withQuotedArg } from '../../runtimes/docker';
 import { NetCoreTaskHelper, NetCoreTaskOptions } from '../../tasks/netcore/NetCoreTaskHelper';
 import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';
 import { getNetCoreProjectInfo } from '../../utils/netCoreUtils';

src/runtimes/ContainerRuntimeManager.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DockerClient, IContainersClient } from './docker';
+import { DockerClient, IContainersClient } from '@microsoft/vscode-container-client';
 import { ContextManager, IContextManager } from './ContextManager';
 import { RuntimeManager } from './RuntimeManager';
 

src/runtimes/ContextManager.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InspectContextsItem, ListContextItem } from './docker';
+import { InspectContextsItem, ListContextItem } from '@microsoft/vscode-container-client';
 import * as vscode from 'vscode';
 import { ext } from '../extensionVariables';
 

src/runtimes/OrchestratorRuntimeManager.ts

@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isAutoConfigurableDockerComposeClient } from './clients/AutoConfigurableDockerComposeClient';
-import { DockerComposeClient, IContainerOrchestratorClient } from './docker';
+import { DockerComposeClient, IContainerOrchestratorClient } from '@microsoft/vscode-container-client';
 import { RuntimeManager } from './RuntimeManager';
+import { isAutoConfigurableDockerComposeClient } from './clients/AutoConfigurableDockerComposeClient';
 
 export class OrchestratorRuntimeManager extends RuntimeManager<IContainerOrchestratorClient> {
     public readonly onOrchestratorRuntimeClientRegistered = this.runtimeClientRegisteredEmitter.event;

src/runtimes/RuntimeManager.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ClientIdentity } from '@microsoft/vscode-container-client';
 import * as vscode from 'vscode';
-import { ClientIdentity } from './docker';
 
 export abstract class RuntimeManager<TClient extends ClientIdentity> extends vscode.Disposable {
     private readonly _runtimeClients = new Map<string, TClient>();

src/runtimes/clients/AutoConfigurableDockerClient.ts

@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { DockerClient } from '@microsoft/vscode-container-client';
 import * as vscode from 'vscode';
 import { ext } from '../../extensionVariables';
-import { DockerClient } from '../docker';
 import { AutoConfigurableClient } from './AutoConfigurableClient';
 
 export class AutoConfigurableDockerClient extends DockerClient implements AutoConfigurableClient {

src/runtimes/clients/AutoConfigurableDockerComposeClient.ts

@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { DockerComposeClient, IContainerOrchestratorClient } from '@microsoft/vscode-container-client';
 import * as vscode from 'vscode';
 import { ext } from '../../extensionVariables';
 import { execAsync } from '../../utils/execAsync';
 import { AsyncLazy } from '../../utils/lazy';
-import { DockerComposeClient, IContainerOrchestratorClient } from '../docker';
 import { isDockerComposeClient } from '../OrchestratorRuntimeManager';
 import { AutoConfigurableClient } from './AutoConfigurableClient';