rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-08-11 11:11:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix overriding update and remove links with the wrong link (#451)

Browse Source
This commit is contained in:
Tom Lebreux 2025-01-15 14:15:47 -05:00 committed by GitHub
parent fdf2ef8e93
commit d05a48f9cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/resources/common/formatter.go
View File

@ -107,8 +107,6 @@ func formatter(summarycache *summarycache.SummaryCache, asl accesscontrol.Access
if hasUpdate { if hasUpdate {
if attributes.DisallowMethods(resource.Schema)[http.MethodPut] { if attributes.DisallowMethods(resource.Schema)[http.MethodPut] {
resource.Links["update"] = "blocked" resource.Links["update"] = "blocked"
} else {
resource.Links["update"] = u
} }
} else { } else {
delete(resource.Links, "update") delete(resource.Links, "update")
@ -116,8 +114,6 @@ func formatter(summarycache *summarycache.SummaryCache, asl accesscontrol.Access
if hasDelete { if hasDelete {
if attributes.DisallowMethods(resource.Schema)[http.MethodDelete] { if attributes.DisallowMethods(resource.Schema)[http.MethodDelete] {
resource.Links["remove"] = "blocked" resource.Links["remove"] = "blocked"
} else {
resource.Links["remove"] = u
} }
} else { } else {
delete(resource.Links, "remove") delete(resource.Links, "remove")

28
pkg/resources/common/formatter_test.go
View File

@ -775,8 +775,8 @@ func Test_formatterLinks(t *testing.T) {
}, },
currentLinks: map[string]string{ currentLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "../api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "../api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
}, },
wantLinks: map[string]string{ wantLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
@ -810,12 +810,12 @@ func Test_formatterLinks(t *testing.T) {
}, },
currentLinks: map[string]string{ currentLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "../api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "../api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
}, },
wantLinks: map[string]string{ wantLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "/api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"view": "/api/v1/namespaces/example-ns/pods/example-pod", "view": "/api/v1/namespaces/example-ns/pods/example-pod",
}, },
}, },
@ -846,12 +846,12 @@ func Test_formatterLinks(t *testing.T) {
}, },
currentLinks: map[string]string{ currentLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "../api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "../api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
}, },
wantLinks: map[string]string{ wantLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"remove": "/api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
"view": "/api/v1/namespaces/example-ns/pods/example-pod", "view": "/api/v1/namespaces/example-ns/pods/example-pod",
}, },
}, },
@ -883,13 +883,13 @@ func Test_formatterLinks(t *testing.T) {
}, },
currentLinks: map[string]string{ currentLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "../api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "../api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
}, },
wantLinks: map[string]string{ wantLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "/api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "/api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
"view": "/api/v1/namespaces/example-ns/pods/example-pod", "view": "/api/v1/namespaces/example-ns/pods/example-pod",
}, },
}, },
@ -925,8 +925,8 @@ func Test_formatterLinks(t *testing.T) {
}, },
currentLinks: map[string]string{ currentLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",
"update": "../api/v1/namespaces/example-ns/pods/example-pod", "update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "../api/v1/namespaces/example-ns/pods/example-pod", "remove": "../v1/namespaces/example-ns/pods/example-pod",
}, },
wantLinks: map[string]string{ wantLinks: map[string]string{
"default": "defaultVal", "default": "defaultVal",