Feb 1, 2024 · Feb 1, 2024
diff --git a/jfrog/client.go b/jfrog/client.go

 type Client interface {
 ScanResults(img Image) (ScanResult, error)
 ResultsURL(img Image, packageID string) string
 }

 type client struct {
 type ScanResult struct {
 Version        string         `json:"version"`
 SecurityIssues SecurityIssues `json:"sec_issues"`
 PackageID      string         `json:"package_id"`
 }

 type SecurityIssues struct {
 Version string
 }

 func (c *client) ResultsURL(img Image, packageID string) string {
 return fmt.Sprintf("%s/ui/scans-list/packages-scans/%s/%s/scan-descendants/%s?package_id=%s&version=%s", c.baseURL, img.Repo, img.Package, img.Version, packageID, img.Version)
 }

 func ParseImage(image string) (Image, error) {
 tag, err := name.NewTag(image)
 if err != nil {
diff --git a/jfrog/doc.go b/jfrog/doc.go
 // artifactory instance.
 package jfrog

 //go:generate mockgen -destination ./mock.go -package jfrog github.com/coder/xray/jfrog Client
 //go:generate mockgen -destination ./mock.go -package jfrog github.com/coder/coder-xray/jfrog Client
diff --git a/jfrog/mock.go b/jfrog/mock.go
diff --git a/reporter/codermock.go b/reporter/codermock.go
diff --git a/reporter/doc.go b/reporter/doc.go
 // and uploading results to a Coder deployment.
 package reporter

 //go:generate mockgen -destination ./codermock.go -package reporter github.com/coder/xray/reporter CoderClient
 //go:generate mockgen -destination ./codermock.go -package reporter github.com/coder/coder-xray/reporter CoderClient
diff --git a/reporter/reporter.go b/reporter/reporter.go
 Critical:    scan.SecurityIssues.Critical,
 High:        scan.SecurityIssues.High,
 Medium:      scan.SecurityIssues.Medium,
 ResultsURL:  k.JFrogClient.ResultsURL(image, scan.PackageID),
 }
 err = k.CoderClient.PostJFrogXrayScan(ctx, req)
 if err != nil {
diff --git a/reporter/reporter_test.go b/reporter/reporter_test.go
 resultsCh   = make(chan codersdk.JFrogXrayScan)
 )

 jfrogClient.EXPECT().ScanResults(jfrog.Image{
 img :=jfrog.Image{
 Repo:    "my-repo",
 Package: "ubuntu",
 Version: "22.04",
 }).Return(jfrog.ScanResult{
 }

 xrayResult := jfrog.ScanResult{
 Version: "22.04",
 SecurityIssues: jfrog.SecurityIssues{
 Critical: expectedCrit,
 High:     expectedHigh,
 Medium:   expectedMedium,
 Total:    expectedCrit + expectedHigh + expectedMedium,
 },
 }, nil)
 PackageID: "docker://my-repo/ubuntu",
 }

 jfrogClient.EXPECT().ScanResults(img).Return(xrayResult, nil)

 jfrogClient.EXPECT().ResultsURL(img, xrayResult.PackageID)

 coderClient.EXPECT().AgentManifest(ctx, expectedAgentToken).Return(agentsdk.Manifest{
 WorkspaceID: expectedWorkspaceID,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,7 @@ import (

		type Client interface {
		ScanResults(img Image) (ScanResult, error)
		ResultsURL(img Image, packageID string) string
		}

		type client struct {
Expand DownExpand Up		@@ -55,6 +56,7 @@ type securityResultsPayload struct {
		type ScanResult struct {
		Version string `json:"version"`
		SecurityIssues SecurityIssues `json:"sec_issues"`
		PackageID string `json:"package_id"`
		}

		type SecurityIssues struct {
Expand DownExpand Up		@@ -98,6 +100,10 @@ type Image struct {
		Version string
		}

		func (c *client) ResultsURL(img Image, packageID string) string {
		return fmt.Sprintf("%s/ui/scans-list/packages-scans/%s/%s/scan-descendants/%s?package_id=%s&version=%s", c.baseURL, img.Repo, img.Package, img.Version, packageID, img.Version)
		}

		func ParseImage(image string) (Image, error) {
		tag, err := name.NewTag(image)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@
		// artifactory instance.
		package jfrog

		//go:generate mockgen -destination ./mock.go -package jfrog github.com/coder/xray/jfrog Client
		//go:generate mockgen -destination ./mock.go -package jfrog github.com/coder/coder-xray/jfrog Client
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@
		// and uploading results to a Coder deployment.
		package reporter

		//go:generate mockgen -destination ./codermock.go -package reporter github.com/coder/xray/reporter CoderClient
		//go:generate mockgen -destination ./codermock.go -package reporter github.com/coder/coder-xray/reporter CoderClient
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,6 +99,7 @@ func (k *K8sReporter) Init(ctx context.Context) error {
		Critical: scan.SecurityIssues.Critical,
		High: scan.SecurityIssues.High,
		Medium: scan.SecurityIssues.Medium,
		ResultsURL: k.JFrogClient.ResultsURL(image, scan.PackageID),
		}
		err = k.CoderClient.PostJFrogXrayScan(ctx, req)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,19 +45,26 @@ func TestK8SReporter(t *testing.T) {
		resultsCh = make(chan codersdk.JFrogXrayScan)
		)

		jfrogClient.EXPECT().ScanResults(jfrog.Image{
		img :=jfrog.Image{
		Repo: "my-repo",
		Package: "ubuntu",
		Version: "22.04",
		}).Return(jfrog.ScanResult{
		}

		xrayResult := jfrog.ScanResult{
		Version: "22.04",
		SecurityIssues: jfrog.SecurityIssues{
		Critical: expectedCrit,
		High: expectedHigh,
		Medium: expectedMedium,
		Total: expectedCrit + expectedHigh + expectedMedium,
		},
		}, nil)
		PackageID: "docker://my-repo/ubuntu",
		}

		jfrogClient.EXPECT().ScanResults(img).Return(xrayResult, nil)

		jfrogClient.EXPECT().ResultsURL(img, xrayResult.PackageID)

		coderClient.EXPECT().AgentManifest(ctx, expectedAgentToken).Return(agentsdk.Manifest{
		WorkspaceID: expectedWorkspaceID,
Expand Down