Skip to content

ROX-30588: Update claircore #18710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BradLugo wants to merge 1 commit into from
Closed

ROX-30588: Update claircore #18710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 19 additions & 8 deletions compliance/node/index/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"net/http"
"os"
"path/filepath"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -155,11 +156,6 @@ func (l *localNodeIndexer) GetIntervals() *utils.NodeScanIntervals {

// IndexNode indexes a node at the configured host path mount.
func (l *localNodeIndexer) IndexNode(ctx context.Context) (*v4.IndexReport, error) {
// claircore no longer returns an error if the host path does not exist.
if _, err := os.Stat(l.cfg.HostPath); err != nil {
return nil, errors.Wrapf(err, "host path %q does not exist", l.cfg.HostPath)
}

layer, err := layer(ctx, layerDigest, l.cfg.HostPath)
if err != nil {
return nil, err
Expand Down Expand Up @@ -194,15 +190,30 @@ func (l *localNodeIndexer) IndexNode(ctx context.Context) (*v4.IndexReport, erro
}

func layer(ctx context.Context, digest string, hostPath string) (*claircore.Layer, error) {
log.Debugf("Realizing mount path: %s", hostPath)
// claircore no longer returns an error if the host path is empty.
if hostPath == "" {
return nil, errors.New("no URI provided: empty host path")
}

// claircore now requires an absolute path for the file URI
p, err := filepath.Abs(hostPath)
if err != nil {
return nil, errors.New(fmt.Sprintf("could not generate absolute path for host path: %q", hostPath))
}

// claircore no longer returns an error if the host path does not exist.
if _, err = os.Stat(p); err != nil {
return nil, errors.Wrapf(err, "host path %q does not exist", p)
}
log.Debugf("Realizing mount path: %s", p)
desc := &claircore.LayerDescription{
Digest: digest,
URI: hostPath,
URI: fmt.Sprintf("file://%s", p),
MediaType: layerMediaType,
}

l := &claircore.Layer{}
err := l.Init(ctx, desc, nil)
err = l.Init(ctx, desc, nil)
return l, errors.Wrap(err, "failed to init layer")
}

Expand Down
Loading