From eb1ed5e7e88f8c09323ef254616e8c8f721f2e62 Mon Sep 17 00:00:00 2001 From: RincewindsHat Date: Fri, 16 Jun 2023 17:00:13 +0200 Subject: [PATCH 1/3] Export GetState for PartialResult --- result/overall.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/result/overall.go b/result/overall.go index b740a21..a757862 100644 --- a/result/overall.go +++ b/result/overall.go @@ -117,7 +117,7 @@ func (o *Overall) GetStatus() int { ) for _, sc := range o.PartialResults { - switch sc.getState() { + switch sc.GetState() { case check.Critical: criticals++ case check.Warning: @@ -314,7 +314,7 @@ func (s *PartialResult) SetState(state int) error { } // nolint: unused -func (s *PartialResult) getState() int { +func (s *PartialResult) GetState() int { if s.stateSetExplicitely { return s.state } From af84365a68a7c7dc910780539e0da6d4d645b639 Mon Sep 17 00:00:00 2001 From: RincewindsHat Date: Sat, 17 Jun 2023 11:42:53 +0200 Subject: [PATCH 2/3] Fix overall test --- result/overall_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result/overall_test.go b/result/overall_test.go index 021e9e1..6225db0 100644 --- a/result/overall_test.go +++ b/result/overall_test.go @@ -367,7 +367,7 @@ func TestDefaultStates2(t *testing.T) { overall.AddSubcheck(subcheck) - assert.Equal(t, check.Unknown, subcheck.getState()) + assert.Equal(t, check.Unknown, subcheck.GetState()) assert.Equal(t, check.Unknown, overall.GetStatus()) } From 3134ca4fea368eee152f9b8b1ba07af0adb8a9c3 Mon Sep 17 00:00:00 2001 From: RincewindsHat Date: Sat, 17 Jun 2023 11:49:42 +0200 Subject: [PATCH 3/3] Rename GetState -> GetStatus to be consistenst with overall --- result/overall.go | 4 ++-- result/overall_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/result/overall.go b/result/overall.go index a757862..828cfec 100644 --- a/result/overall.go +++ b/result/overall.go @@ -117,7 +117,7 @@ func (o *Overall) GetStatus() int { ) for _, sc := range o.PartialResults { - switch sc.GetState() { + switch sc.GetStatus() { case check.Critical: criticals++ case check.Warning: @@ -314,7 +314,7 @@ func (s *PartialResult) SetState(state int) error { } // nolint: unused -func (s *PartialResult) GetState() int { +func (s *PartialResult) GetStatus() int { if s.stateSetExplicitely { return s.state } diff --git a/result/overall_test.go b/result/overall_test.go index 6225db0..5d064b2 100644 --- a/result/overall_test.go +++ b/result/overall_test.go @@ -367,7 +367,7 @@ func TestDefaultStates2(t *testing.T) { overall.AddSubcheck(subcheck) - assert.Equal(t, check.Unknown, subcheck.GetState()) + assert.Equal(t, check.Unknown, subcheck.GetStatus()) assert.Equal(t, check.Unknown, overall.GetStatus()) }