Merge pull request #849 from oracle/release/24.2

merge release/24.2 into maser after vscode-extension v2.0.1 changes

Author: alisyed-19

packages/vscode-extension/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.0.1
+
+- Fix for GitHub issue 841
+- Fix for privatekeypath
+
 ## 2.0.0
 
 - Upgrade to OAuth 2.0 authorization protocol

packages/vscode-extension/package-lock.json

@@ -12,16 +12,13 @@
 	"publisher": "Oracle",
 	"license": "UPL-1.0",
 	"private": true,
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"icon": "resources/extension_icon_dark.png",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/oracle/netsuite-suitecloud-sdk.git",
 		"directory": "packages/vscode-extension"
 	},
-	"files": [
-		"**/*.vsix"
-	],
 	"engines": {
 		"vscode": "^1.91.1"
 	},

packages/vscode-extension/package.json

@@ -14,7 +14,6 @@ import { actionResultStatus, ApplicationConstants, ProjectInfoService } from '..
 import FileImportCommon from './FileImportCommon';
 
 export default class CompareFile extends FileImportCommon {
-	private static readonly ACCOUNT_COPY_BASE_NAME = 'accountCopy';
 	private static readonly COMMAND_NAME = 'comparefile';
 	private static readonly SCHEME = 'suitecloud';
 	private static readonly TEMP_FOLDER_PREFIX = 'suitecloud-vscode-extension-compare-file-';
@@ -47,25 +46,26 @@ export default class CompareFile extends FileImportCommon {
 
 	protected async execute() {
 		const activeFilePath = this.activeFile!;
-		const tempFolderPath = fs.mkdtempSync(path.join(os.tmpdir(), CompareFile.TEMP_FOLDER_PREFIX));
-
-		this.copyManifestFileToTempFolder(tempFolderPath);
-		this.copyProjectJsonToTempFolder(tempFolderPath);
+		// create temp project folder to import file to be compared
+		const tempProjectFolderPath = fs.mkdtempSync(path.join(os.tmpdir(), CompareFile.TEMP_FOLDER_PREFIX));
+		// temp project prepartion to import file
+		this.copyManifestFileToTempFolder(tempProjectFolderPath);
+		this.copyProjectJsonToTempFolder(tempProjectFolderPath);
 		const activeFileRelativePath = activeFilePath.split(this.getFileCabinetFolderPath())[1]?.replace(/\\/g, '/');
-		const importFilePath = this.getImportFilePath(tempFolderPath, activeFilePath, activeFileRelativePath);
-
-		const selectedFilesPaths = [];
-		selectedFilesPaths.push(activeFileRelativePath);
+		const importFilePath = this.getImportFilePath(tempProjectFolderPath, activeFilePath, activeFileRelativePath);
 
-		const commandArgs = {
-			paths: selectedFilesPaths,
+		// file:import args preparation and trigger
+		const fileImportArgs = {
+			paths: [activeFileRelativePath],
 			excludeproperties: 'true',
 			calledfromcomparefiles: 'true',
 		};
-
-		const commandActionPromise = this.runSuiteCloudCommand(commandArgs, tempFolderPath);
+		const commandActionPromise = this.runSuiteCloudCommand(fileImportArgs, tempProjectFolderPath);
 		this.messageService.showStatusBarMessage(this.translationService.getMessage(COMPARE_FILE.COMPARING_FILE), true, commandActionPromise);
+		
+		// file:import result
 		const actionResult = await commandActionPromise;
+		
 		if (actionResult.status === actionResultStatus.SUCCESS && actionResult.data) {
 			if (actionResult.data.results[0].loaded) {
 				vscode.commands.executeCommand(
@@ -89,14 +89,13 @@ export default class CompareFile extends FileImportCommon {
 
 	private getImportedFileUri(importFilePath: string): Uri {
 		const scheme = CompareFile.SCHEME;
-		const provider = new (class implements vscode.TextDocumentContentProvider {
+		const provider = new class implements vscode.TextDocumentContentProvider {
 			provideTextDocumentContent(uri: vscode.Uri): string {
-				return fs.readFileSync(importFilePath, 'utf-8');
+				return fs.readFileSync(uri.fsPath, 'utf-8');
 			}
-		})();
+		};
 		vscode.workspace.registerTextDocumentContentProvider(scheme, provider);
-		const accountCopyExtension = path.extname(importFilePath);
-		const schemeUri = `${scheme}: ${CompareFile.ACCOUNT_COPY_BASE_NAME}.${accountCopyExtension}`;
+		const schemeUri = `${scheme}:${importFilePath}`;
 		return vscode.Uri.parse(schemeUri);
 	}
 

packages/vscode-extension/src/commands/CompareFile.ts

@@ -302,7 +302,7 @@ export default class SetupAccount extends BaseAction {
 			authid: authId,
 			account: accountId,
 			certificateid: certificateId,
-			privatekeypath: privateKeyFilePath[0].fsPath,
+			privatekeypath: `"${privateKeyFilePath[0].fsPath}"`,
 			domain: url,
 		};