Skip to content

Commit dab85a6

Browse files
authored
[acr] Make audience optional (Azure#25192)
Made audience property optional by providing a reasonable default as suggested by the service.
1 parent 7fd8aa8 commit dab85a6

28 files changed

+73
-166
lines changed

sdk/containerregistry/container-registry/review/container-registry.api.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export interface ArtifactTagProperties {
5959

6060
// @public
6161
export class ContainerRegistryBlobClient {
62-
constructor(endpoint: string, repositoryName: string, credential: TokenCredential, options: ContainerRegistryBlobClientOptions);
62+
constructor(endpoint: string, repositoryName: string, credential: TokenCredential, options?: ContainerRegistryBlobClientOptions);
6363
deleteBlob(digest: string, options?: DeleteBlobOptions): Promise<void>;
6464
deleteManifest(digest: string, options?: DeleteManifestOptions): Promise<void>;
6565
downloadBlob(digest: string, options?: DownloadBlobOptions): Promise<DownloadBlobResult>;
@@ -72,7 +72,7 @@ export class ContainerRegistryBlobClient {
7272

7373
// @public
7474
export interface ContainerRegistryBlobClientOptions extends CommonClientOptions {
75-
audience: string;
75+
audience?: string;
7676
serviceVersion?: "2021-07-01";
7777
}
7878

@@ -272,7 +272,7 @@ export interface OciAnnotations {
272272
}
273273

274274
// @public
275-
export interface OciBlobDescriptor {
275+
export interface OciDescriptor {
276276
annotations?: OciAnnotations;
277277
digest: string;
278278
mediaType: string;
@@ -283,8 +283,8 @@ export interface OciBlobDescriptor {
283283
// @public
284284
export interface OciImageManifest {
285285
annotations?: OciAnnotations;
286-
config: OciBlobDescriptor;
287-
layers: OciBlobDescriptor[];
286+
config: OciDescriptor;
287+
layers: OciDescriptor[];
288288
schemaVersion: number;
289289
}
290290

sdk/containerregistry/container-registry/samples-dev/anonymousListTags.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// in a public registry that belongs to someone else. In this case, the user would need to access
1212
// the registry anonymously. Anonymous access allows a user to list all the collections there, but
1313
// they wouldn't have permissions to modify or delete any of the images in the registry.
14-
import { ContainerRegistryClient, KnownContainerRegistryAudience } from "@azure/container-registry";
14+
import { ContainerRegistryClient } from "@azure/container-registry";
1515
import * as dotenv from "dotenv";
1616
dotenv.config();
1717

@@ -20,9 +20,7 @@ async function main() {
2020
const endpoint = process.env.CONTAINER_REGISTRY_ENDPOINT || "<endpoint>";
2121

2222
// Create a new ContainerRegistryClient for anonymous access
23-
const client = new ContainerRegistryClient(endpoint, {
24-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
25-
});
23+
const client = new ContainerRegistryClient(endpoint);
2624

2725
// Obtain a RegistryArtifact object to get access to image operations
2826
const image = client.getArtifact("library/hello-world", "latest");

sdk/containerregistry/container-registry/samples-dev/containerRegistryClient.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @azsdk-weight 10
77
*/
88

9-
import { ContainerRegistryClient, KnownContainerRegistryAudience } from "@azure/container-registry";
9+
import { ContainerRegistryClient } from "@azure/container-registry";
1010
import { DefaultAzureCredential } from "@azure/identity";
1111
import * as dotenv from "dotenv";
1212
dotenv.config();
@@ -15,9 +15,7 @@ async function main() {
1515
// endpoint should be in the form of "https://myregistryname.azurecr.io"
1616
// where "myregistryname" is the actual name of your registry
1717
const endpoint = process.env.CONTAINER_REGISTRY_ENDPOINT || "<endpoint>";
18-
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(), {
19-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
20-
});
18+
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
2119
await listRepositoryNames(client);
2220

2321
// Advanced: listing by pages

sdk/containerregistry/container-registry/samples-dev/deleteImages.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// A common use case for Azure Container Registries is to scan the repositories
1010
// in a registry and delete all but the most recent n images, or all images
1111
// older than a certain date.
12-
import { ContainerRegistryClient, KnownContainerRegistryAudience } from "@azure/container-registry";
12+
import { ContainerRegistryClient } from "@azure/container-registry";
1313
import { DefaultAzureCredential } from "@azure/identity";
1414
import * as dotenv from "dotenv";
1515
dotenv.config();
@@ -18,9 +18,7 @@ async function main() {
1818
// Get the service endpoint from the environment
1919
const endpoint = process.env.CONTAINER_REGISTRY_ENDPOINT || "<endpoint>";
2020
// Create a new ContainerRegistryClient
21-
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(), {
22-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
23-
});
21+
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
2422

2523
// Iterate through repositories
2624
const repositoryNames = client.listRepositoryNames();

sdk/containerregistry/container-registry/samples-dev/downloadImage.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import {
1010
ContainerRegistryBlobClient,
1111
isDownloadOciImageManifestResult,
12-
KnownContainerRegistryAudience,
1312
} from "@azure/container-registry";
1413
import { DefaultAzureCredential } from "@azure/identity";
1514
import * as dotenv from "dotenv";
@@ -29,10 +28,7 @@ async function main() {
2928
const client = new ContainerRegistryBlobClient(
3029
endpoint,
3130
repository,
32-
new DefaultAzureCredential(),
33-
{
34-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
35-
}
31+
new DefaultAzureCredential()
3632
);
3733

3834
// Download the manifest to obtain the list of files in the image based on the tag

sdk/containerregistry/container-registry/samples-dev/repositoryAndArtifact.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
ArtifactManifestProperties,
1212
ContainerRegistryClient,
1313
RegistryArtifact,
14-
KnownContainerRegistryAudience,
1514
} from "@azure/container-registry";
1615
import { DefaultAzureCredential } from "@azure/identity";
1716
import * as dotenv from "dotenv";
@@ -24,9 +23,7 @@ async function main() {
2423
const repositoryName = process.env.REPOSITORY_NAME || "<repository name>";
2524
const pageSize = 1;
2625

27-
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(), {
28-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
29-
});
26+
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
3027
const repository = client.getRepository(repositoryName);
3128
await getProperties(repository);
3229

sdk/containerregistry/container-registry/samples-dev/setImageProperties.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// This sample assumes the registry has a repository `hello-world` with image tagged `v1`.
1010

11-
import { ContainerRegistryClient, KnownContainerRegistryAudience } from "@azure/container-registry";
11+
import { ContainerRegistryClient } from "@azure/container-registry";
1212
import { DefaultAzureCredential } from "@azure/identity";
1313
import * as dotenv from "dotenv";
1414
dotenv.config();
@@ -17,9 +17,7 @@ async function main() {
1717
// Get the service endpoint from the environment
1818
const endpoint = process.env.CONTAINER_REGISTRY_ENDPOINT || "<endpoint>";
1919
// Create a new ContainerRegistryClient
20-
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential(), {
21-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
22-
});
20+
const client = new ContainerRegistryClient(endpoint, new DefaultAzureCredential());
2321
const image = client.getArtifact("library/hello-world", "v1");
2422

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

sdk/containerregistry/container-registry/samples-dev/uploadImage.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
* @azsdk-weight 3
77
*/
88

9-
import {
10-
ContainerRegistryBlobClient,
11-
KnownContainerRegistryAudience,
12-
OciImageManifest,
13-
} from "@azure/container-registry";
9+
import { ContainerRegistryBlobClient, OciImageManifest } from "@azure/container-registry";
1410
import { DefaultAzureCredential } from "@azure/identity";
1511
import * as dotenv from "dotenv";
1612
import { Readable } from "stream";
@@ -24,10 +20,7 @@ async function main() {
2420
const client = new ContainerRegistryBlobClient(
2521
endpoint,
2622
repository,
27-
new DefaultAzureCredential(),
28-
{
29-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
30-
}
23+
new DefaultAzureCredential()
3124
);
3225

3326
const config = Buffer.from("Sample config");

sdk/containerregistry/container-registry/samples-dev/uploadManifest.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
* @azsdk-weight 3
77
*/
88

9-
import {
10-
ContainerRegistryBlobClient,
11-
KnownContainerRegistryAudience,
12-
OciImageManifest,
13-
} from "@azure/container-registry";
9+
import { ContainerRegistryBlobClient, OciImageManifest } from "@azure/container-registry";
1410
import { DefaultAzureCredential } from "@azure/identity";
1511
import * as dotenv from "dotenv";
1612
import { Readable } from "stream";
@@ -24,10 +20,7 @@ async function main() {
2420
const client = new ContainerRegistryBlobClient(
2521
endpoint,
2622
repository,
27-
new DefaultAzureCredential(),
28-
{
29-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
30-
}
23+
new DefaultAzureCredential()
3124
);
3225

3326
const layer = Buffer.from("Hello, world");

sdk/containerregistry/container-registry/samples/v1-beta/javascript/anonymousListTags.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@
99
// in a public registry that belongs to someone else. In this case, the user would need to access
1010
// the registry anonymously. Anonymous access allows a user to list all the collections there, but
1111
// they wouldn't have permissions to modify or delete any of the images in the registry.
12-
const {
13-
ContainerRegistryClient,
14-
KnownContainerRegistryAudience,
15-
} = require("@azure/container-registry");
12+
const { ContainerRegistryClient } = require("@azure/container-registry");
1613
require("dotenv").config();
1714

1815
async function main() {
1916
// Get the service endpoint from the environment
2017
const endpoint = process.env.CONTAINER_REGISTRY_ENDPOINT || "<endpoint>";
2118

2219
// Create a new ContainerRegistryClient for anonymous access
23-
const client = new ContainerRegistryClient(endpoint, {
24-
audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud,
25-
});
20+
const client = new ContainerRegistryClient(endpoint);
2621

2722
// Obtain a RegistryArtifact object to get access to image operations
2823
const image = client.getArtifact("library/hello-world", "latest");

0 commit comments

Comments
 (0)