From 39412924da534adde67e1c9b11d0d93fd8e67db8 Mon Sep 17 00:00:00 2001
From: Mark Tearle <mtearle@ucc.asn.au>
Date: Wed, 9 Dec 2020 21:23:14 +0800
Subject: [PATCH] Fix handling of NULL SRV records in DigitalOcean provider

---
 octodns/provider/digitalocean.py            |  6 +++++-
 tests/fixtures/digitalocean-page-2.json     | 22 +++++++++++++++++++
 tests/test_octodns_provider_digitalocean.py | 24 ++++++++++++++++++---
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/octodns/provider/digitalocean.py b/octodns/provider/digitalocean.py
index e192543..6ccee1d 100644
--- a/octodns/provider/digitalocean.py
+++ b/octodns/provider/digitalocean.py
@@ -186,10 +186,14 @@ class DigitalOceanProvider(BaseProvider):
     def _data_for_SRV(self, _type, records):
         values = []
         for record in records:
+            target = (
+                '{}.'.format(record['data'])
+                if record['data'] != "." else "."
+            )
             values.append({
                 'port': record['port'],
                 'priority': record['priority'],
-                'target': '{}.'.format(record['data']),
+                'target': target,
                 'weight': record['weight']
             })
         return {
diff --git a/tests/fixtures/digitalocean-page-2.json b/tests/fixtures/digitalocean-page-2.json
index 50f17f9..1405527 100644
--- a/tests/fixtures/digitalocean-page-2.json
+++ b/tests/fixtures/digitalocean-page-2.json
@@ -76,6 +76,28 @@
 		"weight": null,
 		"flags": null,
 		"tag": null
+	}, {
+		"id": 11189896,
+		"type": "SRV",
+		"name": "_imap._tcp",
+		"data": ".",
+		"priority": 0,
+		"port": 0,
+		"ttl": 600,
+		"weight": 0,
+		"flags": null,
+		"tag": null
+	}, {
+		"id": 11189897,
+		"type": "SRV",
+		"name": "_pop3._tcp",
+		"data": ".",
+		"priority": 0,
+		"port": 0,
+		"ttl": 600,
+		"weight": 0,
+		"flags": null,
+		"tag": null
 	}],
 	"links": {
 		"pages": {
diff --git a/tests/test_octodns_provider_digitalocean.py b/tests/test_octodns_provider_digitalocean.py
index 0ad8f72..83fb5c3 100644
--- a/tests/test_octodns_provider_digitalocean.py
+++ b/tests/test_octodns_provider_digitalocean.py
@@ -83,14 +83,14 @@ class TestDigitalOceanProvider(TestCase):
 
             zone = Zone('unit.tests.', [])
             provider.populate(zone)
-            self.assertEquals(12, len(zone.records))
+            self.assertEquals(14, len(zone.records))
             changes = self.expected.changes(zone, provider)
             self.assertEquals(0, len(changes))
 
         # 2nd populate makes no network calls/all from cache
         again = Zone('unit.tests.', [])
         provider.populate(again)
-        self.assertEquals(12, len(again.records))
+        self.assertEquals(14, len(again.records))
 
         # bust the cache
         del provider._zone_records[zone.name]
@@ -190,6 +190,24 @@ class TestDigitalOceanProvider(TestCase):
                 'flags': 0, 'name': '@',
                 'tag': 'issue',
                 'ttl': 3600, 'type': 'CAA'}),
+            call('POST', '/domains/unit.tests/records', data={
+                'name': '_imap._tcp',
+                'weight': 0,
+                'data': '.',
+                'priority': 0,
+                'ttl': 600,
+                'type': 'SRV',
+                'port': 0
+            }),
+            call('POST', '/domains/unit.tests/records', data={
+                'name': '_pop3._tcp',
+                'weight': 0,
+                'data': '.',
+                'priority': 0,
+                'ttl': 600,
+                'type': 'SRV',
+                'port': 0
+            }),
             call('POST', '/domains/unit.tests/records', data={
                 'name': '_srv._tcp',
                 'weight': 20,
@@ -200,7 +218,7 @@ class TestDigitalOceanProvider(TestCase):
                 'port': 30
             }),
         ])
-        self.assertEquals(24, provider._client._request.call_count)
+        self.assertEquals(26, provider._client._request.call_count)
 
         provider._client._request.reset_mock()