Use fmt.Errorf

mrodm · mrodm · commit 0f1f77b5ead7 · 2023-04-05T12:16:59.000+02:00
diff --git a/internal/export/transform_remove_fleet_managed_tags.go b/internal/export/transform_remove_fleet_managed_tags.go
@@ -7,15 +7,13 @@ package export
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
-
 	"github.com/elastic/elastic-package/internal/common"
 )
 
 func removeFleetManagedTags(ctx *transformationContext, object common.MapStr) (common.MapStr, error) {
 	aType, err := object.GetValue("type")
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to read type field")
+		return nil, fmt.Errorf("failed to read type field: %w", err)
 	}
 
 	if aType == "dashboard" {
@@ -36,7 +34,7 @@ func removeTagsFromDashboard(ctx *transformationContext, object common.MapStr) (
 	}
 
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to read references field")
+		return nil, fmt.Errorf("failed to read references field: %w", err)
 	}
 
 	newReferences, err := filterOutFleetManagedTags(ctx, references.([]interface{}))
@@ -46,7 +44,7 @@ func removeTagsFromDashboard(ctx *transformationContext, object common.MapStr) (
 
 	_, err = object.Put("references", newReferences)
 	if err != nil {
-		return nil, errors.Wrapf(err, "can't update references")
+		return nil, fmt.Errorf("can't update references: %w", err)
 	}
 
 	return object, nil
@@ -59,12 +57,12 @@ func removeTagObjects(ctx *transformationContext, object common.MapStr) (common.
 	}
 
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to read id field")
+		return nil, fmt.Errorf("failed to read id field: %w", err)
 	}
 
 	aIdString, ok := aId.(string)
 	if !ok {
-		return nil, errors.Wrap(err, "failed to read id string")
+		return nil, fmt.Errorf("failed to assert id as a string: %v", aId)
 	}
 
 	if isTagFleetManaged(aIdString, ctx.packageName) {

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,13 @@ package export`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`
`10`		`- "github.com/pkg/errors"`
`11`		`-`
`12`	`10`	`"github.com/elastic/elastic-package/internal/common"`
`13`	`11`	`)`
`14`	`12`
`15`	`13`	`func removeFleetManagedTags(ctx *transformationContext, object common.MapStr) (common.MapStr, error) {`
`16`	`14`	`aType, err := object.GetValue("type")`
`17`	`15`	`if err != nil {`
`18`		`- return nil, errors.Wrap(err, "failed to read type field")`
	`16`	`+ return nil, fmt.Errorf("failed to read type field: %w", err)`
`19`	`17`	`}`
`20`	`18`
`21`	`19`	`if aType == "dashboard" {`
`@@ -36,7 +34,7 @@ func removeTagsFromDashboard(ctx *transformationContext, object common.MapStr) (`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`if err != nil {`
`39`		`- return nil, errors.Wrap(err, "failed to read references field")`
	`37`	`+ return nil, fmt.Errorf("failed to read references field: %w", err)`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`newReferences, err := filterOutFleetManagedTags(ctx, references.([]interface{}))`
`@@ -46,7 +44,7 @@ func removeTagsFromDashboard(ctx *transformationContext, object common.MapStr) (`
`46`	`44`
`47`	`45`	`_, err = object.Put("references", newReferences)`
`48`	`46`	`if err != nil {`
`49`		`- return nil, errors.Wrapf(err, "can't update references")`
	`47`	`+ return nil, fmt.Errorf("can't update references: %w", err)`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`return object, nil`
`@@ -59,12 +57,12 @@ func removeTagObjects(ctx *transformationContext, object common.MapStr) (common.`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`if err != nil {`
`62`		`- return nil, errors.Wrap(err, "failed to read id field")`
	`60`	`+ return nil, fmt.Errorf("failed to read id field: %w", err)`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`aIdString, ok := aId.(string)`
`66`	`64`	`if !ok {`
`67`		`- return nil, errors.Wrap(err, "failed to read id string")`
	`65`	`+ return nil, fmt.Errorf("failed to assert id as a string: %v", aId)`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`if isTagFleetManaged(aIdString, ctx.packageName) {`