resolve comments

Signed-off-by: Patrick Pan <panjiaxuan@microsoft.com>

src/OrasProject.Oras/Oci/Descriptor.cs

@@ -72,7 +72,7 @@ public static Descriptor Create(Span<byte> data, string mediaType)
 
     internal BasicDescriptor BasicDescriptor => new BasicDescriptor(MediaType, Digest, Size);
 
-    internal static bool IsEmptyOrNull(Descriptor? descriptor)
+    internal static bool IsEmptyOrInvalid(Descriptor? descriptor)
     {
         return descriptor == null || descriptor.Size == 0 || string.IsNullOrEmpty(descriptor.Digest) || string.IsNullOrEmpty(descriptor.MediaType);
     }

src/OrasProject.Oras/Registry/Remote/HttpResponseMessageExtensions.cs

@@ -107,7 +107,7 @@ public static void VerifyContentDigest(this HttpResponseMessage response, string
     /// </summary>
     /// <param name="response"></param>
     /// <param name="repository"></param>
-    public static void CheckOCISubjectHeader(this HttpResponseMessage response, Repository repository)
+    internal static void CheckOCISubjectHeader(this HttpResponseMessage response, Repository repository)
     {
         if (response.Headers.TryGetValues("OCI-Subject", out var values))
         {

src/OrasProject.Oras/Registry/Remote/ManifestStore.cs

@@ -28,7 +28,7 @@
 
 public class ManifestStore(Repository repository) : IManifestStore
 {
     public Repository Repository { get; init; } = repository;
 
     /// <summary>
     /// Fetches the content identified by the descriptor.
@@ -184,7 +184,7 @@
                     return;
                 }
 
-                var contentBytes = await content.ReadAllAsync(expected, cancellationToken);
+                var contentBytes = await content.ReadAllAsync(expected, cancellationToken).ConfigureAwait(false);
                 using (var contentDuplicate = new MemoryStream(contentBytes))
                 {
                     // Push the manifest when ReferrerState is Unknown or NotSupported
@@ -202,11 +202,11 @@
                     // 1. Index the referrers list using referrers tag schema when manifest contains a subject field
                     //    And the ReferrerState is not supported
                     // 2. Or do nothing when the manifest does not contain a subject field when ReferrerState is not supported/unknown
-                    await ProcessReferrersAndPushIndex(expected, contentDuplicate, cancellationToken);
+                    await ProcessReferrersAndPushIndex(expected, contentDuplicate, cancellationToken).ConfigureAwait(false);
                 }
                 break;
             default:
-                await DoPushAsync(expected, content, reference, cancellationToken);
+                await DoPushAsync(expected, content, reference, cancellationToken).ConfigureAwait(false);
                 break;
         }
     }
@@ -241,11 +241,11 @@
                 desc.Annotations = imageManifest.Annotations;
                 break;
             default:
                 return;
         }
 
         Repository.SetReferrersState(Referrers.ReferrersState.ReferrersNotSupported);
-        await UpdateReferrersIndex(subject, new Referrers.ReferrerChange(desc, Referrers.ReferrerOperation.ReferrerAdd), cancellationToken);
+        await UpdateReferrersIndex(subject, new Referrers.ReferrerChange(desc, Referrers.ReferrerOperation.ReferrerAdd), cancellationToken).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -265,7 +265,7 @@
     {
         // 1. pull the original referrers index list using referrers tag schema
         var referrersTag = Referrers.BuildReferrersTag(subject);
-        var (oldDesc, oldReferrers) = await PullReferrersIndexList(referrersTag, cancellationToken);
+        var (oldDesc, oldReferrers) = await PullReferrersIndexList(referrersTag, cancellationToken).ConfigureAwait(false);
 
         // 2. apply the referrer change to referrers list
         var (updatedReferrers, updateRequired) =
@@ -287,7 +287,7 @@
             }
         }
 
-        if (repository.Options.SkipReferrersGC || Descriptor.IsEmptyOrNull(oldDesc))
+        if (repository.Options.SkipReferrersGC || Descriptor.IsEmptyOrInvalid(oldDesc))
         {
             // Skip the delete process if SkipReferrersGC is set to true or the old Descriptor is empty or null
             return;
@@ -310,11 +310,11 @@
     {
         try
         {
-            var (desc, content) = await FetchAsync(referrersTag, cancellationToken);
+            var (desc, content) = await FetchAsync(referrersTag, cancellationToken).ConfigureAwait(false);
             var index = JsonSerializer.Deserialize<Index>(content);
             if (index == null)
             {
                 throw new JsonException("null index manifests list");
             }
             return (desc, index.Manifests);
         }

src/OrasProject.Oras/Registry/Remote/Referrers.cs

@@ -52,6 +52,11 @@
     /// <returns>The updated referrers list, updateRequired</returns>
     internal static (IList<Descriptor>, bool) ApplyReferrerChanges(IList<Descriptor> oldReferrers, ReferrerChange referrerChange)
     {
+        if (Descriptor.IsEmptyOrInvalid(referrerChange.Referrer))
+        {
+            return (oldReferrers, false);
+        }
+
         // updatedReferrers is a list to store the updated referrers
         var updatedReferrers = new List<Descriptor>();
         // updatedReferrersSet is a HashSet to store unique referrers
@@ -60,7 +65,7 @@
         var updateRequired = false;
         foreach (var oldReferrer in oldReferrers)
         {
-            if (Descriptor.IsEmptyOrNull(oldReferrer))
+            if (Descriptor.IsEmptyOrInvalid(oldReferrer))
             {
                 // Skip any empty or null referrers
                 updateRequired = true;
@@ -84,19 +89,18 @@
             updatedReferrersSet.Add(basicDesc);
         }
 
-        if (!Descriptor.IsEmptyOrNull(referrerChange.Referrer))
+
+        var basicReferrerDesc = referrerChange.Referrer.BasicDescriptor;
+        if (referrerChange.ReferrerOperation == ReferrerOperation.ReferrerAdd)
         {
-            var basicDesc = referrerChange.Referrer.BasicDescriptor;
-            if (referrerChange.ReferrerOperation == ReferrerOperation.ReferrerAdd)
+            if (!updatedReferrersSet.Contains(basicReferrerDesc))
             {
-                if (!updatedReferrersSet.Contains(basicDesc))
-                {
-                    // Add the new referrer only when it has not already existed in the updatedReferrersSet
-                    updatedReferrers.Add(referrerChange.Referrer);
-                    updatedReferrersSet.Add(basicDesc);
-                }
+                // Add the new referrer only when it has not already existed in the updatedReferrersSet
+                updatedReferrers.Add(referrerChange.Referrer);
+                updatedReferrersSet.Add(basicReferrerDesc);
             }
         }
+
 
         // Skip unnecessary update
         if (!updateRequired && updatedReferrersSet.Count == oldReferrers.Count)
@@ -106,9 +110,9 @@
             {
                 var basicDesc = oldReferrer.BasicDescriptor;
                 if (!updatedReferrersSet.Contains(basicDesc))
                 {
                     updateRequired = true;
                     break;
                 }
             }
 
@@ -116,7 +120,7 @@
             {
                 return (updatedReferrers, false);
             }
         }
         return (updatedReferrers, true);
     }
 }

tests/OrasProject.Oras.Tests/Remote/ManifestStoreTest.cs

@@ -100,7 +100,7 @@
         var cancellationToken = new CancellationToken();
         var store = new ManifestStore(repo);
         var (receivedDesc, receivedManifests) = await store.PullReferrersIndexList("test", cancellationToken);
-        Assert.True(Descriptor.IsEmptyOrNull(receivedDesc));
+        Assert.True(Descriptor.IsEmptyOrInvalid(receivedDesc));
         Assert.Empty(receivedManifests);
     }
 
@@ -306,7 +306,7 @@
 
         byte[]? receivedManifestContent = null;
         byte[]? receivedIndexContent = null;
         var referrersTag = Referrers.BuildReferrersTag(firstExpectedManifest.Subject);
         var oldIndexDeleted = false;
         var firstIndexDeleted = false;
         var mockHttpRequestHandler = async (HttpRequestMessage req, CancellationToken cancellationToken) =>
@@ -504,7 +504,7 @@
         };
 
         byte[]? receivedManifestContent = null;
         var referrersTag = Referrers.BuildReferrersTag(expectedManifest.Subject);
 
         var mockHttpRequestHandler = async (HttpRequestMessage req, CancellationToken cancellationToken) =>
         {