From e4edaae62889cceb7e7acbcae288dfb2be6a16a3 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 16 Aug 2022 16:12:39 +0200
Subject: [PATCH] config: return correct error

_conmonVersionFormatErr is a format string and it needs an error
argument.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 common/pkg/config/default.go      | 2 +-
 common/pkg/config/default_test.go | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/pkg/config/default.go b/common/pkg/config/default.go
index e15b5d1236..6bca7312a3 100644
--- a/common/pkg/config/default.go
+++ b/common/pkg/config/default.go
@@ -459,7 +459,7 @@ func probeConmon(conmonBinary string) error {
 
 	matches := r.FindStringSubmatch(out.String())
 	if len(matches) != 5 {
-		return errors.New(_conmonVersionFormatErr)
+		return fmt.Errorf(_conmonVersionFormatErr, errors.New("invalid version format"))
 	}
 	major, err := strconv.Atoi(matches[2])
 
diff --git a/common/pkg/config/default_test.go b/common/pkg/config/default_test.go
index 834ee7a61b..62d14b9979 100644
--- a/common/pkg/config/default_test.go
+++ b/common/pkg/config/default_test.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -57,7 +58,8 @@ func TestProbeConmon(t *testing.T) {
 			msg:    "failure invalid format",
 			output: "invalid",
 			assert: func(err error, msg string) {
-				assert.EqualError(t, err, _conmonVersionFormatErr, msg)
+				expectedErr := fmt.Errorf(_conmonVersionFormatErr, errors.New("invalid version format"))
+				assert.Equal(t, err, expectedErr, msg)
 			},
 		},
 	} {