From af0fa974034547511073d15f19bb392a710f41b0 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Wed, 29 Jan 2025 09:39:09 +0100 Subject: [PATCH] manifest: slightly clean up directory creation Co-authored-by: Michael Vogt Signed-off-by: Simon de Vlieger --- cmd/image-builder/manifest.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/image-builder/manifest.go b/cmd/image-builder/manifest.go index 8b89f4b..eed1cee 100644 --- a/cmd/image-builder/manifest.go +++ b/cmd/image-builder/manifest.go @@ -25,6 +25,9 @@ type manifestOptions struct { func sbomWriter(outputDir, filename string, content io.Reader) error { p := filepath.Join(outputDir, filename) + if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil { + return err + } f, err := os.Create(p) if err != nil { return err @@ -51,9 +54,6 @@ func generateManifest(dataDir string, img *imagefilter.Result, output io.Writer, if outputDir == "" { outputDir = outputNameFor(img) } - if err := os.MkdirAll(outputDir, 0755); err != nil { - return err - } manifestGenOpts.SBOMWriter = func(filename string, content io.Reader, docType sbom.StandardType) error { return sbomWriter(outputDir, filename, content) }