crossplane
/
crossplane-tools
mirror of https://github.com/crossplane/crossplane-tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a nil check for reference resolvers 

Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>
This commit is contained in:
Sergen Yalçın 2025-05-02 15:53:47 +03:00
parent de0e5107ea
commit e9a9112fd2
No known key found for this signature in database
GPG Key ID: 9FB946893C6A9628
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/method/resolver.go
View File

@ -58,7 +58,7 @@ func NewResolveReferences(traverser *xptypes.Traverser, receiver, clientPath, re
resolverCalls[i] = encapsulate(0, multiResolutionCall(ref, referencePkgPath, convertPkgPath), ref.GoValueFieldPath...).Line() resolverCalls[i] = encapsulate(0, multiResolutionCall(ref, referencePkgPath, convertPkgPath), ref.GoValueFieldPath...).Line()
} else { } else {
hasSingleResolution = true hasSingleResolution = true
resolverCalls[i] = encapsulate(0, singleResolutionCall(ref, referencePkgPath, ptrPkgPath), ref.GoValueFieldPath...).Line() resolverCalls[i] = encapsulate(0, singleResolutionCall(ref, referencePkgPath, ptrPkgPath, convertPkgPath), ref.GoValueFieldPath...).Line()
} }
} }
var initStatements jen.Statement var initStatements jen.Statement
@ -113,8 +113,9 @@ func encapsulate(index int, callFn resolutionCallFn, fields ...string) *jen.Stat
} }
} }
func singleResolutionCall(ref Reference, referencePkgPath string, ptrPkgPath string) resolutionCallFn { func singleResolutionCall(ref Reference, referencePkgPath string, ptrPkgPath string, convertPkgPath string) resolutionCallFn {
return func(fields ...string) *jen.Statement { return func(fields ...string) *jen.Statement {
pkgPath := ptrPkgPath
prefixPath := jen.Id(fields[0]) prefixPath := jen.Id(fields[0])
for i := 1; i < len(fields)-1; i++ { for i := 1; i < len(fields)-1; i++ {
prefixPath = prefixPath.Dot(fields[i]) prefixPath = prefixPath.Dot(fields[i])
@ -129,10 +130,13 @@ func singleResolutionCall(ref Reference, referencePkgPath string, ptrPkgPath str
if ref.IsFloatPointer { if ref.IsFloatPointer {
toPointerFunction = "ToFloatPtrValue" toPointerFunction = "ToFloatPtrValue"
fromPointerFunction = "FromFloatPtrValue" fromPointerFunction = "FromFloatPtrValue"
pkgPath = convertPkgPath
} }
if ref.IsPointer { if ref.IsPointer {
setResolvedValue = currentValuePath.Clone().Op("=").Qual(ptrPkgPath, toPointerFunction).Call(jen.Id("rsp").Dot("ResolvedValue")) setResolvedValue = jen.If(jen.Id("v").Op(":=").Id("rsp").Dot("ResolvedValue")).Op(";").Id("v").Op("!=").Lit("").Block(
currentValuePath = jen.Qual(ptrPkgPath, fromPointerFunction).Call(currentValuePath, jen.Op(`""`)) jen.Add(prefixPath.Clone().Dot(fields[len(fields)-1]).Clone().Op("=").Qual(pkgPath, toPointerFunction).Call(jen.Id("v")))).Else().Block(
jen.Add(prefixPath.Clone().Dot(fields[len(fields)-1]).Clone().Op("=").Nil()))
currentValuePath = jen.Qual(pkgPath, fromPointerFunction).Call(currentValuePath, jen.Op(`""`))
} }
return &jen.Statement{ return &jen.Statement{
jen.List(jen.Id("rsp"), jen.Err()).Op("=").Id("r").Dot("Resolve").Call( jen.List(jen.Id("rsp"), jen.Err()).Op("=").Id("r").Dot("Resolve").Call(