From ed8bdb68e6ffb57d24338c9d17030cede373fbc9 Mon Sep 17 00:00:00 2001
From: gehrkefc <felipe.gehrke@suse.com>
Date: Fri, 13 Sep 2024 11:42:50 -0300
Subject: [PATCH] addressing comments from eric #2

---
 pkg/stores/partition/store.go           | 3 ++-
 pkg/stores/proxy/proxy_store.go         | 2 +-
 pkg/stores/proxy/proxy_store_test.go    | 9 +++++++--
 pkg/stores/sqlproxy/proxy_store.go      | 2 +-
 pkg/stores/sqlproxy/proxy_store_test.go | 9 +++++++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkg/stores/partition/store.go b/pkg/stores/partition/store.go
index b97193a3..c018fc4b 100644
--- a/pkg/stores/partition/store.go
+++ b/pkg/stores/partition/store.go
@@ -4,6 +4,7 @@ package partition
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"reflect"
@@ -389,7 +390,7 @@ func ToAPIEvent(apiOp *types.APIRequest, schema *types.APISchema, event watch.Ev
 
 	if event.Type == watch.Error {
 		status, _ := event.Object.(*metav1.Status)
-		apiEvent.Error = fmt.Errorf("%s", status.Message)
+		apiEvent.Error = errors.New(status.Message)
 		return apiEvent
 	}
 
diff --git a/pkg/stores/proxy/proxy_store.go b/pkg/stores/proxy/proxy_store.go
index da275e75..7faf6aee 100644
--- a/pkg/stores/proxy/proxy_store.go
+++ b/pkg/stores/proxy/proxy_store.go
@@ -516,7 +516,7 @@ func (s *Store) Update(apiOp *types.APIRequest, schema *types.APISchema, params
 
 	resourceVersion := input.String("metadata", "resourceVersion")
 	if resourceVersion == "" {
-		return nil, nil, fmt.Errorf(errResourceVersionRequired)
+		return nil, nil, errors.New(errResourceVersionRequired)
 	}
 
 	gvk := attributes.GVK(schema)
diff --git a/pkg/stores/proxy/proxy_store_test.go b/pkg/stores/proxy/proxy_store_test.go
index 6d41c8ae..b45ddafb 100644
--- a/pkg/stores/proxy/proxy_store_test.go
+++ b/pkg/stores/proxy/proxy_store_test.go
@@ -756,7 +756,7 @@ func TestUpdate(t *testing.T) {
 			expected: expected{
 				value:   nil,
 				warning: nil,
-				err:     fmt.Errorf(errResourceVersionRequired),
+				err:     errors.New(errResourceVersionRequired),
 			},
 		},
 		{
@@ -834,7 +834,12 @@ func TestUpdate(t *testing.T) {
 
 			assert.Equal(t, tt.expected.value, value)
 			assert.Equal(t, tt.expected.warning, warning)
-			assert.Equal(t, tt.expected.err, err)
+
+			if tt.expected.err != nil {
+				assert.Equal(t, tt.expected.err.Error(), err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
 		})
 	}
 }
diff --git a/pkg/stores/sqlproxy/proxy_store.go b/pkg/stores/sqlproxy/proxy_store.go
index 64f3fd2c..d2ab50f6 100644
--- a/pkg/stores/sqlproxy/proxy_store.go
+++ b/pkg/stores/sqlproxy/proxy_store.go
@@ -599,7 +599,7 @@ func (s *Store) Update(apiOp *types.APIRequest, schema *types.APISchema, params
 
 	resourceVersion := input.String("metadata", "resourceVersion")
 	if resourceVersion == "" {
-		return nil, nil, fmt.Errorf(errResourceVersionRequired)
+		return nil, nil, errors.New(errResourceVersionRequired)
 	}
 
 	gvk := attributes.GVK(schema)
diff --git a/pkg/stores/sqlproxy/proxy_store_test.go b/pkg/stores/sqlproxy/proxy_store_test.go
index 96173c7d..54f31f0d 100644
--- a/pkg/stores/sqlproxy/proxy_store_test.go
+++ b/pkg/stores/sqlproxy/proxy_store_test.go
@@ -1371,7 +1371,7 @@ func TestUpdate(t *testing.T) {
 			expected: expected{
 				value:   nil,
 				warning: nil,
-				err:     fmt.Errorf(errResourceVersionRequired),
+				err:     errors.New(errResourceVersionRequired),
 			},
 		},
 		{
@@ -1449,7 +1449,12 @@ func TestUpdate(t *testing.T) {
 
 			assert.Equal(t, tt.expected.value, value)
 			assert.Equal(t, tt.expected.warning, warning)
-			assert.Equal(t, tt.expected.err, err)
+
+			if tt.expected.err != nil {
+				assert.Equal(t, tt.expected.err.Error(), err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
 		})
 	}
 }