From fbc68d86935dc271ceecb2015f3d46574a92323d Mon Sep 17 00:00:00 2001 From: Edoardo Tenani <526307+endorama@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:39:06 +0200 Subject: [PATCH] Coherent changelog locations (#76) * use fixed consolidated changelog filename * output consolidated changelog and rendered changelog to same folder * update test --- cmd/build.go | 2 +- cmd/build_test.go | 2 +- internal/settings/settings.go | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/build.go b/cmd/build.go index 18161ac..29221e6 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -33,7 +33,6 @@ func BuildCmd(fs afero.Fs) *cobra.Command { return fmt.Errorf("owner flag malformed: %w", err) } - filename := viper.GetString("changelog_filename") src := viper.GetString("fragment_location") dest := viper.GetString("changelog_destination") @@ -42,6 +41,7 @@ func BuildCmd(fs afero.Fs) *cobra.Command { return fmt.Errorf("error parsing flag 'version': %w", err) } + filename := fmt.Sprintf("%s.yaml", version) b := changelog.NewBuilder(fs, filename, version, src, dest) if err := b.Build(owner, repo); err != nil { diff --git a/cmd/build_test.go b/cmd/build_test.go index a948b5f..6161e6a 100644 --- a/cmd/build_test.go +++ b/cmd/build_test.go @@ -48,7 +48,7 @@ func TestBuildCmd(t *testing.T) { err = cmd.Execute() require.Nil(t, err) - changelogFile := path.Join(viper.GetString("changelog_destination"), viper.GetString("changelog_filename")) + changelogFile := path.Join(viper.GetString("changelog_destination"), fmt.Sprintf("%s.yaml", expectedVersion)) content, err := afero.ReadFile(testFs, changelogFile) require.Nil(t, err) diff --git a/internal/settings/settings.go b/internal/settings/settings.go index bec4965..dab298d 100644 --- a/internal/settings/settings.go +++ b/internal/settings/settings.go @@ -58,9 +58,8 @@ func setDefaults() { os.ExpandEnv(viper.GetString("fragment_root")), viper.GetString("fragment_path"))) - viper.SetDefault("changelog_destination", ".") - viper.SetDefault("changelog_filename", "changelog.yaml") - viper.SetDefault("rendered_changelog_destination", ".") + viper.SetDefault("changelog_destination", "changelog") + viper.SetDefault("rendered_changelog_destination", "changelog") } func setConstants() {