Merge pull request #300 from ricardobranco777/ec2_vpc

ec2: Handle exception in delete_vpc_subnets
SUSE · Aug 21, 2023 · bad7f7c · bad7f7c
2 parents 02aed66 + 185a262
commit bad7f7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ocw/lib/ec2.py b/ocw/lib/ec2.py
@@ -173,7 +173,11 @@ def delete_vpc_subnets(self, vpc) -> None:
                     self.log_info(f'Deletion of {interface} skipped due to dry_run mode')
                 else:
                     self.log_info(f'Deleting {interface}')
-                    interface.delete()
+                    try:
+                        interface.delete()
+                    except ClientError as exc:
+                        self.log_err("delete_vpc_subnets: %s", exc)
+                        continue
             if self.dry_run:
                 self.log_info(f'Deletion of {subnet} skipped due to dry_run mode')
             else:

diff --git a/ocw/lib/gce.py b/ocw/lib/gce.py
@@ -100,7 +100,7 @@ def list_zones(self, region) -> list:
             )
             return [basename(z) for z in region["zones"]]
         except (KeyError, HttpError) as exc:
-            self.log_dbg("list_zones: %s", exc)
+            self.log_err("list_zones: %s", exc)
             return []
 
     def delete_instance(self, instance_id, zone) -> None: