Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handling the case of missing listeners (#1077)

Browse Source
This commit is contained in:
Jack Danger 2017-08-22 23:58:32 -07:00 committed by GitHub
parent 2ace59a60e
commit ed5059367c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/elbv2/models.py
View File

@ -82,7 +82,7 @@ class FakeTargetGroup(BaseModel):
def deregister(self, targets): def deregister(self, targets):
for target in targets: for target in targets:
t = self.targets.pop(target['id']) t = self.targets.pop(target['id'], None)
if not t: if not t:
raise InvalidTargetError() raise InvalidTargetError()
@ -420,14 +420,14 @@ class ELBv2Backend(BaseBackend):
# however, boto3 does't raise error even if rule is not found # however, boto3 does't raise error even if rule is not found
def delete_target_group(self, target_group_arn): def delete_target_group(self, target_group_arn):
target_group = self.target_groups.pop(target_group_arn) target_group = self.target_groups.pop(target_group_arn, None)
if target_group: if target_group:
return target_group return target_group
raise TargetGroupNotFoundError() raise TargetGroupNotFoundError()
def delete_listener(self, listener_arn): def delete_listener(self, listener_arn):
for load_balancer in self.load_balancers.values(): for load_balancer in self.load_balancers.values():
listener = load_balancer.listeners.pop(listener_arn) listener = load_balancer.listeners.pop(listener_arn, None)
if listener: if listener:
return listener return listener
raise ListenerNotFoundError() raise ListenerNotFoundError()