Make mirrowAwsTags a method in the AWSResourceMAnager interface

Author: michaelhtm

templates/pkg/resource/manager.go.tpl

@@ -89,6 +89,7 @@ func (rm *resourceManager) ReadOne(
 		panic("resource manager's ReadOne() method received resource with nil CR object")
 	}
 	observed, err := rm.sdkFind(ctx, r)
+	rm.MirrorAWSTags(r, observed)
 	if err != nil {
 		if observed != nil {
 			return rm.onError(observed, err)
@@ -140,7 +141,6 @@ func (rm *resourceManager) Update(
 		// Should never happen... if it does, it's buggy code.
 		panic("resource manager's Update() method received resource with nil CR object")
 	}
-	syncAWSTags(desired, latest)
 	updated, err := rm.sdkUpdate(ctx, desired, latest, delta)
 	if err != nil {
 	    if updated != nil {
@@ -312,7 +312,7 @@ func (rm *resourceManager) EnsureTags(
 {{- end }}
 }
 
-// filterAWSTags ignores tags that have keys that start with "aws:"
+// FilterAWSTags ignores tags that have keys that start with "aws:"
 // is needed to ensure the controller does not attempt to remove
 // tags set by AWS. This function needs to be called after each Read
 // operation.
@@ -349,14 +349,18 @@ func (rm *resourceManager) FilterAWSTags(res acktypes.AWSResource) {
 {{- end }}
 }
 
-
-// syncAWSTags ignores tags that have keys that start with "aws:"
-// is needed to ensure the controller does not attempt to remove
-// tags set by AWS. This function needs to be called after each Read
-// operation.
-// Eg. resources created with cloudformation have tags that cannot be
-//removed by an ACK controller
-func syncAWSTags(a *resource, b *resource) {
+// MirrorAWSTags ensures that AWS tags are included in the desired resource
+// if they are present in the latest resource. This will ensure that the
+// aws tags are not present in a diff. The logic of the controller will
+// ensure these tags aren't patched to the resource in the cluster, and
+// will only be present to make sure we don't try to remove these tags.
+//
+// Although there are a lot of similarities between this function and
+// EnsureTags, they are very much different.
+// While EnsureTags tries to make sure the resource contains the controller
+// tags, mirrowAWSTags tries to make sure tags injected by AWS are mirrored
+// from the latest resoruce to the desired resource.
+func (rm *resourceManager) MirrorAWSTags(resA acktypes.AWSResource, resB acktypes.AWSResource) {
 {{- if $hookCode := Hook .CRD "sync_tags" }}
 {{ $hookCode }}
 {{ else }}
@@ -367,6 +371,8 @@ func syncAWSTags(a *resource, b *resource) {
 {{ if eq "list" $tagFieldShapeType -}}
 {{ $tagFieldGoType = (print "[]*svcapitypes." $tagField.GoTypeElem) -}}
 {{ end -}}
+	a := rm.concreteResource(resA)
+	b := rm.concreteResource(resB)
 	if a == nil || a.ko == nil || b == nil || b.ko == nil {
 		return
 	}