test: enable feature gates for unit tests

Extra changes:
* ensure updated = latest in update resource (if no delta)
* changes to unit tests to ensure correct mocks

Author: michaelhtm

pkg/runtime/reconciler.go

@@ -488,7 +488,9 @@ func (r *resourceReconciler) Sync(
 		if err != nil {
 			return latest, err
 		}
-	} else if !isReadOnly {
+	} else if isReadOnly {
+		return latest, nil
+	} else {
 		if adoptionPolicy == AdoptionPolicy_AdoptOrCreate {
 			// set adopt-or-create resource as managed before attempting
 			// update
@@ -738,6 +740,7 @@ func (r *resourceReconciler) updateResource(
 	defer func() {
 		exit(err)
 	}()
+	updated = latest
 
 	// Ensure the resource is managed
 	if err = r.failOnResourceUnmanaged(ctx, latest); err != nil {

pkg/runtime/reconciler_test.go

@@ -35,6 +35,7 @@ import (
 	ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition"
 	ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config"
 	ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
+	"github.com/aws-controllers-k8s/runtime/pkg/featuregate"
 	ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
 	"github.com/aws-controllers-k8s/runtime/pkg/requeue"
 	ackrt "github.com/aws-controllers-k8s/runtime/pkg/runtime"
@@ -92,7 +93,12 @@ func reconcilerMocks(
 		Level:       zapcore.InfoLevel,
 	}
 	fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
-	cfg := ackcfg.Config{}
+	cfg := ackcfg.Config{
+		FeatureGates: featuregate.FeatureGates{
+			featuregate.ReadOnlyResources: {Enabled: true},
+			featuregate.ResourceAdoption:  {Enabled: true},
+		},
+	}
 	metrics := ackmetrics.NewMetrics("bookstore")
 
 	sc := &ackmocks.ServiceController{}
@@ -243,7 +249,7 @@ func TestReconcilerReadOnlyResource(t *testing.T) {
 	rm.On("IsSynced", ctx, latest).Return(true, nil)
 	rmf, rd := managedResourceManagerFactoryMocks(desired, latest)
 
-	rm.On("LateInitialize", ctx, latest).Return(latest, nil)
+	// rm.On("LateInitialize", ctx, latest).Return(latest, nil)
 	rd.On("IsManaged", desired).Return(true)
 	rd.On("Delta", desired, latest).Return(ackcompare.NewDelta())
 	rd.On("Delta", latest, latest).Return(ackcompare.NewDelta())
@@ -266,28 +272,34 @@ func TestReconcilerAdoptResource(t *testing.T) {
 	require := require.New(t)
 
 	ctx := context.TODO()
+	adoptionFieldsString := "{\"arn\": \"my-adopt-book-arn\"}"
+	adoptionFields := map[string]string{
+		"arn": "my-adopt-book-arn",
+	}
 
 	desired, _, metaObj := resourceMocks()
 	desired.On("ReplaceConditions", []*ackv1alpha1.Condition{}).Return()
 	metaObj.SetAnnotations(map[string]string{
 		ackv1alpha1.AnnotationAdoptionPolicy: "adopt",
-		ackv1alpha1.AnnotationAdoptionFields: "{\"arn\": \"my-adopt-book-arn\"}",
+		ackv1alpha1.AnnotationAdoptionFields: adoptionFieldsString,
 	})
 
 	latest, latestRTObj, _ := resourceMocks()
 	latest.On("Conditions").Return([]*ackv1alpha1.Condition{})
 	latest.On("MetaObject").Return(metav1.ObjectMeta{
 		Annotations: map[string]string{
 			ackv1alpha1.AnnotationAdoptionPolicy: "adopt",
-			ackv1alpha1.AnnotationAdoptionFields: "{\"arn\": \"my-adopt-book-arn\"}",
+			ackv1alpha1.AnnotationAdoptionFields: adoptionFieldsString,
 		},
 	})
+
 	latest.On("Conditions").Return([]*ackv1alpha1.Condition{})
 	latest.On(
 		"ReplaceConditions",
 		mock.AnythingOfType("[]*v1alpha1.Condition"),
 	).Return()
 
+	desired.On("PopulateResourceFromAnnotation", adoptionFields).Return(nil)
 	rm := &ackmocks.AWSResourceManager{}
 	rm.On("ResolveReferences", ctx, nil, desired).Return(
 		desired, false, nil,
@@ -304,8 +316,10 @@ func TestReconcilerAdoptResource(t *testing.T) {
 	rd.On("IsManaged", desired).Return(false)
 	rd.On("Delta", desired, latest).Return(ackcompare.NewDelta())
 	rd.On("Delta", latest, latest).Return(ackcompare.NewDelta())
-
+	
 	r, kc, scmd := reconcilerMocks(rmf)
+	rm.On("FilterSystemTags", latest).Return()
+	rd.On("MarkAdopted", latest).Return()
 	rm.On("EnsureTags", ctx, desired, scmd).Return(nil)
 	statusWriter := &ctrlrtclientmock.SubResourceWriter{}
 	kc.On("Patch", ctx, latestRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
@@ -325,12 +339,17 @@ func TestReconcilerAdoptOrCreateResource_Create(t *testing.T) {
 
 	ctx := context.TODO()
 
+	adoptionFieldsString := "{\"arn\": \"my-adopt-book-arn\"}"
+	adoptionFields := map[string]string{
+		"arn": "my-adopt-book-arn",
+	}
 	desired, _, metaObj := resourceMocks()
 	desired.On("ReplaceConditions", []*ackv1alpha1.Condition{}).Return()
 	metaObj.SetAnnotations(map[string]string{
 		ackv1alpha1.AnnotationAdoptionPolicy: "adopt-or-create",
-		ackv1alpha1.AnnotationAdoptionFields: "{\"arn\": \"my-adopt-book-arn\"}",
+		ackv1alpha1.AnnotationAdoptionFields: adoptionFieldsString,
 	})
+	desired.On("PopulateResourceFromAnnotation", adoptionFields).Return(nil)
 
 	ids := &ackmocks.AWSResourceIdentifiers{}
 
@@ -339,8 +358,8 @@ func TestReconcilerAdoptOrCreateResource_Create(t *testing.T) {
 	latest.On("Conditions").Return([]*ackv1alpha1.Condition{})
 	latest.On("MetaObject").Return(metav1.ObjectMeta{
 		Annotations: map[string]string{
-			ackv1alpha1.AnnotationAdoptionPolicy: "adopt",
-			ackv1alpha1.AnnotationAdoptionFields: "{\"arn\": \"my-adopt-book-arn\"}",
+			ackv1alpha1.AnnotationAdoptionPolicy: "adopt-or-create",
+			ackv1alpha1.AnnotationAdoptionFields: adoptionFieldsString,
 		},
 	})
 	latest.On("Conditions").Return([]*ackv1alpha1.Condition{})
@@ -366,6 +385,8 @@ func TestReconcilerAdoptOrCreateResource_Create(t *testing.T) {
 	).Once()
 	rm.On("IsSynced", ctx, latest).Return(true, nil)
 	rmf, rd := managedResourceManagerFactoryMocks(desired, latest)
+	rm.On("FilterSystemTags", latest).Return()
+	rd.On("MarkAdopted", latest).Return()
 
 	rm.On("LateInitialize", ctx, latest).Return(latest, nil)
 	rd.On("IsManaged", desired).Return(false).Once()