fix: correct ECR API response format from imageDetails to imageIds

Author: huanshenyi

README.md

@@ -45,9 +45,11 @@ app.run()
 agentcore configure --entrypoint my_agent.py
 agentcore launch  # Ready to run on Bedrock AgentCore
 agentcore invoke '{"prompt": "tell me a fact"}'
+agentcore destroy
 ```
 
 **What you get with the Starter Toolkit:**
+
 - ✅ **Keep your agent logic** - Works with any SDK-built agent
 - ✅ **Zero infrastructure management** - No servers, containers, or scaling concerns
 - ✅ **One-command deployment** - From local development to enterprise platform
@@ -60,6 +62,7 @@ Bedrock AgentCore Starter Toolkit is currently in public preview. APIs may chang
 ## 🛠️ Deployment & Management Tools
 
 **Simple Configuration**
+
 ```bash
 # Configure your agent for deployment
 agentcore configure --entrypoint my_agent.py --name my-production-agent
@@ -72,6 +75,7 @@ agentcore invoke '{"prompt": "Hello from Bedrock AgentCore!"}'
 ```
 
 **Enterprise Platform Services**
+
 - 🚀 **Runtime** - Serverless deployment and scaling with fast cold starts
 - 🧠 **Memory** - Persistent knowledge with event and semantic memory
 - 🔗 **Gateway** - Transform existing APIs and Lambda functions into MCP tools

src/bedrock_agentcore_starter_toolkit/cli/runtime/commands.py

@@ -752,16 +752,20 @@ def destroy(
     force: bool = typer.Option(
         False, "--force", help="Skip confirmation prompts and destroy immediately"
     ),
+    delete_ecr_repo: bool = typer.Option(
+        False, "--delete-ecr-repo", help="Also delete the ECR repository after removing images"
+    ),
 ) -> None:
     """Destroy Bedrock AgentCore resources.
     
     This command removes the following AWS resources for the specified agent:
     - Bedrock AgentCore endpoint (if exists)
     - Bedrock AgentCore agent runtime
-    - ECR images (latest tag only for safety)
+    - ECR images (all images in the agent's repository)
     - CodeBuild project
     - IAM execution role (only if not used by other agents)
     - Agent deployment configuration
+    - ECR repository (only if --delete-ecr-repo is specified)
     
     CAUTION: This action cannot be undone. Use --dry-run to preview changes first.
     """
@@ -805,6 +809,8 @@ def destroy(
         # Confirmation prompt (unless force or dry_run)
         if not dry_run and not force:
             console.print("[red]This will permanently delete AWS resources and cannot be undone![/red]")
+            if delete_ecr_repo:
+                console.print("[red]This includes deleting the ECR repository itself![/red]")
             response = typer.confirm(
                 f"Are you sure you want to destroy the agent '{actual_agent_name}' and all its resources?"
             )
@@ -819,6 +825,7 @@ def destroy(
                 agent_name=actual_agent_name,
                 dry_run=dry_run,
                 force=force,
+                delete_ecr_repo=delete_ecr_repo,
             )
 
         # Display results
@@ -860,7 +867,10 @@ def destroy(
             console.print("  • Run 'agentcore launch' to deploy to Bedrock AgentCore")
         elif dry_run:
             console.print(f"\n[dim]To actually destroy these resources, run:[/dim]")
-            console.print(f"  agentcore destroy{f' --agent {actual_agent_name}' if agent else ''}")
+            destroy_cmd = f"  agentcore destroy{f' --agent {actual_agent_name}' if agent else ''}"
+            if delete_ecr_repo:
+                destroy_cmd += " --delete-ecr-repo"
+            console.print(destroy_cmd)
 
     except FileNotFoundError:
         console.print("[red].bedrock_agentcore.yaml not found[/red]")

src/bedrock_agentcore_starter_toolkit/operations/runtime/destroy.py

@@ -21,6 +21,7 @@ def destroy_bedrock_agentcore(
     agent_name: Optional[str] = None,
     dry_run: bool = False,
     force: bool = False,
+    delete_ecr_repo: bool = False,
 ) -> DestroyResult:
     """Destroy Bedrock AgentCore resources.
 
@@ -29,6 +30,7 @@ def destroy_bedrock_agentcore(
         agent_name: Name of the agent to destroy (default: use default agent)
         dry_run: If True, only show what would be destroyed without actually doing it
         force: If True, skip confirmation prompts
+        delete_ecr_repo: If True, also delete the ECR repository after removing images
 
     Returns:
         DestroyResult: Details of what was destroyed or would be destroyed
@@ -38,7 +40,8 @@ def destroy_bedrock_agentcore(
         ValueError: If agent is not found or not deployed
         RuntimeError: If destruction fails
     """
-    log.info("Starting destroy operation for agent: %s (dry_run=%s)", agent_name or "default", dry_run)
+    log.info("Starting destroy operation for agent: %s (dry_run=%s, delete_ecr_repo=%s)", 
+             agent_name or "default", dry_run, delete_ecr_repo)
 
     try:
         # Load configuration
@@ -65,8 +68,8 @@ def destroy_bedrock_agentcore(
         # 2. Destroy Bedrock AgentCore agent
         _destroy_agentcore_agent(session, agent_config, result, dry_run)
 
-        # 3. Remove ECR images (specific tags only)
-        _destroy_ecr_images(session, agent_config, result, dry_run)
+        # 3. Remove ECR images and optionally the repository
+        _destroy_ecr_images(session, agent_config, result, dry_run, delete_ecr_repo)
 
         # 4. Remove CodeBuild project
         _destroy_codebuild_project(session, agent_config, result, dry_run)
@@ -179,8 +182,9 @@ def _destroy_ecr_images(
     agent_config: BedrockAgentCoreAgentSchema,
     result: DestroyResult,
     dry_run: bool,
+    delete_ecr_repo: bool = False,
 ) -> None:
-    """Remove ECR images for this specific agent."""
+    """Remove ECR images and optionally the repository for this specific agent."""
     if not agent_config.aws.ecr_repository:
         result.warnings.append("No ECR repository configured, skipping image cleanup")
         return
@@ -204,7 +208,14 @@ def _destroy_ecr_images(
             # Fix: use correct response key 'imageIds' instead of 'imageDetails'
             all_images = response.get("imageIds", [])
             if not all_images:
-                result.warnings.append(f"No images found in ECR repository: {repo_name}")
+                if delete_ecr_repo:
+                    # Repository exists but is empty, we can delete it
+                    if dry_run:
+                        result.resources_removed.append(f"ECR repository: {repo_name} (empty, DRY RUN)")
+                    else:
+                        _delete_ecr_repository(ecr_client, repo_name, result)
+                else:
+                    result.warnings.append(f"No images found in ECR repository: {repo_name}")
                 return
 
             if dry_run:
@@ -214,6 +225,8 @@ def _destroy_ecr_images(
                 result.resources_removed.append(
                     f"ECR images in repository {repo_name}: {tagged_count} tagged, {untagged_count} untagged (DRY RUN)"
                 )
+                if delete_ecr_repo:
+                    result.resources_removed.append(f"ECR repository: {repo_name} (DRY RUN)")
                 return
 
             # Prepare images for deletion - imageIds are already in the correct format
@@ -264,6 +277,12 @@ def _destroy_ecr_images(
                     result.warnings.append(
                         f"Some ECR images could not be deleted: {failed_count} out of {len(images_to_delete)} failed"
                     )
+                
+                # Delete the repository if requested and all images were deleted successfully
+                if delete_ecr_repo and total_deleted == len(images_to_delete):
+                    _delete_ecr_repository(ecr_client, repo_name, result)
+                elif delete_ecr_repo and total_deleted < len(images_to_delete):
+                    result.warnings.append(f"Cannot delete ECR repository {repo_name}: some images failed to delete")
             else:
                 result.warnings.append(f"No valid image identifiers found in {repo_name}")
 
@@ -282,6 +301,36 @@ def _destroy_ecr_images(
         log.warning("Error during ECR cleanup: %s", e)
 
 
+def _delete_ecr_repository(ecr_client, repo_name: str, result: DestroyResult) -> None:
+    """Delete an ECR repository after ensuring it's empty."""
+    try:
+        # Verify repository is empty before deletion
+        response = ecr_client.list_images(repositoryName=repo_name)
+        remaining_images = response.get("imageIds", [])
+        
+        if remaining_images:
+            result.warnings.append(f"Cannot delete ECR repository {repo_name}: repository is not empty")
+            return
+        
+        # Delete the empty repository
+        ecr_client.delete_repository(repositoryName=repo_name)
+        result.resources_removed.append(f"ECR repository: {repo_name}")
+        log.info("Deleted ECR repository: %s", repo_name)
+        
+    except ClientError as e:
+        error_code = e.response["Error"]["Code"]
+        if error_code == "RepositoryNotFoundException":
+            result.warnings.append(f"ECR repository {repo_name} not found (may have been deleted already)")
+        elif error_code == "RepositoryNotEmptyException":
+            result.warnings.append(f"Cannot delete ECR repository {repo_name}: repository is not empty")
+        else:
+            result.warnings.append(f"Failed to delete ECR repository {repo_name}: {e}")
+            log.warning("Failed to delete ECR repository: %s", e)
+    except Exception as e:
+        result.warnings.append(f"Error deleting ECR repository {repo_name}: {e}")
+        log.warning("Error deleting ECR repository: %s", e)
+
+
 def _destroy_codebuild_project(
     session: boto3.Session,
     agent_config: BedrockAgentCoreAgentSchema,