addressing comments from eric #2

rancher · Sep 13, 2024 · ed8bdb6 · ed8bdb6
1 parent be0c0a3
commit ed8bdb6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)
+			}
 		})
 	}
 }