From a558fde6df1c2c0763fcfd22642d72441f9cb698 Mon Sep 17 00:00:00 2001
From: Ross McFarland <ross@github.com>
Date: Wed, 6 Sep 2017 12:08:08 -0700
Subject: [PATCH] Fixes for cloudflare CAA support

---
 octodns/provider/cloudflare.py                    | 15 +++++++--------
 tests/fixtures/cloudflare-dns_records-page-2.json |  8 +++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/octodns/provider/cloudflare.py b/octodns/provider/cloudflare.py
index a4fce9b..dd53b3a 100644
--- a/octodns/provider/cloudflare.py
+++ b/octodns/provider/cloudflare.py
@@ -107,11 +107,8 @@ class CloudflareProvider(BaseProvider):
     def _data_for_CAA(self, _type, records):
         values = []
         for r in records:
-            values.append({
-                'flags': r['flags'],
-                'tag': r['tag'],
-                'value': r['content'],
-            })
+            data = r['data']
+            values.append(data)
         return {
             'ttl': records[0]['ttl'],
             'type': _type,
@@ -214,9 +211,11 @@ class CloudflareProvider(BaseProvider):
     def _contents_for_CAA(self, record):
         for value in record.values:
             yield {
-                'flags': value.flags,
-                'tag': value.tag,
-                'value': value.value,
+                'data': {
+                    'flags': value.flags,
+                    'tag': value.tag,
+                    'value': value.value,
+                }
             }
 
     def _contents_for_TXT(self, record):
diff --git a/tests/fixtures/cloudflare-dns_records-page-2.json b/tests/fixtures/cloudflare-dns_records-page-2.json
index 9800155..195d6de 100644
--- a/tests/fixtures/cloudflare-dns_records-page-2.json
+++ b/tests/fixtures/cloudflare-dns_records-page-2.json
@@ -123,9 +123,11 @@
       "id": "fc223b34cd5611334422ab3322997667",
       "type": "CAA",
       "name": "unit.tests",
-      "content": "ca.unit.tests",
-      "flags": 0,
-      "tag": "issue",
+      "data": {
+          "flags": 0,
+          "tag": "issue",
+          "value": "ca.unit.tests"
+      },
       "proxiable": false,
       "proxied": false,
       "ttl": 3600,