From f01709f9ba656e7cf4399bcd1a0a07fd134b0aec Mon Sep 17 00:00:00 2001 From: Viren Nadkarni Date: Thu, 23 Mar 2023 15:56:49 +0530 Subject: [PATCH] Fix DescribeInstances error due to a deleted subnet (#6112) --- moto/ec2/models/instances.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/moto/ec2/models/instances.py b/moto/ec2/models/instances.py index 02c5587b2..b2c5af296 100644 --- a/moto/ec2/models/instances.py +++ b/moto/ec2/models/instances.py @@ -1,3 +1,4 @@ +import contextlib import copy import warnings from collections import OrderedDict @@ -28,6 +29,7 @@ from ..exceptions import ( InvalidParameterValueErrorUnknownAttribute, InvalidSecurityGroupNotFoundError, OperationNotPermitted4, + InvalidSubnetIdError, ) from ..utils import ( convert_tag_spec, @@ -185,8 +187,9 @@ class Instance(TaggedEC2Resource, BotoInstance, CloudFormationModel): @property def vpc_id(self) -> Optional[str]: if self.subnet_id: - subnet: Subnet = self.ec2_backend.get_subnet(self.subnet_id) - return subnet.vpc_id + with contextlib.suppress(InvalidSubnetIdError): + subnet: Subnet = self.ec2_backend.get_subnet(self.subnet_id) + return subnet.vpc_id if self.nics and 0 in self.nics: return self.nics[0].subnet.vpc_id return None