From 5f14a1e225d8747086340c1dff230f56bf74974a Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Wed, 7 May 2025 10:07:55 -0400 Subject: [PATCH] Reorganize scheme type converter into apimachinery utils This removes a dependency from generated applyconfigurations to a testing package. To do this, the type converter in the testing package has been moved out to the apimachinery package and the utilities the converter depend on have been reorganized. Kubernetes-commit: 4821604f83a6f4764497879b666087ba7cb05060 --- pkg/endpoints/openapi/openapi.go | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkg/endpoints/openapi/openapi.go b/pkg/endpoints/openapi/openapi.go index e61f44439..0da1ab05c 100644 --- a/pkg/endpoints/openapi/openapi.go +++ b/pkg/endpoints/openapi/openapi.go @@ -133,19 +133,6 @@ func gvkConvert(gvk schema.GroupVersionKind) v1.GroupVersionKind { } } -func friendlyName(name string) string { - nameParts := strings.Split(name, "/") - // Reverse first part. e.g., io.k8s... instead of k8s.io... - if len(nameParts) > 0 && strings.Contains(nameParts[0], ".") { - parts := strings.Split(nameParts[0], ".") - for i, j := 0, len(parts)-1; i < j; i, j = i+1, j-1 { - parts[i], parts[j] = parts[j], parts[i] - } - nameParts[0] = strings.Join(parts, ".") - } - return strings.Join(nameParts, ".") -} - func typeName(t reflect.Type) string { path := t.PkgPath() if strings.Contains(path, "/vendor/") { @@ -183,9 +170,9 @@ func NewDefinitionNamer(schemes ...*runtime.Scheme) *DefinitionNamer { // GetDefinitionName returns the name and tags for a given definition func (d *DefinitionNamer) GetDefinitionName(name string) (string, spec.Extensions) { if groupVersionKinds, ok := d.typeGroupVersionKinds[name]; ok { - return friendlyName(name), spec.Extensions{ + return util.ToRESTFriendlyName(name), spec.Extensions{ extensionGVK: groupVersionKinds.JSON(), } } - return friendlyName(name), nil + return util.ToRESTFriendlyName(name), nil }