check expired and tagged at first.

ecrm.go

@@ -269,6 +269,21 @@ IMAGE:
 		displayName := string(repo) + ":" + tag
 		sums.Add(d)
 
+		// Check if the image is expired
+		pushedAt := *d.ImagePushedAt
+		if !rc.IsExpired(pushedAt) {
+			log.Printf("[info] image %s is not expired, keep it", displayName)
+			continue IMAGE
+		}
+
+		if tagged {
+			keepCount++
+			if keepCount <= rc.KeepCount {
+				log.Printf("[info] image %s is in keep_count %d <= %d, keep it", displayName, keepCount, rc.KeepCount)
+				continue IMAGE
+			}
+		}
+
 		// Check if the image is in use (digest)
 		imageURISha256 := ImageURI(fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com/%s@%s", *d.RegistryId, app.region, *d.RepositoryName, *d.ImageDigest))
 		log.Printf("[debug] checking %s", imageURISha256)
@@ -291,19 +306,6 @@ IMAGE:
 			}
 		}
 
-		pushedAt := *d.ImagePushedAt
-		if !rc.IsExpired(pushedAt) {
-			log.Printf("[info] image %s is not expired, keep it", displayName)
-			continue IMAGE
-		}
-		if tagged {
-			keepCount++
-			if keepCount <= rc.KeepCount {
-				log.Printf("[info] image %s is in keep_count %d <= %d, keep it", displayName, keepCount, rc.KeepCount)
-				continue IMAGE
-			}
-		}
-
 		// Don't match any conditions, so expired
 		log.Printf("[notice] image %s is expired %s %s", displayName, *d.ImageDigest, pushedAt.Format(time.RFC3339))
 		expiredIds = append(expiredIds, ecrTypes.ImageIdentifier{ImageDigest: d.ImageDigest})