[ContainerRegistry] Update delete image sample (#16002)

to delete tags before delete the image as this is the recommended best practice for the service.
Azure · Jun 25, 2021 · ca61eb9 · ca61eb9
1 parent 9440254
commit ca61eb9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/sdk/containerregistry/container-registry/README.md b/sdk/containerregistry/container-registry/README.md
@@ -199,12 +199,14 @@ async function main() {
     // Delete images older than the first three.
     for await (const manifest of imageManifests) {
       if (imageCount++ > imagesToKeep) {
+        const image = repository.getArtifact(manifest.digest);
         console.log(`Deleting image with digest ${manifest.digest}`);
-        console.log(`  This image has the following tags:`);
+        console.log(`  Deleting the following tags from the image:`);
         for (const tagName of manifest.tags) {
           console.log(`    ${manifest.repositoryName}:${tagName}`);
+          image.deleteTag(tagName);
         }
-        await repository.getArtifact(manifest.digest).delete();
+        await image.delete();
       }
     }
   }

diff --git a/sdk/containerregistry/container-registry/samples-dev/deleteImages.ts b/sdk/containerregistry/container-registry/samples-dev/deleteImages.ts
@@ -33,12 +33,14 @@ async function main() {
     // Delete images older than the first three.
     for await (const manifest of imageManifests) {
       if (imageCount++ > imagesToKeep) {
+        const image = repository.getArtifact(manifest.digest);
         console.log(`Deleting image with digest ${manifest.digest}`);
-        console.log(`  This image has the following tags:`);
+        console.log(`  Deleting the following tags from the image:`);
         for (const tagName of manifest.tags) {
           console.log(`    ${manifest.repositoryName}:${tagName}`);
+          image.deleteTag(tagName);
         }
-        await repository.getArtifact(manifest.digest).delete();
+        await image.delete();
       }
     }
   }

diff --git a/sdk/containerregistry/container-registry/samples/v1/javascript/deleteImages.js b/sdk/containerregistry/container-registry/samples/v1/javascript/deleteImages.js
@@ -32,12 +32,14 @@ async function main() {
     // Delete images older than the first three.
     for await (const manifest of imageManifests) {
       if (imageCount++ > imagesToKeep) {
+        const image = repository.getArtifact(manifest.digest);
         console.log(`Deleting image with digest ${manifest.digest}`);
-        console.log(`  This image has the following tags:`);
+        console.log(`  Deleting the following tags from the image:`);
         for (const tagName of manifest.tags) {
           console.log(`    ${manifest.repositoryName}:${tagName}`);
+          image.deleteTag(tagName);
         }
-        await repository.getArtifact(manifest.digest).delete();
+        await image.delete();
       }
     }
   }

diff --git a/sdk/containerregistry/container-registry/samples/v1/typescript/src/deleteImages.ts b/sdk/containerregistry/container-registry/samples/v1/typescript/src/deleteImages.ts
@@ -32,12 +32,14 @@ async function main() {
     // Delete images older than the first three.
     for await (const manifest of imageManifests) {
       if (imageCount++ > imagesToKeep) {
+        const image = repository.getArtifact(manifest.digest);
         console.log(`Deleting image with digest ${manifest.digest}`);
-        console.log(`  This image has the following tags:`);
+        console.log(`  Deleting the following tags from the image:`);
         for (const tagName of manifest.tags) {
           console.log(`    ${manifest.repositoryName}:${tagName}`);
+          image.deleteTag(tagName);
         }
-        await repository.getArtifact(manifest.digest).delete();
+        await image.delete();
       }
     }
   }