From f8e6805801367885534d7b035e616967dd7d2639 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 14 Jun 2022 13:54:50 -0700 Subject: [PATCH 1/3] Adds final sweeper error to logs --- helper/resource/testing.go | 1 + 1 file changed, 1 insertion(+) diff --git a/helper/resource/testing.go b/helper/resource/testing.go index 8047a2cdc85..d74986c4184 100644 --- a/helper/resource/testing.go +++ b/helper/resource/testing.go @@ -119,6 +119,7 @@ func TestMain(m interface { sweepers := filterSweepers(*flagSweepRun, sweeperFuncs) if _, err := runSweepers(regions, sweepers, *flagSweepAllowFailures); err != nil { + log.Printf("[ERROR] Running sweepers: %s", err) os.Exit(1) } } else { From ace6f6af3daab86aa36c5fd9daf3486665cb65e9 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 14 Jun 2022 14:27:21 -0700 Subject: [PATCH 2/3] Moves logging to prevent double log on API call errors --- helper/resource/testing.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/resource/testing.go b/helper/resource/testing.go index d74986c4184..8cb4dbaa664 100644 --- a/helper/resource/testing.go +++ b/helper/resource/testing.go @@ -119,7 +119,6 @@ func TestMain(m interface { sweepers := filterSweepers(*flagSweepRun, sweeperFuncs) if _, err := runSweepers(regions, sweepers, *flagSweepAllowFailures); err != nil { - log.Printf("[ERROR] Running sweepers: %s", err) os.Exit(1) } } else { @@ -238,6 +237,7 @@ func runSweeperWithRegion(region string, s *Sweeper, sweepers map[string]*Sweepe depSweeper, ok := sweepers[dep] if !ok { + log.Printf("[ERROR] Sweeper (%s) has dependency (%s), but that sweeper was not found", s.Name, dep) return fmt.Errorf("sweeper (%s) has dependency (%s), but that sweeper was not found", s.Name, dep) } From 08d46aaed964691a095851c6cdf251c28c0d9b85 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 14 Jun 2022 16:58:58 -0700 Subject: [PATCH 3/3] Adds CHANGELOG entry --- .changelog/983.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/983.txt diff --git a/.changelog/983.txt b/.changelog/983.txt new file mode 100644 index 00000000000..5ba135110c6 --- /dev/null +++ b/.changelog/983.txt @@ -0,0 +1,3 @@ +```release-note:bug +helper/resource: Ensured errors are always logged. +```