Remove ImportImage dependency from ACR tests (Azure#33039)

* rearranging for clarity

* Updates to Registry and Repository live tests

* fix cleanup

* Update tests to use new blobs instead of image import

* begin to update samples

* revert samples changes and update async methods with Async suffix

* re-record one of the failing tests

* Don't do clean-up if in playback, and don't record it

Author: annelo-msft

sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/ContainerRegistryBlobClientExtensions.cs

@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Azure.Containers.ContainerRegistry.Specialized;
+
+namespace Azure.Containers.ContainerRegistry.Tests
+{
+    /// <summary>
+    /// Extensions to simplify test authoring for ACR tests.
+    /// </summary>
+    internal static class ContainerRegistryBlobClientExtensions
+    {
+        private static Random _random = new Random();
+
+        public static async Task UploadTestImageAsync(this ContainerRegistryBlobClient client, string tag = default)
+        {
+            OciManifest manifest = new()
+            {
+                SchemaVersion = 2
+            };
+
+            // Upload a config file
+            using Stream config = BinaryData.FromString("Sample config").ToStream();
+            var uploadConfigResult = await client.UploadBlobAsync(config);
+
+            manifest.Config = new OciBlobDescriptor()
+            {
+                Digest = uploadConfigResult.Value.Digest,
+                Size = uploadConfigResult.Value.Size,
+                MediaType = "application/vnd.oci.image.config.v1+json"
+            };
+
+            // Upload a layer file
+            using Stream layer = BinaryData.FromString($"Sample layer {_random.Next()}").ToStream();
+            var uploadLayerResult = await client.UploadBlobAsync(layer);
+
+            manifest.Layers.Add(new OciBlobDescriptor()
+            {
+                Digest = uploadLayerResult.Value.Digest,
+                Size = uploadLayerResult.Value.Size,
+                MediaType = "application/vnd.oci.image.layer.v1.tar"
+            });
+
+            // Finally, upload the manifest file
+            var options = tag != null ? new UploadManifestOptions(tag) : null;
+            await client.UploadManifestAsync(manifest, options);
+        }
+
+        public static async Task AddTagAsync(this ContainerRegistryBlobClient client, string reference, string tag)
+        {
+            // Get the image manifest
+            var manifestResult = await client.DownloadManifestAsync(new DownloadManifestOptions(reference));
+            var stream = manifestResult.Value.ManifestStream;
+            stream.Seek(0, SeekOrigin.Begin);
+
+            // Upload the manifest with the new tag
+            await client.UploadManifestAsync(stream, new UploadManifestOptions(tag));
+        }
+    }
+}

sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/ContainerRegistryClientLiveTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System.Collections.Generic;
+using System.Linq;
 using Azure.Core.TestFramework;
 using NUnit.Framework;
 using Task = System.Threading.Tasks.Task;
@@ -97,48 +97,35 @@ public async Task CanStartPagingMidCollection(bool anonymous)
             Assert.IsTrue(pageCount >= minExpectedPages);
         }
 
-        [RecordedTest, NonParallelizable]
+        [RecordedTest]
         public async Task CanDeleteRepository()
         {
             // Arrange
-            string registry = TestEnvironment.Registry;
-            string repository = $"library/hello-world";
-            List<string> tags = new List<string>()
-            {
-                "latest",
-                "v1",
-                "v2",
-                "v3",
-                "v4",
-            };
             var client = CreateClient();
+            var repositoryId = Recording.Random.NewGuid().ToString();
 
             try
             {
                 if (Mode != RecordedTestMode.Playback)
                 {
-                    await ImportImageAsync(registry, repository, tags);
+                    await CreateRepositoryAsync(repositoryId);
                 }
 
-                // Act
-                await client.DeleteRepositoryAsync(repository);
-
                 var repositories = client.GetRepositoryNamesAsync();
+                Assert.IsTrue(await repositories.ContainsAsync(repositoryId), $"Test set-up failed: Repository {repositoryId} was not created.");
 
-                await foreach (var item in repositories)
-                {
-                    if (item.Contains(repository))
-                    {
-                        Assert.Fail($"Repository {repository} was not deleted.");
-                    }
-                }
+                // Act
+                await client.DeleteRepositoryAsync(repositoryId);
+
+                // Assert
+                repositories = client.GetRepositoryNamesAsync();
+                Assert.IsFalse(await repositories.ContainsAsync(repositoryId), $"Repository {repositoryId} was not deleted.");
             }
             finally
             {
-                // Clean up - put the repository with tags back.
                 if (Mode != RecordedTestMode.Playback)
                 {
-                    await ImportImageAsync(registry, repository, tags);
+                    await DeleteRepositoryAsync(repositoryId);
                 }
             }
         }