fix(queue): match props first then stringer

pkg/queue/item.go

@@ -84,22 +84,22 @@ func (i *Item) Equals(o resource.Resource) bool {
 		return false
 	}
 
-	iStringer, iOK := i.Resource.(resource.LegacyStringer)
-	oStringer, oOK := o.(resource.LegacyStringer)
+	iGetter, iOK := i.Resource.(resource.PropertyGetter)
+	oGetter, oOK := o.(resource.PropertyGetter)
 	if iOK != oOK {
 		return false
 	}
 	if iOK && oOK {
-		return iStringer.String() == oStringer.String()
+		return iGetter.Properties().Equals(oGetter.Properties())
 	}
 
-	iGetter, iOK := i.Resource.(resource.PropertyGetter)
-	oGetter, oOK := o.(resource.PropertyGetter)
+	iStringer, iOK := i.Resource.(resource.LegacyStringer)
+	oStringer, oOK := o.(resource.LegacyStringer)
 	if iOK != oOK {
 		return false
 	}
 	if iOK && oOK {
-		return iGetter.Properties().Equals(oGetter.Properties())
+		return iStringer.String() == oStringer.String()
 	}
 
 	return false

pkg/queue/item_test.go

@@ -3,6 +3,7 @@ package queue
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -236,3 +237,38 @@ func Test_ItemEqualNothing(t *testing.T) {
 
 	assert.False(t, i.Equals(i.Resource))
 }
+
+// ------------------------------------------------------------------------
+
+type TestItemResourceRevenant struct {
+	Props types.Properties
+}
+
+func (r *TestItemResourceRevenant) Remove(_ context.Context) error {
+	return nil
+}
+func (r *TestItemResourceRevenant) Properties() types.Properties {
+	return r.Props
+}
+
+func Test_ItemRevenant(t *testing.T) {
+	i := &Item{
+		Resource: &TestItemResourceRevenant{
+			Props: types.NewProperties().Set("CreatedAt", time.Now().UTC()),
+		},
+		State:  ItemStateNew,
+		Reason: "brand new",
+		Type:   "TestResource",
+	}
+
+	j := &Item{
+		Resource: &TestItemResourceRevenant{
+			Props: types.NewProperties().Set("CreatedAt", time.Now().UTC().Add(4*time.Minute)),
+		},
+		State:  ItemStateNew,
+		Reason: "brand new",
+		Type:   "TestResource",
+	}
+
+	assert.False(t, j.Equals(i.Resource))
+}