fix: cleanup scripts skip DEFAULT endpoint to prevent resource leaks

01-features/02-host-your-agent/01-runtime/01-hosting-agents/02-a2a-protocol/cleanup.py

@@ -7,6 +7,7 @@
 
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -31,23 +32,25 @@ def main():
 
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     # Delete S3 code artifact
     try:
         bucket = f"agentcore-code-{account_id}-{region}"
         s3.delete_object(Bucket=bucket, Key=f"{agent_name}/code.zip")
         print("  Deleted S3 code artifact")
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     role_name = f"agentcore-{agent_name}-role"
@@ -56,8 +59,8 @@ def main():
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")

01-features/02-host-your-agent/01-runtime/01-hosting-agents/03-ag-ui-protocol/cleanup.py

@@ -7,6 +7,7 @@
 
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -31,23 +32,25 @@ def main():
 
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     # Delete S3 code artifact
     try:
         bucket = f"agentcore-code-{account_id}-{region}"
         s3.delete_object(Bucket=bucket, Key=f"{agent_name}/code.zip")
         print("  Deleted S3 code artifact")
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     role_name = f"agentcore-{agent_name}-role"
@@ -56,8 +59,8 @@ def main():
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")

01-features/02-host-your-agent/01-runtime/01-hosting-agents/04-observability-with-strands/cleanup.py

@@ -16,6 +16,7 @@
 import time
 
 import boto3
+from botocore.exceptions import ClientError
 
 # ── Load Config ────────────────────────────────────────────────────────────────
 
@@ -49,19 +50,21 @@ def cleanup(config):
         eps = control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id)
         for ep in eps.get("runtimeEndpoints", []):
             ep_name = ep["name"]
-            control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, name=ep_name)
+            if ep_name == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
+            control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep_name)
             print(f"  Deleted endpoint: {ep_name}")
         # Wait for deletion
         time.sleep(10)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     # Delete runtime
     print(f"Deleting AgentCore Runtime {runtime_id}...")
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         print("  Runtime deletion initiated")
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     # Delete IAM role
@@ -72,15 +75,15 @@ def cleanup(config):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
         print(f"  Deleted role: {role_name}")
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     # Delete S3 artifacts
     print(f"Deleting S3 object s3://{s3_bucket}/{s3_prefix}...")
     try:
         s3.delete_object(Bucket=s3_bucket, Key=s3_prefix)
         print("  Deleted S3 object")
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     print("\nCleanup complete.")

01-features/02-host-your-agent/01-runtime/02-hosting-tools/01-mcp-server-basics/cleanup.py

@@ -7,6 +7,7 @@
 
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -31,23 +32,25 @@ def main():
 
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     # Delete S3 code artifact
     try:
         bucket = f"agentcore-code-{account_id}-{region}"
         s3.delete_object(Bucket=bucket, Key=f"{agent_name}/code.zip")
         print("  Deleted S3 code artifact")
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
 
     role_name = f"agentcore-{agent_name}-role"
@@ -56,8 +59,8 @@ def main():
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")

01-features/02-host-your-agent/01-runtime/02-hosting-tools/02-mcp-server-features/cleanup.py

@@ -7,6 +7,7 @@
 
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -29,32 +30,34 @@ def main():
 
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     # Delete S3 code artifact
     try:
         bucket = f"agentcore-code-{account_id}-{region}"
         s3.delete_object(Bucket=bucket, Key=f"{agent_name}/code.zip")
         print("  Deleted S3 code artifact")
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     role_name = f"agentcore-{agent_name}-role"
     iam = boto3.client("iam", region_name=region)
     try:
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
 
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")

01-features/02-host-your-agent/01-runtime/03-advanced/01-streaming-responses/cleanup.py

@@ -4,8 +4,10 @@
 import os
 import sys
 import time
+
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -27,29 +29,31 @@ def main():
     print(f"Cleaning up: {agent_name}\n")
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
     try:
         boto3.client("s3", region_name=region).delete_object(
             Bucket=f"agentcore-code-{account_id}-{region}", Key=f"{agent_name}/code.zip"
         )
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
     role_name = f"agentcore-{agent_name}-role"
     iam = boto3.client("iam", region_name=region)
     try:
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")
     print("✓ Cleanup complete")

01-features/02-host-your-agent/01-runtime/03-advanced/02-session-management/cleanup.py

@@ -4,8 +4,10 @@
 import os
 import sys
 import time
+
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -27,29 +29,31 @@ def main():
     print(f"Cleaning up: {agent_name}\n")
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
     try:
         boto3.client("s3", region_name=region).delete_object(
             Bucket=f"agentcore-code-{account_id}-{region}", Key=f"{agent_name}/code.zip"
         )
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
     role_name = f"agentcore-{agent_name}-role"
     iam = boto3.client("iam", region_name=region)
     try:
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")
     print("✓ Cleanup complete")

01-features/02-host-your-agent/01-runtime/03-advanced/04-async-agents/01_weekly_report_generator_async/cleanup.py

@@ -4,8 +4,10 @@
 import os
 import sys
 import time
+
 import boto3
 from boto3.session import Session
+from botocore.exceptions import ClientError
 
 
 def main():
@@ -27,29 +29,31 @@ def main():
     print(f"Cleaning up: {agent_name}\n")
     try:
         for ep in control.list_agent_runtime_endpoints(agentRuntimeId=runtime_id).get("runtimeEndpoints", []):
+            if ep["name"] == "DEFAULT":
+                continue  # DEFAULT endpoint is auto-deleted with the runtime
             control.delete_agent_runtime_endpoint(agentRuntimeId=runtime_id, endpointName=ep["name"])
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
     try:
         control.delete_agent_runtime(agentRuntimeId=runtime_id)
         time.sleep(30)
-    except Exception as e:
+    except ClientError as e:
         print(f"  Warning: {e}")
     try:
         boto3.client("s3", region_name=region).delete_object(
             Bucket=f"agentcore-code-{account_id}-{region}", Key=f"{agent_name}/code.zip"
         )
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
     role_name = f"agentcore-{agent_name}-role"
     iam = boto3.client("iam", region_name=region)
     try:
         for p in iam.list_role_policies(RoleName=role_name).get("PolicyNames", []):
             iam.delete_role_policy(RoleName=role_name, PolicyName=p)
         iam.delete_role(RoleName=role_name)
-    except Exception:
-        pass
+    except ClientError:
+        print("  Warning: cleanup resource not found or already deleted")
     if os.path.exists("runtime_config.json"):
         os.remove("runtime_config.json")
     print("✓ Cleanup complete")