Modifications to support manifest upload/download

sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Blob/ArtifactBlobDescriptor.cs

@@ -24,7 +24,7 @@ public partial class ArtifactBlobDescriptor
         internal IList<Uri> Urls { get; }
 
         /// <summary> Additional information provided through arbitrary metadata. </summary>
-        internal Annotations Annotations { get; }
+        //internal Annotations Annotations { get; }
 
         internal static string ComputeDigest(Stream stream)
         {

sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Blob/ContainerRegistryBlobClient.cs

@@ -78,33 +78,101 @@ protected ContainerRegistryBlobClient()
 
         #region File Upload/Download
 
+        ///// <summary>
+        ///// </summary>
+        ///// <param name="stream"></param>
+        ///// <param name="options"></param>
+        ///// <param name="cancellationToken"></param>
+        ///// <returns></returns>
+        //public virtual Response<UploadManifestResult> UploadManifest(Stream stream, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
+        //{
+        //    throw new NotImplementedException();
+        //}
+
+        ///// <summary>
+        ///// </summary>
+        ///// <param name="stream"></param>
+        ///// <param name="options"></param>
+        ///// <param name="cancellationToken"></param>
+        ///// <returns></returns>
+        //public async virtual Task<Response<UploadManifestResult>> UploadManifestAsync(Stream stream, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
+        //{
+        //    options ??= new UploadManifestOptions();
+
+        //    using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ContainerRegistryBlobClient)}.{nameof(UploadManifest)}");
+        //    scope.Start();
+        //    try
+        //    {
+        //        string tagOrDigest = options.Tag ?? ArtifactBlobDescriptor.ComputeDigest(stream);
+        //        ResponseWithHeaders<ContainerRegistryCreateManifestHeaders> response = await _restClient.CreateManifestAsync(_repositoryName, tagOrDigest, stream, ManifestMediaType.OciManifest.ToString(), cancellationToken).ConfigureAwait(false);
+        //        return Response.FromValue(new UploadManifestResult(response.Headers.DockerContentDigest), response.GetRawResponse());
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        scope.Failed(e);
+        //        throw;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// </summary>
+        ///// <param name="manifest"></param>
+        ///// <param name="options"></param>
+        ///// <param name="cancellationToken"></param>
+        ///// <returns></returns>
+        //public virtual Response<UploadManifestResult> UploadManifest(OciManifest manifest, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
+        //{
+        //    throw new NotImplementedException();
+        //}
+
+        ///// <summary>
+        ///// </summary>
+        ///// <param name="manifest"></param>
+        ///// <param name="options"></param>
+        ///// <param name="cancellationToken"></param>
+        ///// <returns></returns>
+        //public async virtual Task<Response<UploadManifestResult>> UploadManifestAsync(OciManifest manifest, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
+        //{
+        //    Argument.AssertNotNull(manifest, "manifest");
+
+        //    MemoryStream stream = new MemoryStream();
+        //    Utf8JsonWriter jsonWriter = new Utf8JsonWriter(stream);
+        //    ((IUtf8JsonSerializable)manifest).Write(jsonWriter);
+        //    return await UploadManifestAsync(stream, options, cancellationToken).ConfigureAwait(false);
+        //}
+
         /// <summary>
         /// </summary>
-        /// <param name="stream"></param>
+        /// <param name="manifest"></param>
         /// <param name="options"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public virtual Response<UploadManifestResult> UploadManifest(Stream stream, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
+        public virtual Response<UploadManifestResult> UploadManifest(OciManifest manifest, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
         {
             throw new NotImplementedException();
         }
 
         /// <summary>
         /// </summary>
-        /// <param name="stream"></param>
+        /// <param name="manifest"></param>
         /// <param name="options"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async virtual Task<Response<UploadManifestResult>> UploadManifestAsync(Stream stream, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
+        public async virtual Task<Response<UploadManifestResult>> UploadManifestAsync(OciManifest manifest, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
         {
             options ??= new UploadManifestOptions();
 
             using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ContainerRegistryBlobClient)}.{nameof(UploadManifest)}");
             scope.Start();
             try
             {
+                MemoryStream stream = new MemoryStream();
+                Utf8JsonWriter jsonWriter = new Utf8JsonWriter(stream);
+                ((IUtf8JsonSerializable)manifest).Write(jsonWriter);
+                jsonWriter.Flush();
+
                 string tagOrDigest = options.Tag ?? ArtifactBlobDescriptor.ComputeDigest(stream);
-                ResponseWithHeaders<ContainerRegistryCreateManifestHeaders> response = await _restClient.CreateManifestAsync(_repositoryName, tagOrDigest, stream, ManifestMediaType.OciManifest.ToString(), cancellationToken).ConfigureAwait(false);
+                ResponseWithHeaders<ContainerRegistryCreateManifestHeaders> response = await _restClient.CreateManifestAsync(_repositoryName, tagOrDigest, manifest, ManifestMediaType.OciManifest.ToString(), cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(new UploadManifestResult(response.Headers.DockerContentDigest), response.GetRawResponse());
             }
             catch (Exception e)
@@ -114,33 +182,6 @@ public async virtual Task<Response<UploadManifestResult>> UploadManifestAsync(St
             }
         }
 
-        /// <summary>
-        /// </summary>
-        /// <param name="manifest"></param>
-        /// <param name="options"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public virtual Response<UploadManifestResult> UploadManifest(OciManifest manifest, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="manifest"></param>
-        /// <param name="options"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        public async virtual Task<Response<UploadManifestResult>> UploadManifestAsync(OciManifest manifest, UploadManifestOptions options = default, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(manifest, "manifest");
-
-            MemoryStream stream = new MemoryStream();
-            Utf8JsonWriter jsonWriter = new Utf8JsonWriter(stream);
-            ((IUtf8JsonSerializable)manifest).Write(jsonWriter);
-            return await UploadManifestAsync(stream, options, cancellationToken).ConfigureAwait(false);
-        }
-
         /// <summary>
         /// </summary>
         /// <param name="stream"></param>

sdk/containerregistry/Azure.Containers.ContainerRegistry/src/Blob/Manifest.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Azure.Core;
+
+namespace Azure.Containers.ContainerRegistry.Specialized
+{
+    /// <summary>
+    /// </summary>
+    [CodeGenModel("Manifest")]
+#pragma warning disable AZC0012 // Avoid single word type names
+    public partial class Manifest
+#pragma warning restore AZC0012 // Avoid single word type names
+    {
+    }
+}