Fix ServiceAccountReferencer errors

Currently reference resolution results in the following error: ``` cannot resolve references: spec.forProvider.serviceAccount: could not resolve ServiceAccount reference: {<nil> <nil> 0xc003906e90}: referenced field was empty (referenced resource may not yet be ready) ``` Signed-off-by: Nic Cope <[email protected]>
turkenh · Sep 16, 2021 · dd9f401 · dd9f401
1 parent bfb4c9c
commit dd9f401
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/apis/iam/v1alpha1/referencers.go b/apis/iam/v1alpha1/referencers.go
@@ -90,7 +90,7 @@ func (sar *ServiceAccountReferer) resolveReferences(ctx context.Context, resolve
 	})
 
 	if err != nil {
-		return errors.Wrap(err, fmt.Sprintf("could not resolve ServiceAccount reference: %v", *sar))
+		return err
 	}
 
 	sar.ServiceAccount = reference.ToPtrValue(rsp.ResolvedValue)
@@ -101,16 +101,15 @@ func (sar *ServiceAccountReferer) resolveReferences(ctx context.Context, resolve
 
 // ResolveReferences of this ServiceAccountKey
 func (in *ServiceAccountKey) ResolveReferences(ctx context.Context, c client.Reader) error {
-	return errors.Wrap(in.Spec.ForProvider.ServiceAccountReferer.resolveReferences(ctx, reference.NewAPIResolver(c, in)),
-		"spec.forProvider.serviceAccount")
+	return errors.Wrap(in.Spec.ForProvider.resolveReferences(ctx, reference.NewAPIResolver(c, in)), "spec.forProvider.serviceAccount")
 }
 
 // ResolveReferences of this ServiceAccountPolicy
 func (in *ServiceAccountPolicy) ResolveReferences(ctx context.Context, c client.Reader) error {
 	r := reference.NewAPIResolver(c, in)
 
-	if err := in.Spec.ForProvider.ServiceAccountReferer.resolveReferences(ctx, r); err != nil {
-		return err
+	if err := in.Spec.ForProvider.resolveReferences(ctx, r); err != nil {
+		return errors.Wrap(err, "spec.forProvider.serviceAccount")
 	}
 
 	// Resolve spec.ForProvider.Policy.Bindings[*].Members