@@ -11,7 +11,7 @@ import (
11
11
"strings"
12
12
13
13
"github.com/dave/dst"
14
- "github.com/pkg/errors "
14
+ "github.com/rotisserie/eris "
15
15
16
16
"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astbuilder"
17
17
"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astmodel"
@@ -33,7 +33,7 @@ func newConvertFromARMFunctionBuilder(
33
33
) (* convertFromARMBuilder , error ) {
34
34
receiverExpr , err := receiver .AsTypeExpr (codeGenerationContext )
35
35
if err != nil {
36
- return nil , errors .Wrapf (err , "creating type expression for %s" , receiver )
36
+ return nil , eris .Wrapf (err , "creating type expression for %s" , receiver )
37
37
}
38
38
39
39
result := & convertFromARMBuilder {
@@ -105,7 +105,7 @@ func (builder *convertFromARMBuilder) functionDeclaration() (*dst.FuncDecl, erro
105
105
fn .AddComments ("populates a Kubernetes CRD object from an Azure ARM object" )
106
106
ownerReferenceExpr , err := astmodel .ArbitraryOwnerReference .AsTypeExpr (builder .codeGenerationContext )
107
107
if err != nil {
108
- return nil , errors .Wrap (err , "creating owner reference type expression" )
108
+ return nil , eris .Wrap (err , "creating owner reference type expression" )
109
109
}
110
110
111
111
fn .AddParameter (
@@ -123,7 +123,7 @@ func (builder *convertFromARMBuilder) functionBodyStatements() ([]dst.Stmt, erro
123
123
builder .destinationType ,
124
124
builder .propertyConversionHandler )
125
125
if err != nil {
126
- return nil , errors .Wrapf (err , "unable to generate conversion statements for %s" , builder .methodName )
126
+ return nil , eris .Wrapf (err , "unable to generate conversion statements for %s" , builder .methodName )
127
127
}
128
128
129
129
// We remove empty statements here as they may have been used to store comments or other
@@ -185,7 +185,7 @@ func (builder *convertFromARMBuilder) namePropertyHandler(
185
185
// Check to make sure that the ARM object has a "Name" property (which matches our "AzureName")
186
186
fromProp , ok := fromType .Property ("Name" )
187
187
if ! ok {
188
- return notHandled , errors .New ("ARM resource missing property 'Name'" )
188
+ return notHandled , eris .New ("ARM resource missing property 'Name'" )
189
189
}
190
190
191
191
// Invoke SetAzureName(ExtractKubernetesResourceNameFromARMName(this.Name)):
@@ -277,18 +277,19 @@ func (builder *convertFromARMBuilder) ownerPropertyHandler(
277
277
builder .sourceType .WriteDebugDescription (& armDescription , nil )
278
278
279
279
return notHandled ,
280
- errors .Errorf (
280
+ eris .Errorf (
281
281
"owner property was not of type TypeName. Kube: %s, ARM: %s" ,
282
282
kubeDescription .String (),
283
283
armDescription .String ())
284
+
284
285
}
285
286
286
287
var convertedOwner dst.Expr
287
288
if ownerNameType == astmodel .KnownResourceReferenceType {
288
289
knownResourceReferenceExpr , err := astmodel .KnownResourceReferenceType .AsTypeExpr (builder .codeGenerationContext )
289
290
if err != nil {
290
291
return notHandled ,
291
- errors .Wrapf (err , "creating known resource reference type expression for %s" , ownerProp )
292
+ eris .Wrapf (err , "creating known resource reference type expression for %s" , ownerProp )
292
293
}
293
294
294
295
compositeLit := astbuilder .NewCompositeLiteralBuilder (knownResourceReferenceExpr )
@@ -299,7 +300,7 @@ func (builder *convertFromARMBuilder) ownerPropertyHandler(
299
300
convertedOwner = astbuilder .AddrOf (dst .NewIdent (ownerParameter ))
300
301
} else {
301
302
return notHandled ,
302
- errors .Errorf (
303
+ eris .Errorf (
303
304
"found Owner property on spec with unexpected TypeName %s" ,
304
305
ownerNameType .String ())
305
306
}
@@ -366,7 +367,7 @@ func (builder *convertFromARMBuilder) flattenedPropertyHandler(
366
367
result , err := builder .buildFlattenedAssignment (toProp , fromProp )
367
368
if err != nil {
368
369
return notHandled ,
369
- errors .Wrapf (err ,
370
+ eris .Wrapf (err ,
370
371
"failed to build flattened assignment for property %s" ,
371
372
toProp .PropertyName ())
372
373
}
@@ -376,7 +377,7 @@ func (builder *convertFromARMBuilder) flattenedPropertyHandler(
376
377
}
377
378
378
379
return notHandled ,
379
- errors .Errorf (
380
+ eris .Errorf (
380
381
"couldn’t find source ARM property %q that k8s property %q was flattened from" ,
381
382
toProp .FlattenedFrom ()[0 ],
382
383
toProp .PropertyName ())
@@ -395,11 +396,12 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
395
396
}
396
397
397
398
return notHandled ,
398
- errors .Errorf (
399
+ eris .Errorf (
399
400
"need to implement multiple levels of flattening: property %q on %s was flattened from %q" ,
400
401
toProp .PropertyName (),
401
402
builder .receiverIdent ,
402
403
strings .Join (props , "." ))
404
+
403
405
}
404
406
405
407
allDefs := builder .codeGenerationContext .GetAllReachableDefinitions ()
@@ -414,7 +416,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
414
416
fromPropType , err := allDefs .FullyResolve (fromProp .PropertyType ())
415
417
if err != nil {
416
418
return notHandled ,
417
- errors .Wrapf (
419
+ eris .Wrapf (
418
420
err ,
419
421
"failed to resolve type for property %s" ,
420
422
fromProp .PropertyName ())
@@ -431,7 +433,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
431
433
elementType , err = allDefs .FullyResolve (fromPropOptType .Element ())
432
434
if err != nil {
433
435
return notHandled ,
434
- errors .Wrapf (
436
+ eris .Wrapf (
435
437
err ,
436
438
"failed to resolve type for property %s" ,
437
439
fromProp .PropertyName ())
@@ -447,7 +449,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
447
449
if ! objOk {
448
450
// see pipeline_flatten_properties.go:flattenPropType which will only flatten from (optional) object types
449
451
return notHandled ,
450
- errors .Errorf (
452
+ eris .Errorf (
451
453
"property %q marked as flattened from non-object type %T, which shouldn’t be possible" ,
452
454
toProp .PropertyName (),
453
455
fromPropType )
@@ -459,7 +461,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
459
461
nestedProp , ok := fromPropObjType .Property (originalPropName )
460
462
if ! ok {
461
463
return notHandled ,
462
- errors .Errorf (
464
+ eris .Errorf (
463
465
"couldn't find source of flattened property %q on %s" ,
464
466
toProp .PropertyName (),
465
467
builder .receiverIdent )
@@ -486,7 +488,7 @@ func (builder *convertFromARMBuilder) buildFlattenedAssignment(
486
488
})
487
489
if err != nil {
488
490
return notHandled ,
489
- errors .Wrapf (
491
+ eris .Wrapf (
490
492
err ,
491
493
"failed to generate conversion for flattened property %s" ,
492
494
toProp .PropertyName ())
@@ -548,7 +550,7 @@ func (builder *convertFromARMBuilder) propertiesByNameHandler(
548
550
})
549
551
if err != nil {
550
552
return notHandled ,
551
- errors .Wrapf (
553
+ eris .Wrapf (
552
554
err ,
553
555
"failed to generate conversion for property %s" ,
554
556
toProp .PropertyName ())
0 commit comments