diff --git a/CHANGELOG.md b/CHANGELOG.md index 340e47ab..dd2ce50b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- fixed error management in commands with Console version check + ### Changed - update go version to 1.25.1 diff --git a/internal/cmd/catalog/apply/apply.go b/internal/cmd/catalog/apply/apply.go index 69fcaa99..44d21e92 100644 --- a/internal/cmd/catalog/apply/apply.go +++ b/internal/cmd/catalog/apply/apply.go @@ -83,7 +83,10 @@ func ApplyCmd(options *clioptions.CLIOptions) *cobra.Command { cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 0) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return catalog.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/catalog/delete.go b/internal/cmd/catalog/delete.go index fe07f204..41a1aac1 100644 --- a/internal/cmd/catalog/delete.go +++ b/internal/cmd/catalog/delete.go @@ -56,7 +56,10 @@ func DeleteCmd(options *clioptions.CLIOptions) *cobra.Command { cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 0) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return catalog.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/catalog/get.go b/internal/cmd/catalog/get.go index 775e7ebf..94b2b3bb 100644 --- a/internal/cmd/catalog/get.go +++ b/internal/cmd/catalog/get.go @@ -54,7 +54,10 @@ func GetCmd(options *clioptions.CLIOptions) *cobra.Command { cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 0) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return catalog.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/catalog/list.go b/internal/cmd/catalog/list.go index f37459a8..ab5883a6 100644 --- a/internal/cmd/catalog/list.go +++ b/internal/cmd/catalog/list.go @@ -62,7 +62,10 @@ func runListCmd(options *clioptions.CLIOptions) func(cmd *cobra.Command, args [] cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), apiClient, 14, 0) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return catalog.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/catalog/list_versions.go b/internal/cmd/catalog/list_versions.go index 0f864bcf..aac3710f 100644 --- a/internal/cmd/catalog/list_versions.go +++ b/internal/cmd/catalog/list_versions.go @@ -40,7 +40,10 @@ The command will output a table with each version of the item. It works with Mia cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 0) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return catalog.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/item-type-definition/delete.go b/internal/cmd/item-type-definition/delete.go index ed0dfb60..96cbc4d2 100644 --- a/internal/cmd/item-type-definition/delete.go +++ b/internal/cmd/item-type-definition/delete.go @@ -56,7 +56,10 @@ func DeleteCmd(options *clioptions.CLIOptions) *cobra.Command { cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 1) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return itd.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/item-type-definition/get.go b/internal/cmd/item-type-definition/get.go index 6fb4ce27..ecc056e0 100644 --- a/internal/cmd/item-type-definition/get.go +++ b/internal/cmd/item-type-definition/get.go @@ -49,7 +49,10 @@ func GetCmd(options *clioptions.CLIOptions) *cobra.Command { cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 1) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return itd.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/item-type-definition/list.go b/internal/cmd/item-type-definition/list.go index 40332d59..9a3f1b92 100644 --- a/internal/cmd/item-type-definition/list.go +++ b/internal/cmd/item-type-definition/list.go @@ -71,7 +71,10 @@ func runListCmd(options *clioptions.CLIOptions) func(cmd *cobra.Command, args [] cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), apiClient, 14, 1) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return itd.ErrUnsupportedCompanyVersion } diff --git a/internal/cmd/item-type-definition/put.go b/internal/cmd/item-type-definition/put.go index d528465f..496abcd2 100644 --- a/internal/cmd/item-type-definition/put.go +++ b/internal/cmd/item-type-definition/put.go @@ -73,7 +73,10 @@ func PutCmd(options *clioptions.CLIOptions) *cobra.Command { cobra.CheckErr(err) canUseNewAPI, versionError := util.VersionCheck(cmd.Context(), client, 14, 1) - if !canUseNewAPI || versionError != nil { + if versionError != nil { + return versionError + } + if !canUseNewAPI { return itd.ErrUnsupportedCompanyVersion }