Add ACR delete tag methods #19680
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,147 +2,185 @@ | |
| // Licensed under the MIT License. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
|
|
||
| using Azure.Core.TestFramework; | ||
|
|
||
| using Microsoft.Azure.Management.ContainerRegistry; | ||
| using Microsoft.Azure.Management.ContainerRegistry.Models; | ||
| using Microsoft.Azure.Management.ResourceManager.Fluent; | ||
| using Microsoft.Azure.Management.ResourceManager.Fluent.Authentication; | ||
| using NUnit.Framework; | ||
| using Task = System.Threading.Tasks.Task; | ||
annelo-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| namespace Azure.Containers.ContainerRegistry.Tests | ||
| { | ||
| public class ContainerRepositoryClientLiveTests : RecordedTestBase<ContainerRegistryTestEnvironment> | ||
| { | ||
| private readonly string _repositoryName = "library/hello-world"; | ||
|
|
||
| public ContainerRepositoryClientLiveTests(bool isAsync) : base(isAsync) | ||
| { | ||
| } | ||
|
|
||
| protected ContainerRepositoryClient CreateClient() | ||
| { | ||
| return InstrumentClient(new ContainerRepositoryClient( | ||
| new Uri(TestEnvironment.Endpoint), | ||
| _repositoryName, | ||
| TestEnvironment.UserName, | ||
| TestEnvironment.Password, | ||
| InstrumentClientOptions(new ContainerRegistryClientOptions()) | ||
| )); | ||
| } | ||
|
|
||
| public async Task ImportImage(string tag) | ||
| { | ||
| if (TestEnvironment.IsTestModeLive) | ||
annelo-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| var credential = new AzureCredentials( | ||
| new ServicePrincipalLoginInformation | ||
| { | ||
| ClientId = TestEnvironment.ClientId, | ||
| ClientSecret = TestEnvironment.ClientSecret, | ||
| }, | ||
| TestEnvironment.TenantId, | ||
| AzureEnvironment.AzureGlobalCloud); | ||
|
|
||
| var _registryClient = new ContainerRegistryManagementClient(credential.WithDefaultSubscription(TestEnvironment.SubscriptionId)); | ||
| _registryClient.SubscriptionId = TestEnvironment.SubscriptionId; | ||
|
|
||
| var importSource = new ImportSource | ||
| { | ||
| SourceImage = "library/hello-world", | ||
| RegistryUri = "registry.hub.docker.com" | ||
| }; | ||
|
|
||
| await _registryClient.Registries.ImportImageAsync( | ||
| resourceGroupName: TestEnvironment.ResourceGroup, | ||
| registryName: TestEnvironment.Registry, | ||
| parameters: | ||
| new ImportImageParameters | ||
| { | ||
| Mode = ImportMode.Force, | ||
| Source = importSource, | ||
| TargetTags = new List<string>() | ||
| { | ||
| $"library/hello-world:{tag}" | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| [RecordedTest] | ||
| public async Task CanGetRepositoryProperties() | ||
| { | ||
| // Arrange | ||
| ContainerRepositoryClient client = CreateClient(); | ||
annelo-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // Act | ||
| RepositoryProperties properties = await client.GetPropertiesAsync(); | ||
|
|
||
| // Assert | ||
| Assert.AreEqual(_repositoryName, properties.Name); | ||
| Assert.AreEqual(new Uri(TestEnvironment.Endpoint).Host, properties.Registry); | ||
| } | ||
|
|
||
| [RecordedTest, NonParallelizable] | ||
| public async Task CanSetRepositoryProperties() | ||
annelo-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| // Arrange | ||
| ContainerRepositoryClient client = CreateClient(); | ||
| RepositoryProperties repositoryProperties = await client.GetPropertiesAsync(); | ||
| ContentProperties originalContentProperties = repositoryProperties.WriteableProperties; | ||
|
|
||
| // Act | ||
| await client.SetPropertiesAsync( | ||
| new ContentProperties() | ||
| { | ||
| CanList = false, | ||
| CanRead = false, | ||
| CanWrite = false, | ||
| CanDelete = false, | ||
| }); | ||
|
|
||
| // Assert | ||
| RepositoryProperties properties = await client.GetPropertiesAsync(); | ||
|
|
||
| Assert.IsFalse(properties.WriteableProperties.CanList); | ||
| Assert.IsFalse(properties.WriteableProperties.CanRead); | ||
| Assert.IsFalse(properties.WriteableProperties.CanWrite); | ||
| Assert.IsFalse(properties.WriteableProperties.CanDelete); | ||
|
|
||
| // Cleanup | ||
| await client.SetPropertiesAsync(originalContentProperties); | ||
| } | ||
|
|
||
| [RecordedTest] | ||
| public async Task CanGetTagProperties() | ||
| { | ||
| // Arrange | ||
| ContainerRepositoryClient client = CreateClient(); | ||
| string tag = "latest"; | ||
|
|
||
| // Act | ||
| TagProperties properties = await client.GetTagPropertiesAsync(tag); | ||
|
|
||
| // Assert | ||
| Assert.AreEqual(tag, properties.Name); | ||
| Assert.AreEqual(_repositoryName, properties.Repository); | ||
| Assert.AreEqual(new Uri(TestEnvironment.Endpoint).Host, properties.Registry); | ||
| } | ||
|
|
||
| [RecordedTest, NonParallelizable] | ||
| public async Task CanSetTagProperties() | ||
| { | ||
| // Arrange | ||
| ContainerRepositoryClient client = CreateClient(); | ||
| string tag = "latest"; | ||
| TagProperties tagProperties = await client.GetTagPropertiesAsync(tag); | ||
| ContentProperties originalContentProperties = tagProperties.ModifiableProperties; | ||
|
|
||
| // Act | ||
| await client.SetTagPropertiesAsync( | ||
| tag, | ||
| new ContentProperties() | ||
| { | ||
| CanList = false, | ||
| CanRead = false, | ||
| CanWrite = false, | ||
| CanDelete = false | ||
| }); | ||
|
|
||
| // Assert | ||
| TagProperties properties = await client.GetTagPropertiesAsync(tag); | ||
|
|
||
| Assert.IsFalse(properties.ModifiableProperties.CanList); | ||
| Assert.IsFalse(properties.ModifiableProperties.CanRead); | ||
| Assert.IsFalse(properties.ModifiableProperties.CanWrite); | ||
| Assert.IsFalse(properties.ModifiableProperties.CanDelete); | ||
|
|
||
| // Cleanup | ||
| await client.SetTagPropertiesAsync(tag, originalContentProperties); | ||
| } | ||
|
|
||
| [RecordedTest, NonParallelizable] | ||
| public async Task CanDeleteTag() | ||
| { | ||
| // Arrange | ||
| ContainerRepositoryClient client = CreateClient(); | ||
| string tag = "test-delete"; | ||
| await ImportImage(tag); | ||
|
|
||
| // Act | ||
| await client.DeleteTagAsync(tag); | ||
|
|
||
| // Assert | ||
|
|
||
| // The delete takes some time, so if we call GetTagProperties() without a delay, we get a 200 response. | ||
annelo-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| await Task.Delay(5000); | ||
|
There was a problem hiding this comment. In Search and Key Vault, we have our own protected async ValueTask DelayAsync(TimeSpan? duration = null)
{
duration ??= TimeSpan.FromSeconds(5);
if (TestMode == RecordingTestMode.Playback)
{
return ValueTask.Completed;
}
else
{
await Task.Delay(duration);
}
}This way, you don't waste time during playback. There was a problem hiding this comment. Very cool, Heath, thanks for the pointer! There was a problem hiding this comment. We should probably add this to https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/core/Azure.Core.TestFramework/src/TestRecording.cs There was a problem hiding this comment. If so, take a look at Search or Key Vault's. It's a bit more robust (involved) than this sample, but this shows the gist of it. There was a problem hiding this comment. ...effectively, you can optionally set a delay, or for retries (something else maybe to add, but separate) a polling interval with default. Both should probably take a
annelo-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| Assert.ThrowsAsync<RequestFailedException>(async () => { await client.GetTagPropertiesAsync(tag); }); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm does the "azp" command not work for container registry, "/azp run net - containerregistry - ci"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need a slash '/azp run net - core - ci'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated