STRLCPY/syft

■ ■ ■ ■ ■ ■

cmd/syft/cli/attest/attest.go

		skipped 166 lines
167	167		}
168	168		defer w.Close()
169	169
170		-	b := &busWriter{r: r, w: w, mon: &progress.Manual{N: -1}}
	170	+	b := &busWriter{r: r, w: w, mon: progress.NewManual(-1)}
171	171		execCmd.Stdout = b
172	172		execCmd.Stderr = b
173	173		defer b.mon.SetCompleted()
		skipped 1 lines
175	175		// attest the SBOM
176	176		err = execCmd.Run()
177	177		if err != nil {
178		-	b.mon.Err = err
	178	+	b.mon.SetError(err)
179	179		errs <- fmt.Errorf("unable to attest SBOM: %w", err)
180	180		return
181	181		}
		skipped 64 lines

■ ■ ■ ■ ■ ■

go.mod

		skipped 38 lines
39	39		github.com/stretchr/testify v1.8.2
40	40		github.com/vifraa/gopom v0.2.1
41	41		github.com/wagoodman/go-partybus v0.0.0-20210627031916-db1f5573bbc5
42		-	github.com/wagoodman/go-progress v0.0.0-20200731105512-1020f39e6240
	42	+	github.com/wagoodman/go-progress v0.0.0-20230301185719-21920a456ad5
43	43		github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb
44	44		github.com/xeipuuv/gojsonschema v1.2.0
45	45		golang.org/x/mod v0.8.0
		skipped 6 lines
52	52		github.com/CycloneDX/cyclonedx-go v0.7.1-0.20221222100750-41a1ac565cce
53	53		github.com/Masterminds/sprig/v3 v3.2.3
54	54		github.com/anchore/go-logger v0.0.0-20220728155337-03b66a5207d8
55		-	github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc
	55	+	github.com/anchore/stereoscope v0.0.0-20230301191755-abfb374a1122
56	56		github.com/docker/docker v23.0.1+incompatible
57	57		github.com/google/go-containerregistry v0.13.0
58	58		github.com/invopop/jsonschema v0.7.0
		skipped 103 lines

■ ■ ■ ■ ■ ■

go.sum

		skipped 89 lines
90	90		github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E=
91	91		github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 h1:AV7qjwMcM4r8wFhJq3jLRztew3ywIyPTRapl2T1s9o8=
92	92		github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4=
93		-	github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc h1:b+2KauWByrCPLNnzRHjLoUxo85tpszFtU7S1I5pAKK0=
94		-	github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc/go.mod h1:Y+jiUa5PmQh9jUvzmvus4EvLnEG87cDTOYgV3nw3wDg=
	93	+	github.com/anchore/stereoscope v0.0.0-20230301191755-abfb374a1122 h1:Oe2PE8zNbJH4nGZoCIC/VZBgpr62BInLnUqIMZICUOk=
	94	+	github.com/anchore/stereoscope v0.0.0-20230301191755-abfb374a1122/go.mod h1:IihP/SUVHP94PBwIP2bepOB/c0MVadcII7lxo13Ijzs=
95	95		github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
96	96		github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
97	97		github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
		skipped 478 lines
576	576		github.com/vifraa/gopom v0.2.1/go.mod h1:oPa1dcrGrtlO37WPDBm5SqHAT+wTgF8An1Q71Z6Vv4o=
577	577		github.com/wagoodman/go-partybus v0.0.0-20210627031916-db1f5573bbc5 h1:phTLPgMRDYTizrBSKsNSOa2zthoC2KsJsaY/8sg3rD8=
578	578		github.com/wagoodman/go-partybus v0.0.0-20210627031916-db1f5573bbc5/go.mod h1:JPirS5jde/CF5qIjcK4WX+eQmKXdPc6vcZkJ/P0hfPw=
579		-	github.com/wagoodman/go-progress v0.0.0-20200731105512-1020f39e6240 h1:r6BlIP7CVZtMlxUQhT40h1IE1TzEgKVqwmsVGuscvdk=
580		-	github.com/wagoodman/go-progress v0.0.0-20200731105512-1020f39e6240/go.mod h1:jLXFoL31zFaHKAAyZUh+sxiTDFe1L1ZHrcK2T1itVKA=
	579	+	github.com/wagoodman/go-progress v0.0.0-20230301185719-21920a456ad5 h1:lwgTsTy18nYqASnH58qyfRW/ldj7Gt2zzBvgYPzdA4s=
	580	+	github.com/wagoodman/go-progress v0.0.0-20230301185719-21920a456ad5/go.mod h1:jLXFoL31zFaHKAAyZUh+sxiTDFe1L1ZHrcK2T1itVKA=
581	581		github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb h1:Yz6VVOcLuWLAHYlJzTw7JKnWxdV/WXpug2X0quEzRnY=
582	582		github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb/go.mod h1:nDi3BAC5nEbVbg+WSJDHLbjHv0ZToq8nMPA97XMxF3E=
583	583		github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
		skipped 557 lines

■ ■ ■ ■ ■ ■

syft/file/digest_cataloger.go

		skipped 50 lines
51	51		if err != nil {
52	52		return nil, err
53	53		}
54		-	prog.N++
	54	+	prog.Increment()
55	55		results[location.Coordinates] = result
56	56		}
57		-	log.Debugf("file digests cataloger processed %d files", prog.N)
	57	+	log.Debugf("file digests cataloger processed %d files", prog.Current())
58	58		prog.SetCompleted()
59	59		return results, nil
60	60		}
		skipped 62 lines
123	123
124	124		func digestsCatalogingProgress(locations int64) (progress.Stage, progress.Manual) {
125	125		stage := &progress.Stage{}
126		-	prog := &progress.Manual{
127		-	Total: locations,
128		-	}
	126	+	prog := progress.NewManual(locations)
129	127
130	128		bus.Publish(partybus.Event{
131	129		Type: event.FileDigestsCatalogerStarted,
		skipped 12 lines

■ ■ ■ ■ ■ ■

syft/file/metadata_cataloger.go

		skipped 31 lines
32	32		}
33	33
34	34		results[location.Coordinates] = metadata
35		-	prog.N++
	35	+	prog.Increment()
36	36		}
37		-	log.Debugf("file metadata cataloger processed %d files", prog.N)
	37	+	log.Debugf("file metadata cataloger processed %d files", prog.Current())
38	38		prog.SetCompleted()
39	39		return results, nil
40	40		}
41	41
42	42		func metadataCatalogingProgress(locations int64) (progress.Stage, progress.Manual) {
43	43		stage := &progress.Stage{}
44		-	prog := &progress.Manual{
45		-	Total: locations,
46		-	}
	44	+	prog := progress.NewManual(locations)
47	45
48	46		bus.Publish(partybus.Event{
49	47		Type: event.FileMetadataCatalogerStarted,
		skipped 12 lines

■ ■ ■ ■ ■ ■

syft/file/secrets_cataloger.go

		skipped 54 lines
55	55		return nil, err
56	56		}
57	57		if len(result) > 0 {
58		-	secretsDiscovered.N += int64(len(result))
	58	+	secretsDiscovered.Add(int64(len(result)))
59	59		results[location.Coordinates] = result
60	60		}
61		-	prog.N++
	61	+	prog.Increment()
62	62		}
63		-	log.Debugf("secrets cataloger discovered %d secrets", secretsDiscovered.N)
	63	+	log.Debugf("secrets cataloger discovered %d secrets", secretsDiscovered.Current())
64	64		prog.SetCompleted()
65	65		return results, nil
66	66		}
		skipped 72 lines
139	139		func secretsCatalogingProgress(locations int64) (progress.Stage, progress.Manual, *progress.Manual) {
140	140		stage := &progress.Stage{}
141	141		secretsDiscovered := &progress.Manual{}
142		-	prog := &progress.Manual{
143		-	Total: locations,
144		-	}
	142	+	prog := progress.NewManual(locations)
145	143
146	144		bus.Publish(partybus.Event{
147	145		Type: event.SecretsCatalogerStarted,
		skipped 11 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/catalog.go

		skipped 150 lines
151	151		// dynamically show updated discovered package status
152	152		go func() {
153	153		for discovered := range discoveredPackages {
154		-	packagesDiscovered.N += discovered
	154	+	packagesDiscovered.Add(discovered)
155	155		}
156	156		}()
157	157
		skipped 67 lines

■ ■ ■ ■ ■ ■

syft/source/directory_indexer.go

		skipped 346 lines
347	347
348	348		func indexingProgress(path string) (progress.Stage, progress.Manual) {
349	349		stage := &progress.Stage{}
350		-	prog := &progress.Manual{
351		-	Total: -1,
352		-	}
	350	+	prog := progress.NewManual(-1)
353	351
354	352		bus.Publish(partybus.Event{
355	353		Type: event.FileIndexingStarted,
		skipped 13 lines

fix: possible race condition (#1639)