Skip to content

Commit 5754b3d

Browse files
committed
Refactor oss-realtime to use dynamic file source flag
Replaced hardcoded mock data with dynamic file source input for building mock scan results. Added validation for the source flag and improved error handling. This ensures greater flexibility and alignment with user-specified inputs.
1 parent fb25cc7 commit 5754b3d

1 file changed

Lines changed: 45 additions & 39 deletions

File tree

internal/commands/ossrealtime/oss-realtime-engine.go

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,23 @@
11
package ossrealtime
22

33
import (
4+
"errors"
5+
46
"github.com/checkmarx/ast-cli/internal/commands/util/printer"
7+
commonParams "github.com/checkmarx/ast-cli/internal/params"
58
"github.com/checkmarx/ast-cli/internal/wrappers"
69
"github.com/spf13/cobra"
710
)
811

9-
var mockPackages = []Response{
10-
{
11-
PackageManager: "npm",
12-
PackageName: "@ant-design/icons",
13-
Version: "2.1.1",
14-
FilePath: "package.json",
15-
LineStart: 23,
16-
LineEnd: 23,
17-
StartIndex: 5,
18-
EndIndex: 20,
19-
Status: "OK",
20-
},
21-
{
22-
PackageManager: "npm",
23-
PackageName: "@babel/cli",
24-
Version: "7.12.1",
25-
FilePath: "package.json",
26-
LineStart: 26,
27-
LineEnd: 26,
28-
StartIndex: 5,
29-
EndIndex: 20,
30-
Status: "Malicious",
31-
},
32-
{
33-
PackageManager: "npm",
34-
PackageName: "express",
35-
Version: "4.17.1",
36-
FilePath: "package.json",
37-
LineStart: 30,
38-
LineEnd: 30,
39-
StartIndex: 5,
40-
EndIndex: 20,
41-
Status: "Unknown",
42-
},
43-
}
44-
4512
func RunScanOssRealtimeCommand(jwtWrapper wrappers.JWTWrapper, featureFlagWrapper wrappers.FeatureFlagsWrapper) func(cmd *cobra.Command, args []string) error {
4613
return func(cmd *cobra.Command, args []string) error {
47-
//fileSourceFlag, _ := cmd.Flags().GetString(commonParams.SourcesFlag)
14+
fileSourceFlag, _ := cmd.Flags().GetString(commonParams.SourcesFlag)
15+
if fileSourceFlag == "" {
16+
return errors.New("file source flag is required")
17+
}
4818
// agent, _ := cmd.Flags().GetString(commonParams.AgentFlag)
4919

50-
packages := buildMockScanResult()
20+
packages := buildMockScanResult(fileSourceFlag)
5121

5222
err := printer.Print(cmd.OutOrStdout(), packages, printer.FormatJSON)
5323
if err != nil {
@@ -58,7 +28,43 @@ func RunScanOssRealtimeCommand(jwtWrapper wrappers.JWTWrapper, featureFlagWrappe
5828
}
5929
}
6030

61-
func buildMockScanResult() []Response {
31+
func buildMockScanResult(fileSource string) []Response {
32+
mockPackages := []Response{
33+
{
34+
PackageManager: "npm",
35+
PackageName: "@ant-design/icons",
36+
Version: "2.1.1",
37+
FilePath: fileSource,
38+
LineStart: 23,
39+
LineEnd: 23,
40+
StartIndex: 5,
41+
EndIndex: 20,
42+
Status: "OK",
43+
},
44+
{
45+
PackageManager: "npm",
46+
PackageName: "@babel/cli",
47+
Version: "7.12.1",
48+
FilePath: fileSource,
49+
LineStart: 26,
50+
LineEnd: 26,
51+
StartIndex: 5,
52+
EndIndex: 20,
53+
Status: "Malicious",
54+
},
55+
{
56+
PackageManager: "npm",
57+
PackageName: "express",
58+
Version: "4.17.1",
59+
FilePath: fileSource,
60+
LineStart: 30,
61+
LineEnd: 30,
62+
StartIndex: 5,
63+
EndIndex: 20,
64+
Status: "Unknown",
65+
},
66+
}
67+
6268
return mockPackages
6369
}
6470

0 commit comments

Comments
 (0)