diff --git a/lib/converter.go b/lib/converter.go index 28358f7..a1a346e 100644 --- a/lib/converter.go +++ b/lib/converter.go @@ -49,8 +49,8 @@ func (c *Converter) Convert(filename string) error { return err } - filename = path.Join(c.OutputFolder, filename) - return c.writeToFile(kissbom, c.OutputFormat, filename) + c.OutputFileName = path.Join(c.OutputFolder, filename) + return c.writeToFile(kissbom) } // transform takes a byte slice representing a CycloneDX Bill of Materials (BOM) in JSON format, @@ -81,7 +81,7 @@ func (c *Converter) buildOutputFilename(cdx *cyclonedx.BOM) string { subject := cdx.Metadata.Component.Name publisher := cdx.Metadata.Component.Publisher timestamp := cdx.Metadata.Timestamp - c.OutputFileName = fmt.Sprintf("%s_%s_%s", subject, publisher, timestamp) + return fmt.Sprintf("%s_%s_%s", subject, publisher, timestamp) } t := time.Now() return fmt.Sprint(t.Format("20060102150405")) diff --git a/lib/converter_test.go b/lib/converter_test.go index 3955de2..8bf4a62 100644 --- a/lib/converter_test.go +++ b/lib/converter_test.go @@ -97,7 +97,7 @@ func TestConvert_Success(t *testing.T) { return err }() - assert.NoError(t,e) + assert.NoError(t, e) converter.OutputFormat = "csv" // Choose a valid output format for testing err = converter.Convert("test.json") assert.Error(t, err, "Expected no error") @@ -139,7 +139,6 @@ func TestTransform_Success(t *testing.T) { assert.NoError(t, err, "Expected no error") assert.NotNil(t, kissBom, "Expected KissBOM object to be not nil") assert.NotEmpty(t, converter.OutputFileName, "Expected filename to be not empty") - assert.Equal(t, converter.OutputFileName, "test") assert.Len(t, kissBom.Packages, 1) assert.Equal(t, kissBom.Packages[0].Purl, "pkg:pypi/requests@2.26.0") }