From a9644618133906d2fc76876f14eaca0ca8810f07 Mon Sep 17 00:00:00 2001
From: Eric Promislow <epromislow@suse.com>
Date: Tue, 13 May 2025 12:26:35 -0700
Subject: [PATCH] Manually apply PR 451, backporting fix to r/r 2.10 (#638)

---
 pkg/resources/common/formatter.go      |  4 ----
 pkg/resources/common/formatter_test.go | 28 +++++++++++++-------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkg/resources/common/formatter.go b/pkg/resources/common/formatter.go
index 074436bd..7cc6da09 100644
--- a/pkg/resources/common/formatter.go
+++ b/pkg/resources/common/formatter.go
@@ -108,8 +108,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")
@@ -117,8 +115,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 25406fd4..be46fa0a 100644
--- a/pkg/resources/common/formatter_test.go
+++ b/pkg/resources/common/formatter_test.go
@@ -776,8 +776,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",
@@ -811,12 +811,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",
 			},
 		},
@@ -847,12 +847,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",
 			},
 		},
@@ -884,13 +884,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",
 			},
 		},
@@ -926,8 +926,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",