Skip to content

Commit faa41f8

Browse files
annelo-msftannelo-msft
authored
[ACR] Don't require Audience to be passed in ClientOptions (#34847)
* Don't require Audience to be passed in ClientOptions * remove test checking for Audience * Bug fix * Ensure Upload is called before Download in samples
1 parent c821d22 commit faa41f8

19 files changed

+47
-186
lines changed

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/README.md‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,7 @@ Iterate through the collection of repositories in the registry.
108108
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
109109

110110
// Create a new ContainerRegistryClient
111-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
112-
new ContainerRegistryClientOptions()
113-
{
114-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
115-
});
111+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
116112

117113
// Get the collection of repository names from the registry
118114
Pageable<string> repositories = client.GetRepositoryNames();
@@ -129,10 +125,7 @@ foreach (string repository in repositories)
129125
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
130126

131127
// Create a new ContainerRegistryClient for anonymous access
132-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new ContainerRegistryClientOptions()
133-
{
134-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
135-
});
128+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint);
136129

137130
// Obtain a RegistryArtifact object to get access to image operations
138131
RegistryArtifact image = client.GetArtifact("library/hello-world", "latest");
@@ -155,11 +148,7 @@ foreach (ArtifactTagProperties tag in tags)
155148
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
156149

157150
// Create a new ContainerRegistryClient and RegistryArtifact to access image operations
158-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
159-
new ContainerRegistryClientOptions()
160-
{
161-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
162-
});
151+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
163152
RegistryArtifact image = client.GetArtifact("library/hello-world", "latest");
164153

165154
// Set permissions on the v1 image's "latest" tag
@@ -177,11 +166,7 @@ image.UpdateTagProperties("latest", new ArtifactTagProperties()
177166
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
178167

179168
// Create a new ContainerRegistryClient
180-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
181-
new ContainerRegistryClientOptions()
182-
{
183-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
184-
});
169+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
185170

186171
// Iterate through repositories
187172
Pageable<string> repositoryNames = client.GetRepositoryNames();
@@ -218,11 +203,7 @@ The asynchronous APIs are identical to their synchronous counterparts, but metho
218203
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
219204

220205
// Create a new ContainerRegistryClient
221-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
222-
new ContainerRegistryClientOptions()
223-
{
224-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
225-
});
206+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
226207

227208
// Get the collection of repository names from the registry
228209
AsyncPageable<string> repositories = client.GetRepositoryNamesAsync();
@@ -239,10 +220,7 @@ await foreach (string repository in repositories)
239220
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
240221

241222
// Create a new ContainerRegistryClient for anonymous access
242-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new ContainerRegistryClientOptions()
243-
{
244-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
245-
});
223+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint);
246224

247225
// Obtain a RegistryArtifact object to get access to image operations
248226
RegistryArtifact image = client.GetArtifact("library/hello-world", "latest");
@@ -265,10 +243,7 @@ await foreach (ArtifactTagProperties tag in tags)
265243
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
266244

267245
// Create a new ContainerRegistryClient and RegistryArtifact to access image operations
268-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
269-
new ContainerRegistryClientOptions() {
270-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
271-
});
246+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
272247
RegistryArtifact image = client.GetArtifact("library/hello-world", "v1");
273248

274249
// Set permissions on the image's "latest" tag
@@ -286,11 +261,7 @@ await image.UpdateTagPropertiesAsync("latest", new ArtifactTagProperties()
286261
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
287262

288263
// Create a new ContainerRegistryClient
289-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
290-
new ContainerRegistryClientOptions()
291-
{
292-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
293-
});
264+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
294265

295266
// Iterate through repositories
296267
AsyncPageable<string> repositoryNames = client.GetRepositoryNamesAsync();

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/TROUBLESHOOTING.md‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
2424

2525
// Create a ContainerRepository class for an invalid repository
2626
string fakeRepositoryName = "doesnotexist";
27-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
28-
new ContainerRegistryClientOptions()
29-
{
30-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
31-
});
27+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
3228
ContainerRepository repository = client.GetRepository(fakeRepositoryName);
3329

3430
try
@@ -48,11 +44,7 @@ Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
4844

4945
// Create a ContainerRepository class for an invalid repository
5046
string fakeRepositoryName = "doesnotexist";
51-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
52-
new ContainerRegistryClientOptions()
53-
{
54-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
55-
});
47+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
5648
ContainerRepository repository = client.GetRepository(fakeRepositoryName);
5749

5850
try

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample01a_HelloWorld.md‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ Create a `ContainerRegistryClient` and send a request.
1717
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1818

1919
// Create a new ContainerRegistryClient
20-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
21-
new ContainerRegistryClientOptions()
22-
{
23-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
24-
});
20+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
2521

2622
// Get the collection of repository names from the registry
2723
Pageable<string> repositories = client.GetRepositoryNames();
@@ -40,11 +36,7 @@ Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
4036

4137
// Create a ContainerRepository class for an invalid repository
4238
string fakeRepositoryName = "doesnotexist";
43-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
44-
new ContainerRegistryClientOptions()
45-
{
46-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
47-
});
39+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
4840
ContainerRepository repository = client.GetRepository(fakeRepositoryName);
4941

5042
try

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample01b_HelloWorldAsync.md‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ Create a `ContainerRegistryClient` and send a request.
1717
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1818

1919
// Create a new ContainerRegistryClient
20-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
21-
new ContainerRegistryClientOptions()
22-
{
23-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
24-
});
20+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
2521

2622
// Get the collection of repository names from the registry
2723
AsyncPageable<string> repositories = client.GetRepositoryNamesAsync();
@@ -40,11 +36,7 @@ Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
4036

4137
// Create a ContainerRepository class for an invalid repository
4238
string fakeRepositoryName = "doesnotexist";
43-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
44-
new ContainerRegistryClientOptions()
45-
{
46-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
47-
});
39+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
4840
ContainerRepository repository = client.GetRepository(fakeRepositoryName);
4941

5042
try

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample02a_DeleteImages.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ A common use case for Azure Container Registries is to scan the repositories in
77
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
88

99
// Create a new ContainerRegistryClient
10-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
11-
new ContainerRegistryClientOptions()
12-
{
13-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
14-
});
10+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
1511

1612
// Iterate through repositories
1713
Pageable<string> repositoryNames = client.GetRepositoryNames();

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample02b_DeleteImagesAsync.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ Please note:
1313
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1414

1515
// Create a new ContainerRegistryClient
16-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
17-
new ContainerRegistryClientOptions()
18-
{
19-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
20-
});
16+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
2117

2218
// Iterate through repositories
2319
AsyncPageable<string> repositoryNames = client.GetRepositoryNamesAsync();

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample03a_SetImageProperties.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ The following sample assumes the registry `myacr.azurecr.io` has a repository `h
99
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1010

1111
// Create a new ContainerRegistryClient and RegistryArtifact to access image operations
12-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
13-
new ContainerRegistryClientOptions()
14-
{
15-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
16-
});
12+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
1713
RegistryArtifact image = client.GetArtifact("library/hello-world", "latest");
1814

1915
// Set permissions on the v1 image's "latest" tag

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample03b_SetImagePropertiesAsync.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ The following sample assumes the registry `myacr.azurecr.io` has a repository `h
99
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1010

1111
// Create a new ContainerRegistryClient and RegistryArtifact to access image operations
12-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(),
13-
new ContainerRegistryClientOptions() {
14-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
15-
});
12+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
1613
RegistryArtifact image = client.GetArtifact("library/hello-world", "v1");
1714

1815
// Set permissions on the image's "latest" tag

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample04a_AnonymousListTags.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ This sample shows how to list the tags for an image with anonymous access.
99
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1010

1111
// Create a new ContainerRegistryClient for anonymous access
12-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new ContainerRegistryClientOptions()
13-
{
14-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
15-
});
12+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint);
1613

1714
// Obtain a RegistryArtifact object to get access to image operations
1815
RegistryArtifact image = client.GetArtifact("library/hello-world", "latest");

‎sdk/containerregistry/Azure.Containers.ContainerRegistry/samples/Sample04b_AnonymousListTagsAsync.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ This sample shows how to list the tags for an image with anonymous access.
99
Uri endpoint = new Uri(Environment.GetEnvironmentVariable("REGISTRY_ENDPOINT"));
1010

1111
// Create a new ContainerRegistryClient for anonymous access
12-
ContainerRegistryClient client = new ContainerRegistryClient(endpoint, new ContainerRegistryClientOptions()
13-
{
14-
Audience = ContainerRegistryAudience.AzureResourceManagerPublicCloud
15-
});
12+
ContainerRegistryClient client = new ContainerRegistryClient(endpoint);
1613

1714
// Obtain a RegistryArtifact object to get access to image operations
1815
RegistryArtifact image = client.GetArtifact("library/hello-world", "latest");

0 commit comments

Comments
 (0)