From c5a13930288d564d6b41d32967640308df147d72 Mon Sep 17 00:00:00 2001 From: Mikhail Mazurskiy Date: Wed, 13 Oct 2021 16:15:24 +1100 Subject: [PATCH] ResettableRESTMapper to make it possible to reset wrapped mappers Kubernetes-commit: de4598d0db5e2babe89dd334407b2ba8024ec9a1 --- restmapper/discovery.go | 2 +- restmapper/shortcut.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/restmapper/discovery.go b/restmapper/discovery.go index d560db84d..3505178b6 100644 --- a/restmapper/discovery.go +++ b/restmapper/discovery.go @@ -335,4 +335,4 @@ func (d *DeferredDiscoveryRESTMapper) String() string { } // Make sure it satisfies the interface -var _ meta.RESTMapper = &DeferredDiscoveryRESTMapper{} +var _ meta.ResettableRESTMapper = &DeferredDiscoveryRESTMapper{} diff --git a/restmapper/shortcut.go b/restmapper/shortcut.go index 73b317c1c..714ba90a7 100644 --- a/restmapper/shortcut.go +++ b/restmapper/shortcut.go @@ -34,7 +34,7 @@ type shortcutExpander struct { discoveryClient discovery.DiscoveryInterface } -var _ meta.RESTMapper = &shortcutExpander{} +var _ meta.ResettableRESTMapper = shortcutExpander{} // NewShortcutExpander wraps a restmapper in a layer that expands shortcuts found via discovery func NewShortcutExpander(delegate meta.RESTMapper, client discovery.DiscoveryInterface) meta.RESTMapper { @@ -164,6 +164,10 @@ func (e shortcutExpander) expandResourceShortcut(resource schema.GroupVersionRes return resource } +func (e shortcutExpander) Reset() { + meta.MaybeResetRESTMapper(e.RESTMapper) +} + // ResourceShortcuts represents a structure that holds the information how to // transition from resource's shortcut to its full name. type resourceShortcuts struct {