From bb1ea1a3fa85008a8710c74a58d22a308046ca42 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Fri, 17 May 2024 07:42:55 -0500 Subject: fix flagfolder? Signed-off-by: Xe Iaso --- flagfolder/flagfolder.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'flagfolder') diff --git a/flagfolder/flagfolder.go b/flagfolder/flagfolder.go index cb0d249..5dfae20 100644 --- a/flagfolder/flagfolder.go +++ b/flagfolder/flagfolder.go @@ -42,19 +42,19 @@ func ParseSet(secretLocation string, set *flag.FlagSet) error { filepath.Join(secretLocation, strcase.SnakeCase(f.Name)), filepath.Join(secretLocation, strcase.UpperSnakeCase(f.Name)), } { - data, err = os.ReadFile(fname) - if err != nil { + var ferr error + data, ferr = os.ReadFile(fname) + if ferr != nil { slog.Debug("can't read", "fname", fname, "err", err) - if os.IsNotExist(err) { - err = nil + if os.IsNotExist(ferr) { continue } continue } - } - if ferr := f.Value.Set(string(data)); ferr != nil { - err = fmt.Errorf("flagfolder: failed to set flag %q with value %q", f.Name, string(data)) + if ferr := f.Value.Set(string(data)); ferr != nil { + err = fmt.Errorf("flagfolder: failed to set flag %q in %s with value %q", f.Name, fname, string(data)) + } } }) -- cgit v1.2.3