rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-09-06 09:51:02 +00:00
Code Issues Projects Releases Wiki Activity

addressing comments from eric #2

Browse Source
This commit is contained in:
gehrkefc
2024-09-13 11:42:50 -03:00
parent be0c0a3d54
commit ed8bdb68e6
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/stores/partition/store.go
View File

@@ -4,6 +4,7 @@ package partition
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"os" "os"
"reflect" "reflect"
@@ -389,7 +390,7 @@ func ToAPIEvent(apiOp *types.APIRequest, schema *types.APISchema, event watch.Ev
if event.Type == watch.Error { if event.Type == watch.Error {
status, _ := event.Object.(*metav1.Status) status, _ := event.Object.(*metav1.Status)
apiEvent.Error = fmt.Errorf("%s", status.Message) apiEvent.Error = errors.New(status.Message)
return apiEvent return apiEvent
} }

2
pkg/stores/proxy/proxy_store.go
View File

@@ -516,7 +516,7 @@ func (s *Store) Update(apiOp *types.APIRequest, schema *types.APISchema, params
resourceVersion := input.String("metadata", "resourceVersion") resourceVersion := input.String("metadata", "resourceVersion")
if resourceVersion == "" { if resourceVersion == "" {
return nil, nil, fmt.Errorf(errResourceVersionRequired) return nil, nil, errors.New(errResourceVersionRequired)
} }
gvk := attributes.GVK(schema) gvk := attributes.GVK(schema)

9
pkg/stores/proxy/proxy_store_test.go
View File

@@ -756,7 +756,7 @@ func TestUpdate(t *testing.T) {
expected: expected{ expected: expected{
value: nil, value: nil,
warning: 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.value, value)
assert.Equal(t, tt.expected.warning, warning) 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)
}
}) })
} }
} }

2
pkg/stores/sqlproxy/proxy_store.go
View File

@@ -599,7 +599,7 @@ func (s *Store) Update(apiOp *types.APIRequest, schema *types.APISchema, params
resourceVersion := input.String("metadata", "resourceVersion") resourceVersion := input.String("metadata", "resourceVersion")
if resourceVersion == "" { if resourceVersion == "" {
return nil, nil, fmt.Errorf(errResourceVersionRequired) return nil, nil, errors.New(errResourceVersionRequired)
} }
gvk := attributes.GVK(schema) gvk := attributes.GVK(schema)

9
pkg/stores/sqlproxy/proxy_store_test.go
View File

@@ -1371,7 +1371,7 @@ func TestUpdate(t *testing.T) {
expected: expected{ expected: expected{
value: nil, value: nil,
warning: 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.value, value)
assert.Equal(t, tt.expected.warning, warning) 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)
}
}) })
} }
} }