From 10ca60a5970e9de897b2b3e38c5572091e580983 Mon Sep 17 00:00:00 2001 From: Sam Gunaratne Date: Mon, 12 May 2025 13:36:51 -0600 Subject: [PATCH 1/2] Remove explicit cli version check from plugin system --- actor/pluginaction/install.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/actor/pluginaction/install.go b/actor/pluginaction/install.go index fece3960340..0357b79e3b1 100644 --- a/actor/pluginaction/install.go +++ b/actor/pluginaction/install.go @@ -6,8 +6,6 @@ import ( "sort" "strings" - "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/actor/actionerror" "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/util/configv3" @@ -88,10 +86,6 @@ func (actor Actor) GetAndValidatePlugin(pluginMetadata PluginMetadata, commandLi return configv3.Plugin{}, actionerror.PluginInvalidError{Err: err} } - cliVersion, err := semver.Make(actor.config.BinaryVersion()) - if err != nil { - return configv3.Plugin{}, actionerror.PluginInvalidError{Err: err} - } var pluginLibraryMajorVersion int hasPluginLibraryVersion := plugin.LibraryVersion != configv3.PluginVersion{} if !hasPluginLibraryVersion { @@ -100,13 +94,8 @@ func (actor Actor) GetAndValidatePlugin(pluginMetadata PluginMetadata, commandLi pluginLibraryMajorVersion = plugin.LibraryVersion.Major } - switch cliVersion.Major { - case 6, 7, 8: - if pluginLibraryMajorVersion > 1 { - return configv3.Plugin{}, actionerror.PluginInvalidLibraryVersionError{} - } - default: - panic("unrecognized major version") + if pluginLibraryMajorVersion > 1 { + return configv3.Plugin{}, actionerror.PluginInvalidLibraryVersionError{} } installedPlugins := actor.config.Plugins() From 95c88dbf41436df31e6ada6662a4ac855d45b3e5 Mon Sep 17 00:00:00 2001 From: Sam Gunaratne Date: Tue, 13 May 2025 17:45:06 -0600 Subject: [PATCH 2/2] do not merge --- main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/main.go b/main.go index 1347aff23b8..4c21d514572 100644 --- a/main.go +++ b/main.go @@ -17,6 +17,7 @@ import ( ) func main() { + fmt.Println("foooob") var exitCode int defer panichandler.HandlePanic()