mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

shuttle None instead of avoiding kwargs

Browse Source
This commit is contained in:
Benjamin Kane
2021-12-07 14:39:53 -08:00
parent 70dee23792
commit 21b4d6a7e2
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
octodns/provider/azuredns.py
View File

@@ -289,45 +289,30 @@ def _pool_traffic_manager_name(pool, record):
def _healthcheck_tolerated_number_of_failures(record):
return record._octodns.get('azuredns', {}) \
.get('healthcheck', {}) \
.get('tolerated_number_of_failures', None)
.get('tolerated_number_of_failures')
def _healthcheck_interval_in_seconds(record):
return record._octodns.get('azuredns', {}) \
.get('healthcheck', {}) \
.get('interval_in_seconds', None)
.get('interval_in_seconds')
def _healthcheck_timeout_in_seconds(record):
return record._octodns.get('azuredns', {}) \
.get('healthcheck', {}) \
.get('timeout_in_seconds', None)
.get('timeout_in_seconds')
def _get_monitor(record):
# We're using None as a sentinal value for optional octoDNS configuration
# values that doesn't end up getting set. For example, if
# `interval_in_seconds` was not entered into the YAML, then
# `_healthcheck_interval_in_seconds(record)` will return None.
# In contrast, when creating a MonitorConfig, optional config is set by
# *not* passing a keyword argument (kwarg). For example, if you want to
# use the default `interval_in_seconds`, you would leave that keyword out
# of your call to `MonitorConfig(...)`. So, when we create a
# MonitorConfig, we need to remove any octoDNS config key that ended up
# with a value of None.
optional_kwargs = {
'tolerated_number_of_failures':
_healthcheck_tolerated_number_of_failures(record),
'interval_in_seconds': _healthcheck_interval_in_seconds(record),
'timeout_in_seconds': _healthcheck_timeout_in_seconds(record),
}
monitor = MonitorConfig(
protocol=record.healthcheck_protocol,
port=record.healthcheck_port,
path=record.healthcheck_path,
**{k: v for k, v in optional_kwargs.items() if v is not None},
interval_in_seconds=_healthcheck_interval_in_seconds(record),
timeout_in_seconds=_healthcheck_timeout_in_seconds(record),
tolerated_number_of_failures=
_healthcheck_tolerated_number_of_failures(record),
)
host = record.healthcheck_host()
if host:

23
tests/test_octodns_provider_azuredns.py
View File

@@ -470,7 +470,9 @@ class Test_ProfileIsMatch(TestCase):
monitor_proto = 'HTTPS',
monitor_port = 4443,
monitor_path = '/_ping',
monitor_optional_kwargs={},
monitor_interval_in_seconds = None,
monitor_timeout_in_seconds = None,
monitor_tolerated_number_of_failures = None,
endpoints = 1,
endpoint_name = 'name',
endpoint_type = 'profile/nestedEndpoints',
@@ -488,9 +490,10 @@ class Test_ProfileIsMatch(TestCase):
protocol=monitor_proto,
port=monitor_port,
path=monitor_path,
# see note in azuredns.py's _get_monitor(record) function
**{k: v for k, v
in monitor_optional_kwargs.items() if v is not None},
interval_in_seconds=monitor_interval_in_seconds,
timeout_in_seconds=monitor_timeout_in_seconds,
tolerated_number_of_failures=
monitor_tolerated_number_of_failures,
),
endpoints=[Endpoint(
name=endpoint_name,
@@ -512,9 +515,15 @@ class Test_ProfileIsMatch(TestCase):
self.assertFalse(is_match(profile(), profile(monitor_proto='HTTP')))
self.assertFalse(is_match(
profile(),
profile(
monitor_optional_kwargs={'tolerated_number_of_failures': 2}
),
profile(monitor_interval_in_seconds=9),
))
self.assertFalse(is_match(
profile(),
profile(monitor_timeout_in_seconds=3),
))
self.assertFalse(is_match(
profile(),
profile(monitor_tolerated_number_of_failures=2),
))
self.assertFalse(is_match(profile(), profile(endpoint_name='a')))
self.assertFalse(is_match(profile(), profile(endpoint_type='b')))