Merge remote-tracking branch 'upstream/main' into add-nested-archive-cataloging

Signed-off-by: Keith Zantow <keith.zantow@anchore.com>

internal/task/archive_tasks_test.go

@@ -577,7 +577,7 @@ func Test_archiveCataloger_subPipelineFailureIsRecordedAsAnUnknown(t *testing.T)
 		reasons, ok := s.Artifacts.Unknowns[file.Coordinates{RealPath: "/outer.zip"}]
 		require.True(t, ok)
 		require.Len(t, reasons, 1)
-		assert.Contains(t, reasons[0], "panicking-cataloger: nope")
+		assert.Equal(t, "panicking-cataloger: panic: nope", reasons[0])
 	})
 }