Migrate code generator to eris (#4454)

* Add eris as a dependency

* Update generator files

Author: theunrepentantgeek

v2/tools/generator/gen_kustomize.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
+	"github.com/rotisserie/eris"
 	"github.com/spf13/cobra"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 
@@ -99,7 +99,7 @@ func NewGenKustomizeCommand() (*cobra.Command, error) {
 			}
 
 			if len(result.Resources) == 0 {
-				err = errors.Errorf("no files found in %q", basesPath)
+				err = eris.Errorf("no files found in %q", basesPath)
 				log.Error(
 					err,
 					"No CRD files found")

v2/tools/generator/gen_types.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/pkg/errors"
+	"github.com/rotisserie/eris"
 	"github.com/spf13/cobra"
 
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/codegen"
@@ -61,7 +61,7 @@ func NewGenTypesCommand() (*cobra.Command, error) {
 
 			err = cg.Generate(ctx, log)
 			if err != nil {
-				err = errors.Wrap(err, "error generating code")
+				err = eris.Wrap(err, "error generating code")
 				return err
 			}
 

v2/tools/generator/go.mod

@@ -52,6 +52,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/rotisserie/eris v0.5.4 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect

v2/tools/generator/go.sum

@@ -266,6 +266,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk=
+github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=

v2/tools/generator/internal/armconversion/arm_conversion_function.go

@@ -7,7 +7,7 @@ package armconversion
 
 import (
 	"github.com/dave/dst"
-	"github.com/pkg/errors"
+	"github.com/rotisserie/eris"
 
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astmodel"
 )
@@ -80,15 +80,15 @@ func (c *ConvertToARMFunction) AsFunc(
 		receiver,
 		c.Name())
 	if err != nil {
-		return nil, errors.Wrapf(
+		return nil, eris.Wrapf(
 			err,
 			"error creating ConvertToARM function for %s",
 			receiver.Name())
 	}
 
 	decl, err := builder.functionDeclaration()
 	if err != nil {
-		return nil, errors.Wrapf(
+		return nil, eris.Wrapf(
 			err,
 			"error generating ConvertToARM function for %s",
 			c.Name())
@@ -107,15 +107,15 @@ func (c *PopulateFromARMFunction) AsFunc(
 		receiver,
 		c.Name())
 	if err != nil {
-		return nil, errors.Wrapf(
+		return nil, eris.Wrapf(
 			err,
 			"error creating ConvertFromARM function for %s",
 			receiver.Name())
 	}
 
 	decl, err := builder.functionDeclaration()
 	if err != nil {
-		return nil, errors.Wrapf(
+		return nil, eris.Wrapf(
 			err,
 			"error generating ConvertFromARM function for %s",
 			c.Name())

v2/tools/generator/internal/armconversion/arm_spec_interface.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 
 	"github.com/dave/dst"
-	"github.com/pkg/errors"
+	"github.com/rotisserie/eris"
 
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astbuilder"
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astmodel"
@@ -19,7 +19,7 @@ import (
 func checkPropertyPresence(o *astmodel.ObjectType, name astmodel.PropertyName) error {
 	_, ok := o.Property(name)
 	if !ok {
-		return errors.Errorf("resource spec doesn't have %q property", name)
+		return eris.Errorf("resource spec doesn't have %q property", name)
 	}
 
 	return nil
@@ -83,7 +83,7 @@ func armSpecInterfaceSimpleGetFunction(
 	receiverIdent := fn.IdFactory().CreateReceiver(receiver.Name())
 	receiverExpr, err := receiver.AsTypeExpr(codeGenerationContext)
 	if err != nil {
-		return nil, errors.Wrapf(err, "creating type expression for %s", receiver.Name())
+		return nil, eris.Wrapf(err, "creating type expression for %s", receiver.Name())
 	}
 
 	var result dst.Expr = astbuilder.Selector(dst.NewIdent(receiverIdent), propertyName)

v2/tools/generator/internal/armconversion/convert_from_arm_function_builder.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/dave/dst"
-	"github.com/pkg/errors"
+	"github.com/rotisserie/eris"
 
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astbuilder"
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astmodel"
@@ -33,7 +33,7 @@ func newConvertFromARMFunctionBuilder(
 ) (*convertFromARMBuilder, error) {
 	receiverExpr, err := receiver.AsTypeExpr(codeGenerationContext)
 	if err != nil {
-		return nil, errors.Wrapf(err, "creating type expression for %s", receiver)
+		return nil, eris.Wrapf(err, "creating type expression for %s", receiver)
 	}
 
 	result := &convertFromARMBuilder{
@@ -105,7 +105,7 @@ func (builder *convertFromARMBuilder) functionDeclaration() (*dst.FuncDecl, erro
 	fn.AddComments("populates a Kubernetes CRD object from an Azure ARM object")
 	ownerReferenceExpr, err := astmodel.ArbitraryOwnerReference.AsTypeExpr(builder.codeGenerationContext)
 	if err != nil {
-		return nil, errors.Wrap(err, "creating owner reference type expression")
+		return nil, eris.Wrap(err, "creating owner reference type expression")
 	}
 
 	fn.AddParameter(
@@ -123,7 +123,7 @@ func (builder *convertFromARMBuilder) functionBodyStatements() ([]dst.Stmt, erro
 		builder.destinationType,
 		builder.propertyConversionHandler)
 	if err != nil {
-		return nil, errors.Wrapf(err, "unable to generate conversion statements for %s", builder.methodName)
+		return nil, eris.Wrapf(err, "unable to generate conversion statements for %s", builder.methodName)
 	}
 
 	// We remove empty statements here as they may have been used to store comments or other
@@ -185,7 +185,7 @@ func (builder *convertFromARMBuilder) namePropertyHandler(
 	// Check to make sure that the ARM object has a "Name" property (which matches our "AzureName")
 	fromProp, ok := fromType.Property("Name")
 	if !ok {
-		return notHandled, errors.New("ARM resource missing property 'Name'")
+		return notHandled, eris.New("ARM resource missing property 'Name'")
 	}
 
 	// Invoke SetAzureName(ExtractKubernetesResourceNameFromARMName(this.Name)):
@@ -277,18 +277,19 @@ func (builder *convertFromARMBuilder) ownerPropertyHandler(
 		builder.sourceType.WriteDebugDescription(&armDescription, nil)
 
 		return notHandled,
-			errors.Errorf(
+			eris.Errorf(
 				"owner property was not of type TypeName. Kube: %s, ARM: %s",
 				kubeDescription.String(),
 				armDescription.String())
+
 	}
 
 	var convertedOwner dst.Expr
 	if ownerNameType == astmodel.KnownResourceReferenceType {
 		knownResourceReferenceExpr, err := astmodel.KnownResourceReferenceType.AsTypeExpr(builder.codeGenerationContext)
 		if err != nil {
 			return notHandled,
-				errors.Wrapf(err, "creating known resource reference type expression for %s", ownerProp)
+				eris.Wrapf(err, "creating known resource reference type expression for %s", ownerProp)
 		}
 
 		compositeLit := astbuilder.NewCompositeLiteralBuilder(knownResourceReferenceExpr)
@@ -299,7 +300,7 @@ func (builder *convertFromARMBuilder) ownerPropertyHandler(
 		convertedOwner = astbuilder.AddrOf(dst.NewIdent(ownerParameter))
 	} else {
 		return notHandled,
-			errors.Errorf(
+			eris.Errorf(
 				"found Owner property on spec with unexpected TypeName %s",
 				ownerNameType.String())
 	}
@@ -366,7 +367,7 @@ func (builder *convertFromARMBuilder) flattenedPropertyHandler(
 			result, err := builder.buildFlattenedAssignment(toProp, fromProp)
 			if err != nil {
 				return notHandled,
-					errors.Wrapf(err,
+					eris.Wrapf(err,
 						"failed to build flattened assignment for property %s",
 						toProp.PropertyName())
 			}
@@ -376,7 +377,7 @@ func (builder *convertFromARMBuilder) flattenedPropertyHandler(
 	}
 
 	return notHandled,
-		errors.Errorf(
+		eris.Errorf(
 			"couldn’t find source ARM property %q that k8s property %q was flattened from",
 			toProp.FlattenedFrom()[0],
 			toProp.PropertyName())
@@ -395,11 +396,12 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
 		}
 
 		return notHandled,
-			errors.Errorf(
+			eris.Errorf(
 				"need to implement multiple levels of flattening: property %q on %s was flattened from %q",
 				toProp.PropertyName(),
 				builder.receiverIdent,
 				strings.Join(props, "."))
+
 	}
 
 	allDefs := builder.codeGenerationContext.GetAllReachableDefinitions()
@@ -414,7 +416,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
 	fromPropType, err := allDefs.FullyResolve(fromProp.PropertyType())
 	if err != nil {
 		return notHandled,
-			errors.Wrapf(
+			eris.Wrapf(
 				err,
 				"failed to resolve type for property %s",
 				fromProp.PropertyName())
@@ -431,7 +433,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
 		elementType, err = allDefs.FullyResolve(fromPropOptType.Element())
 		if err != nil {
 			return notHandled,
-				errors.Wrapf(
+				eris.Wrapf(
 					err,
 					"failed to resolve type for property %s",
 					fromProp.PropertyName())
@@ -447,7 +449,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
 	if !objOk {
 		// see pipeline_flatten_properties.go:flattenPropType which will only flatten from (optional) object types
 		return notHandled,
-			errors.Errorf(
+			eris.Errorf(
 				"property %q marked as flattened from non-object type %T, which shouldn’t be possible",
 				toProp.PropertyName(),
 				fromPropType)
@@ -459,7 +461,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
 	nestedProp, ok := fromPropObjType.Property(originalPropName)
 	if !ok {
 		return notHandled,
-			errors.Errorf(
+			eris.Errorf(
 				"couldn't find source of flattened property %q on %s",
 				toProp.PropertyName(),
 				builder.receiverIdent)
@@ -486,7 +488,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
 		})
 	if err != nil {
 		return notHandled,
-			errors.Wrapf(
+			eris.Wrapf(
 				err,
 				"failed to generate conversion for flattened property %s",
 				toProp.PropertyName())
@@ -548,7 +550,7 @@ func (builder *convertFromARMBuilder) propertiesByNameHandler(
 		})
 	if err != nil {
 		return notHandled,
-			errors.Wrapf(
+			eris.Wrapf(
 				err,
 				"failed to generate conversion for property %s",
 				toProp.PropertyName())