Commit836902e

authored

fix: use correct URL (#8)

1 parent5d86b9c commit836902eCopy full SHA for 836902e

File tree

+17

-5

lines changed

+17

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ type Image struct {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (c*client)ResultsURL(imgImage,packageIDstring)string {`
`104`		`-returnfmt.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)`
	`104`	`+returnfmt.Sprintf("%s/ui/scans-list/packages-scans/%s/scan-descendants/%s?package_id=%s&version=%s",c.baseURL,img.Package,img.Version,packageID,img.Version)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`funcParseImage(imagestring) (Image,error) {`

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,16 @@ package reporter`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
	`6`	`+"time"`
`6`	`7`
`7`	`8`	`"golang.org/x/xerrors"`
`8`	`9`
`9`	`10`	`"github.com/google/uuid"`
`10`	`11`
`11`	`12`	`"github.com/coder/coder-xray/jfrog"`
`12`	`13`	`"github.com/coder/coder/v2/codersdk"`
	`14`	`+"github.com/coder/coder/v2/codersdk/agentsdk"`
	`15`	`+"github.com/coder/retry"`
`13`	`16`
`14`	`17`	`corev1"k8s.io/api/core/v1"`
`15`	`18`	`v1"k8s.io/apimachinery/pkg/apis/meta/v1"`
`@@ -82,9 +85,18 @@ func (k *K8sReporter) Init(ctx context.Context) error {`
`82`	`85`	`return codersdk.JFrogXrayScan{},xerrors.Errorf("fetch scan results: %w",err)`
`83`	`86`	`}`
`84`	`87`
`85`		`-manifest,err:=k.CoderClient.AgentManifest(ctx,agentToken)`
`86`		`-iferr!=nil {`
`87`		`-return codersdk.JFrogXrayScan{},xerrors.Errorf("agent manifest: %w",err)`
	`88`	`+varmanifest agentsdk.Manifest`
	`89`	`+retryCtx,cancel:=context.WithTimeout(ctx,time.Minute*10)`
	`90`	`+defercancel()`
	`91`	`+forr:=retry.New(time.Second,5*time.Second);r.Wait(retryCtx); {`
	`92`	`+manifest,err=k.CoderClient.AgentManifest(retryCtx,agentToken)`
	`93`	`+iferr==nil {`
	`94`	`+break`
	`95`	`+}`
	`96`	`+ifxerrors.Is(err,context.Canceled) {`
	`97`	`+break`
	`98`	`+}`
	`99`	`+log.Warn(ctx,"failed to fetch agent manifest",slog.Error(err))`
`88`	`100`	`}`
`89`	`101`
`90`	`102`	`log=log.With(`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func TestK8SReporter(t *testing.T) {`
`66`	`66`
`67`	`67`	`jfrogClient.EXPECT().ResultsURL(img,xrayResult.PackageID)`
`68`	`68`
`69`		`-coderClient.EXPECT().AgentManifest(ctx,expectedAgentToken).Return(agentsdk.Manifest{`
	`69`	`+coderClient.EXPECT().AgentManifest(gomock.Any(),expectedAgentToken).Return(agentsdk.Manifest{`
`70`	`70`	`WorkspaceID:expectedWorkspaceID,`
`71`	`71`	`AgentID:expectedAgentID,`
`72`	`72`	`},nil)`

Comments

(0)