Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable useless error wrappings #447

Merged
merged 1 commit into from
Apr 19, 2021
Merged

Disable useless error wrappings #447

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pkg/driftctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"

"github.com/jmespath/go-jmespath"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/cloudskiff/driftctl/pkg/alerter"
Expand Down Expand Up @@ -54,7 +53,7 @@ func NewDriftCTL(remoteSupplier resource.Supplier, iacSupplier resource.Supplier
func (d DriftCTL) Run() (*analyser.Analysis, error) {
remoteResources, resourcesFromState, err := d.scan()
if err != nil {
return nil, errors.WithStack(err)
return nil, err
}

middleware := middlewares.NewChain(
Expand Down Expand Up @@ -88,18 +87,18 @@ func (d DriftCTL) Run() (*analyser.Analysis, error) {
logrus.Debug("Ready to run middlewares")
err = middleware.Execute(&remoteResources, &resourcesFromState)
if err != nil {
return nil, errors.Wrap(err, "Unable to run middlewares")
return nil, err
}

if d.filter != nil {
engine := filter.NewFilterEngine(d.filter)
remoteResources, err = engine.Run(remoteResources)
if err != nil {
return nil, errors.Wrap(err, "Unable to filter remote resources")
return nil, err
}
resourcesFromState, err = engine.Run(resourcesFromState)
if err != nil {
return nil, errors.Wrap(err, "Unable to filter state resources")
return nil, err
}
}

Expand All @@ -109,7 +108,7 @@ func (d DriftCTL) Run() (*analyser.Analysis, error) {
analysis, err := d.analyzer.Analyze(remoteResources, resourcesFromState, driftIgnore)

if err != nil {
return nil, errors.Wrap(err, "Unable to perform resources analysis")
return nil, err
}

return &analysis, nil
Expand Down