rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-09-25 14:49:38 +00:00
Code Issues Projects Releases Wiki Activity

Manually apply PR 451, backporting fix to r/r 2.10 (#638)

Browse Source
This commit is contained in:
Eric Promislow
2025-05-13 12:26:35 -07:00
committed by GitHub
parent b9e5b210c2
commit a964461813
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,8 +108,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")
@@ -117,8 +115,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

@@ -776,8 +776,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",
@@ -811,12 +811,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",
}, },
}, },
@@ -847,12 +847,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",
}, },
}, },
@@ -884,13 +884,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",
}, },
}, },
@@ -926,8 +926,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",