From df0cd3c4a3f752f672d91291b0857ab41d9d3b01 Mon Sep 17 00:00:00 2001 From: Yigit Demirbas Date: Mon, 18 Sep 2023 20:54:56 +0200 Subject: [PATCH] modified to fix linter issues --- kustomize/commands/internal/util/util.go | 39 +++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/kustomize/commands/internal/util/util.go b/kustomize/commands/internal/util/util.go index 01c21473d..b2f7f8716 100644 --- a/kustomize/commands/internal/util/util.go +++ b/kustomize/commands/internal/util/util.go @@ -40,23 +40,28 @@ func GlobPatternsWithLoader(fSys filesys.FileSystem, ldr ifc.Loader, patterns [] for _, pattern := range patterns { if skipValidation { result = append(result, pattern) - } else { - files, err := fSys.Glob(pattern) - if err != nil { - return nil, err - } - if len(files) != 0 { - result = append(result, files...) - } else { - loader, err := ldr.New(pattern) - if err != nil { - return nil, fmt.Errorf("%s has no match: %w", pattern, err) - } else { - result = append(result, pattern) - if loader != nil { - loader.Cleanup() - } - } + continue + } + + files, err := fSys.Glob(pattern) + if err != nil { + return nil, fmt.Errorf("error on checking the filesystem: %w", err) + } + + if len(files) != 0 { + result = append(result, files...) + continue + } + + loader, err := ldr.New(pattern) + if err != nil { + return nil, fmt.Errorf("%s has no match: %w", pattern, err) + } + + result = append(result, pattern) + if loader != nil { + if err = loader.Cleanup(); err != nil { + return nil, fmt.Errorf("error on cleaning up loader: %w", err) } } }