Use latest from sdk create/update for rm.onError() (#344)

vijtrip2 · web-flow · commit fb8640dcbf5f · 2022-06-16T10:11:24.000-07:00
Issue #, if available: aws-controllers-k8s/community#1336 Description of changes: * After the sdkCreate/sdkUpdate call, the resource manager was still using the latest from ReadOne call when invoking `rm.onError` method * Instead it should use the resource returned from sdkCreate and sdkUpdate call 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
@@ -113,6 +113,9 @@ func (rm *resourceManager) Create(
 	}
 	created, err := rm.sdkCreate(ctx, r)
 	if err != nil {
+	    if created != nil {
+	        return rm.onError(created, err)
+	    }
 		return rm.onError(r, err)
 	}
 	return rm.onSuccess(created)
@@ -140,6 +143,9 @@ func (rm *resourceManager) Update(
 	}
 	updated, err := rm.sdkUpdate(ctx, desired, latest, delta)
 	if err != nil {
+	    if updated != nil {
+	        return rm.onError(updated, err)
+	    }
 		return rm.onError(latest, err)
 	}
 	return rm.onSuccess(updated)

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ func (rm *resourceManager) Create(`
`113`	`113`	`}`
`114`	`114`	`created, err := rm.sdkCreate(ctx, r)`
`115`	`115`	`if err != nil {`
	`116`	`+ if created != nil {`
	`117`	`+ return rm.onError(created, err)`
	`118`	`+ }`
`116`	`119`	`return rm.onError(r, err)`
`117`	`120`	`}`
`118`	`121`	`return rm.onSuccess(created)`
`@@ -140,6 +143,9 @@ func (rm *resourceManager) Update(`
`140`	`143`	`}`
`141`	`144`	`updated, err := rm.sdkUpdate(ctx, desired, latest, delta)`
`142`	`145`	`if err != nil {`
	`146`	`+ if updated != nil {`
	`147`	`+ return rm.onError(updated, err)`
	`148`	`+ }`
`143`	`149`	`return rm.onError(latest, err)`
`144`	`150`	`}`
`145`	`151`	`return rm.onSuccess(updated)`