Skip to content

Commit

Permalink
improve error messages while listing modules
Browse files Browse the repository at this point in the history
  • Loading branch information
pPrecel committed Jan 31, 2025
1 parent eee244b commit 14ebd5f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions internal/modules/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/kyma-project/cli.v3/internal/kube"
"github.com/kyma-project/cli.v3/internal/kube/kyma"
"k8s.io/apimachinery/pkg/api/errors"
"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)
Expand Down Expand Up @@ -46,17 +46,17 @@ type ModulesList []Module
func List(ctx context.Context, client kube.Client) (ModulesList, error) {
moduleTemplates, err := client.Kyma().ListModuleTemplate(ctx)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "failed to list all ModuleTemplate CRs from the cluster")
}

modulereleasemetas, err := client.Kyma().ListModuleReleaseMeta(ctx)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "failed to list all ModuleReleaseMeta CRs from the cluster")
}

defaultKyma, err := client.Kyma().GetDefaultKyma(ctx)
if err != nil && !apierrors.IsNotFound(err) {
return nil, err
return nil, errors.Wrap(err, "failed to get default Kyma CR from the cluster")
}

modulesList := ModulesList{}
Expand All @@ -83,7 +83,7 @@ func List(ctx context.Context, client kube.Client) (ModulesList, error) {
// only get state of installed modules
state, err = getModuleState(ctx, client, moduleTemplate, defaultKyma)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed to get module state from the %s ModuleTemplate", moduleTemplate.GetName())
}
}
if i := getModuleIndex(modulesList, moduleName); i != -1 {
Expand Down Expand Up @@ -149,7 +149,7 @@ func getStateFromData(ctx context.Context, client kube.Client, data unstructured
unstruct := generateUnstruct(apiVersion, kind, name, namespace)
result, err := client.RootlessDynamic().Get(ctx, &unstruct)
if err != nil {
if errors.IsNotFound(err) {
if apierrors.IsNotFound(err) {
return "", nil
}
return "", err
Expand All @@ -175,7 +175,7 @@ func getResourceState(ctx context.Context, client kube.Client, manager *kyma.Man
unstruct := generateUnstruct(apiVersion, manager.Kind, manager.Name, namespace)
result, err := client.RootlessDynamic().Get(ctx, &unstruct)
if err != nil {
if errors.IsNotFound(err) {
if apierrors.IsNotFound(err) {
return "", nil
}
return "", err
Expand Down

0 comments on commit 14ebd5f

Please sign in to comment.