Patch the correct observed state after a rm.ReadOne call (#76)

a-hilaly · web-flow · commit 8d7e9fad6371 · 2021-06-07T08:16:27.000-07:00
Issue aws-controllers-k8s/community#807 For some controllers we noticed an incorrect reconciliation behaviour when a custom hook code was returning a `RequeueNeededAfter` error. More precisely `resourceManager.ReadOne` was not returning the correct observed state when `sdkFind` returns with an error. Which was causing the reconciler to patch to wrong state (`desird` instead `observed`). This patch fixes this issue by passing the correct observed state to `onError`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/templates/pkg/resource/manager.go.tpl b/templates/pkg/resource/manager.go.tpl
@@ -74,6 +74,9 @@ func (rm *resourceManager) ReadOne(
 	}
 	observed, err := rm.sdkFind(ctx, r)
 	if err != nil {
+		if observed != nil {
+			return rm.onError(observed, err)
+		}
 		return rm.onError(r, err)
 	}
 	return rm.onSuccess(observed)

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ func (rm *resourceManager) ReadOne(`
`74`	`74`	`}`
`75`	`75`	`observed, err := rm.sdkFind(ctx, r)`
`76`	`76`	`if err != nil {`
	`77`	`+ if observed != nil {`
	`78`	`+ return rm.onError(observed, err)`
	`79`	`+ }`
`77`	`80`	`return rm.onError(r, err)`
`78`	`81`	`}`
`79`	`82`	`return rm.onSuccess(observed)`