oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-10-31 22:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

use new atomic stager struct

Browse Source 
Signed-off-by: Will Murphy <will.murphy@anchore.com>
This commit is contained in:
Will Murphy
2023-09-08 10:13:52 -04:00
parent abfd244dc5
commit d54d20a563
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/syft/cli/ui/handle_attestation.go
+3 -3
View File
@@ -65,7 +65,7 @@ func (m *Handler) handleAttestationStarted(e partybus.Event) []tea.Model {
return nil
}
stage := progress.NewStage("")
stage := progress.NewAtomicStage("")
tsk := m.newTaskProgress(
taskprogress.Title{
@@ -108,7 +108,7 @@ func newLogFrame(reader *backgroundLineReader, prog progress.Progressable, borde
}
}
func newBackgroundLineReader(wg *sync.WaitGroup, reader io.Reader, stage *progress.Stage) *backgroundLineReader {
func newBackgroundLineReader(wg *sync.WaitGroup, reader io.Reader, stage *progress.AtomicStage) *backgroundLineReader {
r := &backgroundLineReader{
limit: 7,
lock: &sync.RWMutex{},
@@ -131,7 +131,7 @@ func newBackgroundLineReader(wg *sync.WaitGroup, reader io.Reader, stage *progre
return r
}
func (l *backgroundLineReader) read(reader io.Reader, stage *progress.Stage) {
func (l *backgroundLineReader) read(reader io.Reader, stage *progress.AtomicStage) {
s := bufio.NewScanner(reader)
for s.Scan() {
cmd/syft/cli/ui/handle_fetch_image_test.go
+2 -2
View File
@@ -33,7 +33,7 @@ func TestHandler_handleFetchImage(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
@@ -56,7 +56,7 @@ func TestHandler_handleFetchImage(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
cmd/syft/cli/ui/handle_file_digests_cataloger_test.go
+2 -2
View File
@@ -33,7 +33,7 @@ func TestHandler_handleFileDigestsCatalogerStarted(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
@@ -55,7 +55,7 @@ func TestHandler_handleFileDigestsCatalogerStarted(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
cmd/syft/cli/ui/handle_file_indexing_test.go
+2 -2
View File
@@ -33,7 +33,7 @@ func TestHandler_handleFileIndexingStarted(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
@@ -56,7 +56,7 @@ func TestHandler_handleFileIndexingStarted(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
cmd/syft/cli/ui/handle_file_metadata_cataloger_test.go
+2 -2
View File
@@ -33,7 +33,7 @@ func TestHandler_handleFileMetadataCatalogerStarted(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
@@ -55,7 +55,7 @@ func TestHandler_handleFileMetadataCatalogerStarted(t *testing.T) {
progress.Stager
}{
Progressable: prog,
Stager: progress.NewStage("current"),
Stager: progress.NewAtomicStage("current"),
}
return partybus.Event{
cmd/syft/cli/ui/handle_secrets_cataloger_test.go
+2 -2
View File
@@ -25,7 +25,7 @@ func TestHandler_handleSecretsCatalogerStarted(t *testing.T) {
{
name: "cataloging in progress",
eventFn: func(t *testing.T) partybus.Event {
stage := progress.NewStage("current")
stage := progress.NewAtomicStage("current")
secretsDiscovered := progress.NewManual(-1)
secretsDiscovered.Set(64)
prog := progress.NewManual(72)
@@ -45,7 +45,7 @@ func TestHandler_handleSecretsCatalogerStarted(t *testing.T) {
{
name: "cataloging complete",
eventFn: func(t *testing.T) partybus.Event {
stage := progress.NewStage("current")
stage := progress.NewAtomicStage("current")
secretsDiscovered := progress.NewManual(-1)
secretsDiscovered.Set(64)
prog := progress.NewManual(72)