diff --git a/pkg/resources/common/formatter.go b/pkg/resources/common/formatter.go index 1acd80a0..415ab6a9 100644 --- a/pkg/resources/common/formatter.go +++ b/pkg/resources/common/formatter.go @@ -107,8 +107,6 @@ func formatter(summarycache *summarycache.SummaryCache, asl accesscontrol.Access if hasUpdate { if attributes.DisallowMethods(resource.Schema)[http.MethodPut] { resource.Links["update"] = "blocked" - } else { - resource.Links["update"] = u } } else { delete(resource.Links, "update") @@ -116,8 +114,6 @@ func formatter(summarycache *summarycache.SummaryCache, asl accesscontrol.Access if hasDelete { if attributes.DisallowMethods(resource.Schema)[http.MethodDelete] { resource.Links["remove"] = "blocked" - } else { - resource.Links["remove"] = u } } else { delete(resource.Links, "remove") diff --git a/pkg/resources/common/formatter_test.go b/pkg/resources/common/formatter_test.go index 704dc197..83027f29 100644 --- a/pkg/resources/common/formatter_test.go +++ b/pkg/resources/common/formatter_test.go @@ -775,8 +775,8 @@ func Test_formatterLinks(t *testing.T) { }, currentLinks: map[string]string{ "default": "defaultVal", - "update": "../api/v1/namespaces/example-ns/pods/example-pod", - "remove": "../api/v1/namespaces/example-ns/pods/example-pod", + "update": "../v1/namespaces/example-ns/pods/example-pod", + "remove": "../v1/namespaces/example-ns/pods/example-pod", }, wantLinks: map[string]string{ "default": "defaultVal", @@ -810,12 +810,12 @@ func Test_formatterLinks(t *testing.T) { }, currentLinks: map[string]string{ "default": "defaultVal", - "update": "../api/v1/namespaces/example-ns/pods/example-pod", - "remove": "../api/v1/namespaces/example-ns/pods/example-pod", + "update": "../v1/namespaces/example-ns/pods/example-pod", + "remove": "../v1/namespaces/example-ns/pods/example-pod", }, wantLinks: map[string]string{ "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", }, }, @@ -846,12 +846,12 @@ func Test_formatterLinks(t *testing.T) { }, currentLinks: map[string]string{ "default": "defaultVal", - "update": "../api/v1/namespaces/example-ns/pods/example-pod", - "remove": "../api/v1/namespaces/example-ns/pods/example-pod", + "update": "../v1/namespaces/example-ns/pods/example-pod", + "remove": "../v1/namespaces/example-ns/pods/example-pod", }, wantLinks: map[string]string{ "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", }, }, @@ -883,13 +883,13 @@ func Test_formatterLinks(t *testing.T) { }, currentLinks: map[string]string{ "default": "defaultVal", - "update": "../api/v1/namespaces/example-ns/pods/example-pod", - "remove": "../api/v1/namespaces/example-ns/pods/example-pod", + "update": "../v1/namespaces/example-ns/pods/example-pod", + "remove": "../v1/namespaces/example-ns/pods/example-pod", }, wantLinks: map[string]string{ "default": "defaultVal", - "update": "/api/v1/namespaces/example-ns/pods/example-pod", - "remove": "/api/v1/namespaces/example-ns/pods/example-pod", + "update": "../v1/namespaces/example-ns/pods/example-pod", + "remove": "../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{ "default": "defaultVal", - "update": "../api/v1/namespaces/example-ns/pods/example-pod", - "remove": "../api/v1/namespaces/example-ns/pods/example-pod", + "update": "../v1/namespaces/example-ns/pods/example-pod", + "remove": "../v1/namespaces/example-ns/pods/example-pod", }, wantLinks: map[string]string{ "default": "defaultVal",