Skip to content
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

feat(image): add progress bar for image layer pulling #8186

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

feat(image): add progress bar for image layer pulling #8186

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84689dd
feat(image): prevent scanning oversized container images
nikpivkin Dec 25, 2024
eddcbf8
refactor: pull layers in parallel
nikpivkin Dec 25, 2024
2902779
refactor: clear an error when image size is exceeded
nikpivkin Dec 26, 2024
adaea74
test: add tests for image flags
nikpivkin Dec 26, 2024
a6ce2ed
test: add integration tests
nikpivkin Dec 26, 2024
729e89a
feat(image): add progress bar for image layer pulling
nikpivkin Dec 26, 2024
191cf46
refactor: use progress bar pool
nikpivkin Dec 27, 2024
829bdc2
refactor: add image walker
nikpivkin Dec 28, 2024
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
Prev Previous commit
Next Next commit
test: add integration tests 
Signed-off-by: nikpivkin <nikita.pivkin@smartforce.io>
  • Loading branch information
@nikpivkin
nikpivkin committed Dec 26, 2024
commit a6ce2edbc161eaa0a0db257fc106ab2bd629093c
18 changes: 18 additions & 0 deletions integration/docker_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestDockerEngine(t *testing.T) {
ignoreStatus []string
severity []string
ignoreIDs []string
maxImageSize string
input string
golden string
wantErr string
Expand All @@ -34,6 +35,12 @@ func TestDockerEngine(t *testing.T) {
input: "testdata/fixtures/images/alpine-39.tar.gz",
golden: "testdata/alpine-39.json.golden",
},
{
name: "alpine:3.9, with max image size",
maxImageSize: "100mb",
input: "testdata/fixtures/images/alpine-39.tar.gz",
golden: "testdata/alpine-39.json.golden",
},
{
name: "alpine:3.9, with high and critical severity",
severity: []string{
Expand Down Expand Up @@ -195,6 +202,12 @@ func TestDockerEngine(t *testing.T) {
input: "badimage:latest",
wantErr: "unable to inspect the image (badimage:latest)",
},
{
name: "sad path, image size is larger than the maximum",
input: "testdata/fixtures/images/alpine-39.tar.gz",
maxImageSize: "1mb",
wantErr: "uncompressed image size 5.8MB exceeds maximum allowed size 1MB",
},
}

// Set up testing DB
Expand Down Expand Up @@ -263,6 +276,11 @@ func TestDockerEngine(t *testing.T) {
require.NoError(t, err, "failed to write .trivyignore")
defer os.Remove(trivyIgnore)
}

if tt.maxImageSize != "" {
osArgs = append(osArgs, []string{"--max-image-size", tt.maxImageSize}...)
}

osArgs = append(osArgs, tt.input)

// Run Trivy
Expand Down
Loading