From e404e0b608ea7c8eb1a7b61c6557e6a81943d76e Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:03:07 +0200
Subject: [PATCH] raise error with invalid 'on_success', 'on_failure' in
 profile (#2303)

---
 pkg/csprofiles/csprofiles.go | 4 ++--
 pkg/metabase/metabase.go     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/csprofiles/csprofiles.go b/pkg/csprofiles/csprofiles.go
index 19855cb86..70dea3d7a 100644
--- a/pkg/csprofiles/csprofiles.go
+++ b/pkg/csprofiles/csprofiles.go
@@ -48,10 +48,10 @@ func NewProfile(profilesCfg []*csconfig.ProfileCfg) ([]*Runtime, error) {
 		runtime.DebugFilters = make([]*exprhelpers.ExprDebugger, len(profile.Filters))
 		runtime.Cfg = profile
 		if runtime.Cfg.OnSuccess != "" && runtime.Cfg.OnSuccess != "continue" && runtime.Cfg.OnSuccess != "break" {
-			return []*Runtime{}, errors.Wrapf(err, "invalid 'on_success' for '%s' : %s", profile.Name, runtime.Cfg.OnSuccess)
+			return []*Runtime{}, fmt.Errorf("invalid 'on_success' for '%s': %s", profile.Name, runtime.Cfg.OnSuccess)
 		}
 		if runtime.Cfg.OnFailure != "" && runtime.Cfg.OnFailure != "continue" && runtime.Cfg.OnFailure != "break" && runtime.Cfg.OnFailure != "apply" {
-			return []*Runtime{}, errors.Wrapf(err, "invalid 'on_failure' for '%s' : %s", profile.Name, runtime.Cfg.OnFailure)
+			return []*Runtime{}, fmt.Errorf("invalid 'on_failure' for '%s' : %s", profile.Name, runtime.Cfg.OnFailure)
 		}
 		for fIdx, filter := range profile.Filters {
 
diff --git a/pkg/metabase/metabase.go b/pkg/metabase/metabase.go
index c12d9166f..11e5ac18b 100644
--- a/pkg/metabase/metabase.go
+++ b/pkg/metabase/metabase.go
@@ -215,7 +215,7 @@ func (m *Metabase) Login(username string, password string) error {
 	}
 
 	if errormsg != nil {
-		return errors.Wrap(err, "http login")
+		return fmt.Errorf("http login: %s", errormsg)
 	}
 	resp, ok := successmsg.(map[string]interface{})
 	if !ok {
@@ -238,7 +238,7 @@ func (m *Metabase) Scan() error {
 		return err
 	}
 	if errormsg != nil {
-		return errors.Wrap(err, "http scan")
+		return fmt.Errorf("http scan: %s", errormsg)
 	}
 
 	return nil
@@ -255,7 +255,7 @@ func (m *Metabase) ResetPassword(current string, newPassword string) error {
 		return errors.Wrap(err, "reset username")
 	}
 	if errormsg != nil {
-		return errors.Wrap(err, "http reset password")
+		return fmt.Errorf("http reset password: %s", errormsg)
 	}
 	return nil
 }
@@ -279,7 +279,7 @@ func (m *Metabase) ResetUsername(username string) error {
 	}
 
 	if errormsg != nil {
-		return errors.Wrap(err, "http reset username")
+		return fmt.Errorf("http reset username: %s", errormsg)
 	}
 
 	return nil