Skip to content

Commit a97ce09

Browse files
fix: listener rules NoneType error
1 parent 2bcec82 commit a97ce09

File tree

1 file changed

+7
-6
lines changed
  • src/spaceone/inventory/connector/aws_elb_connector

1 file changed

+7
-6
lines changed

src/spaceone/inventory/connector/aws_elb_connector/connector.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,12 @@ def match_elb_instance(self, target_group, instances):
257257
return match_instances
258258

259259
def get_listener_rules(self, raw_listeners: list):
260+
listener_rules = []
261+
260262
for raw_listener in raw_listeners:
261263
try:
262-
raw_listener_rules = self.request_rules_by_listeners(raw_listener)
264+
raw_listener_rules = self.request_rules_by_listener(raw_listener)
263265

264-
rule_infos = []
265266
for raw_listener_rule in raw_listener_rules:
266267
is_default = raw_listener_rule.get("IsDefault", False)
267268
conditions = self.get_formatted_conditions(raw_listener_rule["Conditions"], is_default)
@@ -276,16 +277,16 @@ def get_listener_rules(self, raw_listeners: list):
276277
"IsDefault": is_default,
277278
}
278279

279-
rule_infos.append(rule_info)
280-
281-
return rule_infos
280+
listener_rules.append(rule_info)
282281
except Exception as e:
283282
resource_id = raw_listener.get("ListenerArn", "")
284283
error_resource_response = self.generate_error(
285284
None, resource_id, e
286285
)
287286
_LOGGER.error(error_resource_response)
288287

288+
return listener_rules
289+
289290
@staticmethod
290291
def get_formatted_conditions(raw_conditions: list, is_default: bool) -> list:
291292
str_conditions = []
@@ -425,7 +426,7 @@ def request_listeners(self, lb_arn):
425426
response = self.client.describe_listeners(LoadBalancerArn=lb_arn)
426427
return response.get("Listeners", [])
427428

428-
def request_rules_by_listeners(self, listener: dict) -> list:
429+
def request_rules_by_listener(self, listener: dict) -> list:
429430
listener_arn = listener.get("ListenerArn")
430431
response = self.client.describe_rules(ListenerArn=listener_arn)
431432

0 commit comments

Comments
 (0)