From 932d5c380f2bd4d443712e43debc4381c9f3736f Mon Sep 17 00:00:00 2001 From: Andrew Woodlee Date: Fri, 14 Feb 2025 11:56:46 -0600 Subject: [PATCH] v0.7.1 --- .changes/v0.7.1.md | 3 +++ CHANGELOG.md | 4 ++++ cmd/version.go | 2 +- pkg/backy/config.go | 13 ++++++------- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 .changes/v0.7.1.md diff --git a/.changes/v0.7.1.md b/.changes/v0.7.1.md new file mode 100644 index 0000000..1ccbcb6 --- /dev/null +++ b/.changes/v0.7.1.md @@ -0,0 +1,3 @@ +## v0.7.1 - 2025-02-14 +### Fixed +* Incorrect local config file loading logic caused files to not be detected diff --git a/CHANGELOG.md b/CHANGELOG.md index 7888266..bd92515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## v0.7.1 - 2025-02-14 +### Fixed +* Incorrect local config file loading logic caused files to not be detected + ## v0.7.0 - 2025-02-11 ### Added * [feat]: package `packageOperation` option `checkVersion` implemented diff --git a/cmd/version.go b/cmd/version.go index b204f17..fda0d53 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" ) -const versionStr = "0.7.0" +const versionStr = "0.7.1" var ( versionCmd = &cobra.Command{ diff --git a/pkg/backy/config.go b/pkg/backy/config.go index b0bdb78..87c1c80 100644 --- a/pkg/backy/config.go +++ b/pkg/backy/config.go @@ -85,7 +85,6 @@ func (opts *ConfigOpts) InitConfig() { if err != nil { logging.ExitWithMSG(fmt.Sprintf("error initializing config fetcher: %v", err), 1, nil) } - if opts.ConfigFilePath != "" { loadConfigFile(fetcher, opts.ConfigFilePath, backyKoanf, opts) } else { @@ -109,22 +108,22 @@ func loadConfigFile(fetcher remotefetcher.RemoteFetcher, filePath string, k *koa func loadDefaultConfigFiles(fetcher remotefetcher.RemoteFetcher, configFiles []string, k *koanf.Koanf, opts *ConfigOpts) { cFileFailures := 0 for _, c := range configFiles { + opts.ConfigFilePath = c data, err := fetcher.Fetch(c) if err != nil { cFileFailures++ continue } - if err := k.Load(rawbytes.Provider(data), yaml.Parser()); err != nil { - cFileFailures++ - continue + if data != nil { + if err := k.Load(rawbytes.Provider(data), yaml.Parser()); err == nil { + continue + } } - - break } if cFileFailures == len(configFiles) { - logging.ExitWithMSG("Could not find any valid config file", 1, nil) + logging.ExitWithMSG("Could not find any valid local config file", 1, nil) } }