diff --git a/syft/presenter/cyclonedx/presenter.go b/syft/presenter/cyclonedx/presenter.go index 27332ae36..ad7af96b5 100644 --- a/syft/presenter/cyclonedx/presenter.go +++ b/syft/presenter/cyclonedx/presenter.go @@ -66,16 +66,15 @@ func (pres *Presenter) Present(output io.Writer) error { return fmt.Errorf("unsupported source: %T", src) } - xmlOut, err := xml.MarshalIndent(bom, " ", " ") + encoder := xml.NewEncoder(output) + encoder.Indent("", " ") + + _, err := output.Write([]byte(xml.Header)) if err != nil { return err } - _, err = output.Write([]byte(xml.Header)) - if err != nil { - return err - } - _, err = output.Write(xmlOut) + err = encoder.Encode(bom) if err != nil { return err } diff --git a/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxDirsPresenter.golden b/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxDirsPresenter.golden index f38d078ac..884e8ec29 100644 --- a/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxDirsPresenter.golden +++ b/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxDirsPresenter.golden @@ -1,35 +1,35 @@ - - - - package1 - 1.0.1 - pkg:deb/ubuntu/package1@1.0.1?arch=amd64 - - - package2 - 2.0.1 - - - MIT - - - Apache-v2 - - - pkg:deb/ubuntu/package2@1.0.2?arch=amd64 - - - - 2020-08-29T20:17:49-04:00 - - anchore - syft - [not provided] - - - /some/path - - - - + + + + package1 + 1.0.1 + pkg:deb/ubuntu/package1@1.0.1?arch=amd64 + + + package2 + 2.0.1 + + + MIT + + + Apache-v2 + + + pkg:deb/ubuntu/package2@1.0.2?arch=amd64 + + + + 2020-08-30T21:50:50-04:00 + + anchore + syft + [not provided] + + + /some/path + + + + diff --git a/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxImgsPresenter.golden b/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxImgsPresenter.golden index e04a46593..11245e045 100644 --- a/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxImgsPresenter.golden +++ b/syft/presenter/cyclonedx/test-fixtures/snapshot/TestCycloneDxImgsPresenter.golden @@ -1,35 +1,35 @@ - - - - package1 - 1.0.1 - pkg:rpm/redhat/package1@0:1.0.1-1?arch=x86_64 - - - package2 - 2.0.1 - - - MIT - - - Apache-v2 - - - pkg:rpm/redhat/package2@0:1.0.2-1?arch=x86_64 - - - - 2020-08-29T20:17:49-04:00 - - anchore - syft - [not provided] - - - index.docker.io/library/anchore-fixture-image-simple - 04e16e44161c8888a1a963720fd0443cbf7eef8101434c431de8725cd98cc9f7 - - - + + + + package1 + 1.0.1 + pkg:rpm/redhat/package1@0:1.0.1-1?arch=x86_64 + + + package2 + 2.0.1 + + + MIT + + + Apache-v2 + + + pkg:rpm/redhat/package2@0:1.0.2-1?arch=x86_64 + + + + 2020-08-30T21:50:50-04:00 + + anchore + syft + [not provided] + + + index.docker.io/library/anchore-fixture-image-simple + 04e16e44161c8888a1a963720fd0443cbf7eef8101434c431de8725cd98cc9f7 + + +