Refactors OSS scan parsing and renames method

Author: cx-sarah-chen

src/main/oss/CxOss.ts

@@ -13,32 +13,33 @@ export default class CxOssResult {
 
 
   static parseResult(resultObject: any): CxOssResult[] {
+    let packages = resultObject.Packages;
     let ossResults: CxOssResult[] = [];
-    if (resultObject instanceof Array) {
-        ossResults = resultObject.map((member: any) => {
+    if (packages instanceof Array) {
+        ossResults = packages.map((member: any) => {
         const ossResult = new CxOssResult();
         ossResult.packageManager = member.PackageManager;
-        ossResult.packageName = member.PackageName;
-        ossResult.version = member.Version;
-        ossResult.filepath = member.Filepath;
-        ossResult.lineStart = member.LineStart;
-        ossResult.lineEnd = member.LineEnd;
-        ossResult.startIndex = member.StartIndex;
-        ossResult.endIndex = member.EndIndex;
-        ossResult.status = member.Status as CxManifestStatus;
+                ossResult.packageName = member.PackageName;
+                ossResult.version = member.PackageVersion;
+                ossResult.filepath = member.FilePath;
+                ossResult.lineStart = member.LineStart;
+                ossResult.lineEnd = member.LineEnd;
+                ossResult.startIndex = member.StartIndex;
+                ossResult.endIndex = member.EndIndex;
+                ossResult.status = member.Status as CxManifestStatus;
         return ossResult;
       });
     } else {
         const ossResult = new CxOssResult();
-        ossResult.packageManager = resultObject.PackageManager;
-        ossResult.packageName = resultObject.PackageName;
-        ossResult.version = resultObject.Version;
-        ossResult.filepath = resultObject.FilePath;
-        ossResult.lineStart = resultObject.LineStart;
-        ossResult.lineEnd = resultObject.LineEnd;
-        ossResult.startIndex = resultObject.StartIndex;
-        ossResult.endIndex = resultObject.EndIndex; 
-        ossResult.status = resultObject.Status as CxManifestStatus;
+        ossResult.packageManager = packages.PackageManager;
+        ossResult.packageName = packages.PackageName;
+        ossResult.version = packages.PackageVersion;
+        ossResult.filepath = packages.FilePath;
+        ossResult.lineStart = packages.LineStart;
+        ossResult.lineEnd = packages.LineEnd;
+        ossResult.startIndex = packages.StartIndex;
+        ossResult.endIndex = packages.EndIndex; 
+        ossResult.status = packages.Status as CxManifestStatus;
         ossResults.push(ossResult);
     }
     return ossResults;

src/main/wrapper/CxWrapper.ts

@@ -147,7 +147,7 @@ export class CxWrapper {
         return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.SCAN_ASCA);
     }
 
-    async scanOss(sourceFile: string): Promise<CxCommandOutput> {
+    async ossScanResults(sourceFile: string): Promise<CxCommandOutput> {
         const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.CMD_OSS, CxConstants.SOURCE, sourceFile];
         commands.push(...this.initializeCommands(false));
         const exec = new ExecutionService();