update

Author: Mathiyarasy

src/spec-common/cliHost.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import * as net from 'net';
 import * as os from 'os';
 
-import { readLocalFile, writeLocalFile, mkdirpLocal, isLocalFile, renameLocal, readLocalDir, isLocalFolder } from '../spec-utils/pfs';
+import { readLocalFile, writeLocalFile, mkdirpLocal, isLocalFile, renameLocal, readLocalDir, isLocalFolder, rmLocal, cpLocal } from '../spec-utils/pfs';
 import { URI } from 'vscode-uri';
 import { ExecFunction, getLocalUsername, plainExec, plainPtyExec, PtyExecFunction } from './commonUtils';
 import { Abort, Duplex, Sink, Source, SourceCallback } from 'pull-stream';
@@ -32,7 +32,9 @@ export interface CLIHost {
 	isFolder(filepath: string): Promise<boolean>;
 	readFile(filepath: string): Promise<Buffer>;
 	writeFile(filepath: string, content: Buffer): Promise<void>;
+	copyFile(oldPath: string, newPath: string): Promise<void>;
 	rename(oldPath: string, newPath: string): Promise<void>;
+	remove(filepath: string): Promise<void>;
 	mkdirp(dirpath: string): Promise<void>;
 	readDir(dirpath: string): Promise<string[]>;
 	readDirWithTypes?(dirpath: string): Promise<[string, FileTypeBitmask][]>;
@@ -76,7 +78,9 @@ function createLocalCLIHostFromExecFunctions(localCwd: string, exec: ExecFunctio
 		isFolder: isLocalFolder,
 		readFile: readLocalFile,
 		writeFile: writeLocalFile,
+		copyFile: cpLocal,
 		rename: renameLocal,
+		remove: async (filepath) => rmLocal(filepath, { force: true }),
 		mkdirp: async (dirpath) => {
 			await mkdirpLocal(dirpath);
 		},

src/spec-node/dockerfilePreprocessor.ts

@@ -6,7 +6,8 @@
 import * as path from 'path';
 import { DevContainerFromDockerComposeConfig, DevContainerFromDockerfileConfig } from '../spec-configuration/configuration';
 import { ContainerError, toErrorText } from '../spec-common/errors';
-import { CLIHost, runCommandNoPty } from '../spec-common/commonUtils';
+import { CLIHost } from '../spec-common/cliHost';
+import { runCommandNoPty } from '../spec-common/commonUtils';
 import { Log, LogLevel, makeLog } from '../spec-utils/log';
 
 function dockerfilePreprocessorToolDocs(): string {
@@ -54,17 +55,7 @@ export async function preprocessDockerExtensionFile(
 		if (!await cliHost.isFile(stalePath)) {
 			continue;
 		}
-		const cleanupCommand = cliHost.platform === 'win32'
-			? { cmd: 'cmd', args: ['/d', '/s', '/c', `del /f /q "${stalePath}"`] }
-			: { cmd: 'rm', args: ['-f', stalePath] };
-		await runCommandNoPty({
-			exec: cliHost.exec,
-			cmd: cleanupCommand.cmd,
-			args: cleanupCommand.args,
-			cwd: workdirPath,
-			env: cliHost.env,
-			output: infoOutput,
-		});
+		await cliHost.remove(stalePath);
 	}
 
 	// Strict contract: the CLI owns the final output path. Direct-transform
@@ -128,7 +119,8 @@ export async function preprocessDockerExtensionFile(
 	}
 
 	if (generatedOutputPath !== outputPath) {
-		await cliHost.rename(generatedOutputPath, outputPath);
+		await cliHost.copyFile(generatedOutputPath, outputPath);
+		await cliHost.remove(generatedOutputPath);
 	}
 
 	infoOutput.write(`Preprocessed Dockerfile written to '${cliOutputPath}'`);

src/test/workspaceConfiguration.test.ts

@@ -35,7 +35,9 @@ function createMockCLIHost(options: {
 			throw new Error(`File not found: ${filepath}`);
 		},
 		writeFile: async () => { },
+		copyFile: async () => { },
 		rename: async () => { },
+		remove: async () => { },
 		mkdirp: async () => { },
 		readDir: async () => [],
 		getUsername: async () => 'test',