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

rancher · Jan 15, 2025 · d05a48f · d05a48f
1 parent fdf2ef8
commit d05a48f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/pkg/resources/common/formatter.go b/pkg/resources/common/formatter.go
@@ -107,17 +107,13 @@ 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")
 		}
 		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
@@ -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",