From e76add702d51795a731ba64e6a042ea8bb5b2298 Mon Sep 17 00:00:00 2001 From: Drew Bailey <2614075+drewbailey@users.noreply.github.com> Date: Wed, 9 Dec 2020 09:02:37 -0500 Subject: [PATCH] use concrete type helper instead of interface surfing (#9585) * use concrete type helper instead of interface surfing * wrap err --- e2e/events/events.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/e2e/events/events.go b/e2e/events/events.go index 291605cfc..2a545676b 100644 --- a/e2e/events/events.go +++ b/e2e/events/events.go @@ -156,24 +156,21 @@ func (tc *EventsTest) TestBlockedEvalEvents(f *framework.F) { // ensure there is a deployment promotion event testutil.WaitForResult(func() (bool, error) { for _, e := range evalEvents { - evalRaw, ok := e.Payload["Eval"].(map[string]interface{}) - if !ok { - return false, fmt.Errorf("type assertion on eval") + eval, err := e.Evaluation() + if err != nil { + return false, fmt.Errorf("event was not an evaluation %w", err) } - ftg, ok := evalRaw["FailedTGAllocs"].(map[string]interface{}) + ftg := eval.FailedTGAllocs + + tg, ok := ftg["one"] if !ok { continue } - tg, ok := ftg["one"].(map[string]interface{}) - if !ok { - continue - } - mem := tg["DimensionExhausted"].(map[string]interface{})["memory"] + mem := tg.DimensionExhausted["memory"] require.NotNil(t, mem, "memory dimension was nil") - memInt := int(mem.(float64)) - require.Greater(t, memInt, 0, "memory dimension was zero") + require.Greater(t, mem, 0, "memory dimension was zero") return true, nil }