adapt: stop using a ShortcutExpander in OverwriteBootstrapPolicy
@@ -39,7 +39,6 @@ import (
"github.com/openshift/origin/pkg/cmd/cli/describe"
configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
originrest "github.com/openshift/origin/pkg/cmd/server/origin/rest"
- cmdclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
templateapi "github.com/openshift/origin/pkg/template/api"
"github.com/openshift/origin/pkg/util/restoptions"
)
@@ -117,7 +116,7 @@ func OverwriteBootstrapPolicy(optsGetter restoptions.Getter, policyFile, createB
fmt.Fprintf(out, "Performing a dry run of policy overwrite:\n\n")
}
- mapper := cmdclientcmd.ShortcutExpander{RESTMapper: kcmdutil.ShortcutExpander{RESTMapper: kapi.Registry.RESTMapper()}}
+ mapper := kapi.Registry.RESTMapper()
typer := kapi.Scheme
clientMapper := resource.ClientMapperFunc(func(mapping *meta.RESTMapping) (resource.RESTClient, error) {
return nil, nil
