Merge pull request #324 from sergenyalcin/fix-nil-instance-diff

sergenyalcin · web-flow · commit fb3a200ed6e5 · 2024-01-09T11:27:02.000+03:00
Add a nil check for the calculated instanceDiff while Observe
diff --git a/pkg/controller/external_nofork.go b/pkg/controller/external_nofork.go
@@ -495,6 +495,9 @@ func (n *noForkExternal) Observe(ctx context.Context, mg xpresource.Managed) (ma
 	if err != nil {
 		return managed.ExternalObservation{}, errors.Wrap(err, "cannot compute the instance diff")
 	}
+	if instanceDiff == nil {
+		instanceDiff = tf.NewInstanceDiff()
+	}
 	n.instanceDiff = instanceDiff
 	noDiff := instanceDiff.Empty()
 

Original file line number	Diff line number	Diff line change
`@@ -495,6 +495,9 @@ func (n *noForkExternal) Observe(ctx context.Context, mg xpresource.Managed) (ma`
`495`	`495`	`if err != nil {`
`496`	`496`	`return managed.ExternalObservation{}, errors.Wrap(err, "cannot compute the instance diff")`
`497`	`497`	`}`
	`498`	`+ if instanceDiff == nil {`
	`499`	`+ instanceDiff = tf.NewInstanceDiff()`
	`500`	`+ }`
`498`	`501`	`n.instanceDiff = instanceDiff`
`499`	`502`	`noDiff := instanceDiff.Empty()`
`500`	`503`