openstack/designate
Code Issues Proposed changes

Removed deprecated managed option in notification handler

Browse Source 
The managed option has been deprecated for 3 years now, and is
risky in general as it can cause custom sink handlers to delete
all records in a zone by mistake.

This also allows us to clean the code path up a bit.

Related-Bug: #1387662
Change-Id: Id6174eb7df0c7bc9d138e74f72b6931a025ec818
This commit is contained in:
Erik Olof Gunnar Andersson 2018-07-21 23:17:09 -07:00
parent 66109b2ae2
commit 116b202d18
2 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
designate/notification_handler/base.py
View File

@ -125,8 +125,8 @@ class BaseAddressHandler(NotificationHandler):
self.default_formatv6
)
def _create(self, addresses, extra, zone_id, managed=True,
resource_type=None, resource_id=None):
def _create(self, addresses, extra, zone_id, resource_type=None,
resource_id=None):
"""
Create a record from addresses
@ -134,15 +134,9 @@ class BaseAddressHandler(NotificationHandler):
{'version': 4, 'ip': '10.0.0.1'}
:param extra: Extra data to use when formatting the record
:param zone_id: The ID of the designate zone.
:param managed: Is it a managed resource
:param resource_type: The managed resource type
:param resource_id: The managed resource ID
"""
if not managed:
LOG.warning(
'Deprecation notice: Unmanaged designate-sink records are '
'being deprecated please update the call '
'to remove managed=False')
LOG.debug('Using Zone ID: %s', zone_id)
zone = self.get_zone(zone_id)
LOG.debug('Domain: %r', zone)
@ -174,15 +168,13 @@ class BaseAddressHandler(NotificationHandler):
context, **recordset_values)
record_values = {
'data': addr['address']}
if managed:
record_values.update({
'managed': managed,
'managed_plugin_name': self.get_plugin_name(),
'managed_plugin_type': self.get_plugin_type(),
'managed_resource_type': resource_type,
'managed_resource_id': resource_id})
'data': addr['address'],
'managed': True,
'managed_plugin_name': self.get_plugin_name(),
'managed_plugin_type': self.get_plugin_type(),
'managed_resource_type': resource_type,
'managed_resource_id': resource_id
}
LOG.debug('Creating record in %s / %s with values %r',
zone['id'], recordset['id'], record_values)
@ -191,38 +183,30 @@ class BaseAddressHandler(NotificationHandler):
recordset['id'],
Record(**record_values))
def _delete(self, zone_id, managed=True, resource_id=None,
resource_type='instance', criterion=None):
def _delete(self, zone_id, resource_id=None, resource_type='instance',
criterion=None):
"""
Handle a generic delete of a fixed ip within a zone
:param zone_id: The ID of the designate zone.
:param managed: Is it a managed resource
:param resource_id: The managed resource ID
:param resource_type: The managed resource type
:param criterion: Criterion to search and destroy records
"""
if not managed:
LOG.warning(
'Deprecation notice: Unmanaged designate-sink records are '
'being deprecated please update the call '
'to remove managed=False')
criterion = criterion or {}
context = DesignateContext().elevated()
context.all_tenants = True
context.edit_managed_records = True
criterion.update({'zone_id': zone_id})
if managed:
criterion.update({
'managed': managed,
'managed_plugin_name': self.get_plugin_name(),
'managed_plugin_type': self.get_plugin_type(),
'managed_resource_id': resource_id,
'managed_resource_type': resource_type
})
criterion.update({
'zone_id': zone_id,
'managed': True,
'managed_plugin_name': self.get_plugin_name(),
'managed_plugin_type': self.get_plugin_type(),
'managed_resource_id': resource_id,
'managed_resource_type': resource_type
})
records = self.central_api.find_records(context, criterion)

7
releasenotes/notes/removed-deprecated-managed-210a00cdaf975b8f.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
Custom notification handlers that created unmanaged records will need to be updated,
as we no longer support the creation of unmanaged records using the sink.
See `designate/notification_handler/base.py` for more details.