Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: use correct URL
  • Loading branch information
sreya committed Feb 2, 2024
commit a282df789f7ea41afd2a44f222196cb6bdfc509f
2 changes: 1 addition & 1 deletion jfrog/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ type Image struct {
}

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)
return fmt.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)
}

func ParseImage(image string) (Image, error) {
Expand Down
18 changes: 15 additions & 3 deletions reporter/reporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ package reporter
import (
"context"
"fmt"
"time"

"golang.org/x/xerrors"

"github.com/google/uuid"

"github.com/coder/coder-xray/jfrog"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/retry"

corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -82,9 +85,18 @@ func (k *K8sReporter) Init(ctx context.Context) error {
return codersdk.JFrogXrayScan{}, xerrors.Errorf("fetch scan results: %w", err)
}

manifest, err := k.CoderClient.AgentManifest(ctx, agentToken)
if err != nil {
return codersdk.JFrogXrayScan{}, xerrors.Errorf("agent manifest: %w", err)
var manifest agentsdk.Manifest
retryCtx, cancel := context.WithTimeout(ctx, time.Minute*10)
defer cancel()
for r := retry.New(time.Second, 5*time.Second); r.Wait(retryCtx); {
manifest, err = k.CoderClient.AgentManifest(retryCtx, agentToken)
if err == nil {
break
}
if xerrors.Is(err, context.Canceled) {
break
}
log.Warn(ctx, "failed to fetch agent manifest", slog.Error(err))
}

log = log.With(
Expand Down
2 changes: 1 addition & 1 deletion reporter/reporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestK8SReporter(t *testing.T) {

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

coderClient.EXPECT().AgentManifest(ctx, expectedAgentToken).Return(agentsdk.Manifest{
coderClient.EXPECT().AgentManifest(gomock.Any(), expectedAgentToken).Return(agentsdk.Manifest{
WorkspaceID: expectedWorkspaceID,
AgentID: expectedAgentID,
}, nil)
Expand Down