fix: fix resource assertion logic and its logging

Fix two things in the resource asserters:

1. We were doing a busy `state.Get` loop in the resource assertions. This was unnecessary to wait for a resource to be created, as we also create a watch, and the moment the resource gets created, we get notified. Changed this logic to follow the same logic with the rest of the assertions on the resource (block on `watch` events).

2. This busy wait also produced a test log every single time the resource was not found, producing an excessive number of logs. Remove this log and unify the logic with the rest of the assertions (see fix 1), so that the NotFound logs will also be aggregated/de-duplicated.

Signed-off-by: Utku Ozdemir <[email protected]>

Author: utkuozdemir

pkg/resource/rtestutils/assertions.go

@@ -57,20 +57,16 @@ func AssertResource[R ResourceWithRD](
 
 		res, err := safe.StateGet[R](ctx, st, resource.NewMetadata(namespace, rds.Type, id, resource.VersionUndefined))
 		if err != nil {
-			if state.IsNotFoundError(err) {
-				asserter.NoError(err)
-
-				t.Logf("assertions:\n%s", &aggregator)
-
-				continue
+			if !state.IsNotFoundError(err) {
+				require.NoError(err)
 			}
 
-			require.NoError(err)
+			asserter.NoError(err)
 		}
 
-		aggregator.hadErrors = false
-
-		assertionFunc(res, asserter)
+		if !aggregator.hadErrors { // the resource was found, run the assertions
+			assertionFunc(res, asserter)
+		}
 
 		if !aggregator.hadErrors {
 			return
@@ -132,7 +128,7 @@ func AssertResources[R ResourceWithRD](
 	var (
 		doReport               bool
 		lastReportedAggregator assertionAggregator
-		lastReporedOk          int
+		lastReportedOk         int
 	)
 
 	for {
@@ -144,18 +140,18 @@ func AssertResources[R ResourceWithRD](
 		for _, id := range ids {
 			res, err := safe.StateGet[R](ctx, st, resource.NewMetadata(namespace, rds.Type, id, resource.VersionUndefined))
 			if err != nil {
-				if state.IsNotFoundError(err) {
-					asserter.NoError(err)
-
-					continue
+				if !state.IsNotFoundError(err) {
+					require.NoError(err)
 				}
 
-				require.NoError(err)
+				asserter.NoError(err)
+			} else {
+				aggregator.hadErrors = false
 			}
 
-			aggregator.hadErrors = false
-
-			assertionFunc(res, asserter)
+			if !aggregator.hadErrors { // the resource was found, run the assertions
+				assertionFunc(res, asserter)
+			}
 
 			if !aggregator.hadErrors {
 				ok++
@@ -168,11 +164,11 @@ func AssertResources[R ResourceWithRD](
 
 		if doReport {
 			// suppress duplicate reports
-			if !lastReportedAggregator.Equal(&aggregator) || lastReporedOk != ok {
+			if !lastReportedAggregator.Equal(&aggregator) || lastReportedOk != ok {
 				t.Logf("ok: %d/%d, assertions:\n%s", ok, len(ids), &aggregator)
 			}
 
-			lastReporedOk = ok
+			lastReportedOk = ok
 			lastReportedAggregator = aggregator
 		}