Merge branch 'master' into modernize-python2-code

CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.9.6 - 2019-07-16 - The little one that fixes stuff from the big one
+
+* Reduced dynamic record value weight range to 0-15 so that Dyn and Route53
+  match up behaviors. Dyn is limited to 0-15 and scaling that up would lose
+  resolution that couldn't be recovered during populate.
+* Addressed issues with Route53 change set ordering for dynamic records
+* Ignore unsupported record types in DigitalOceanProvider
+* Fix bugs in Route53 extra changes handling and health check managagement
+
 ## v0.9.5 - 2019-05-06 - The big one, with all the dynamic stuff
 
 * dynamic record support, essentially a v2 version of geo records with a lot

README.md

@@ -1,4 +1,4 @@
-<img src="/docs/logos/octodns-logo.png?" height=251 width=404>
+<img src="https://raw.githubusercontent.com/github/octodns/master/docs/logos/octodns-logo.png?" height=251 width=404>
 
 ## DNS as code - Tools for managing DNS across multiple providers
 
@@ -275,4 +275,4 @@ GitHub® and its stylized versions and the Invertocat mark are GitHub's Trademar
 
 ## Authors
 
-OctoDNS was designed and authored by [Ross McFarland](https://github.com/ross) and [Joe Williams](https://github.com/joewilliams). It is now maintained, reviewed, and tested by Ross, Joe, and the rest of the Site Reliability Engineering team at GitHub.
+OctoDNS was designed and authored by [Ross McFarland](https://github.com/ross) and [Joe Williams](https://github.com/joewilliams). It is now maintained, reviewed, and tested by Traffic Engineering team at GitHub.

octodns/__init__.py

@@ -3,4 +3,4 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-__VERSION__ = '0.9.5'
+__VERSION__ = '0.9.6'

octodns/record/__init__.py

@@ -523,7 +523,7 @@ class _DynamicMixin(object):
                     try:
                         weight = value['weight']
                         weight = int(weight)
-                        if weight < 1 or weight > 255:
+                        if weight < 1 or weight > 15:
                             reasons.append('invalid weight "{}" in pool "{}" '
                                            'value {}'.format(weight, _id,
                                                              value_num))

requirements-dev.txt

@@ -6,4 +6,4 @@ pycountry>=18.12.8
 pycountry_convert>=0.7.2
 pyflakes==1.6.0
 requests_mock
-twine==1.11.0
+twine==1.13.0

setup.py

@@ -41,6 +41,7 @@ setup(
     ],
     license='MIT',
     long_description=open('README.md').read(),
+    long_description_content_type='text/markdown',
     name='octodns',
     packages=find_packages(),
     url='https://github.com/github/octodns',

tests/config/dynamic.tests.yaml

@@ -19,7 +19,7 @@ a:
           - value: 6.6.6.6
             weight: 10
           - value: 5.5.5.5
-            weight: 25
+            weight: 15
     rules:
       - geos:
         - EU-GB
@@ -90,9 +90,9 @@ cname:
       sea:
         values:
           - value: target-sea-1.unit.tests.
-            weight: 100
+            weight: 10
           - value: target-sea-2.unit.tests.
-            weight: 175
+            weight: 14
     rules:
       - geos:
         - EU-GB

tests/config/split/dynamic.tests./a.yaml

@@ -23,7 +23,7 @@ a:
         fallback: null
         values:
         - value: 5.5.5.5
-          weight: 25
+          weight: 15
         - value: 6.6.6.6
           weight: 10
     rules:

tests/config/split/dynamic.tests./cname.yaml

@@ -21,9 +21,9 @@ cname:
         fallback: null
         values:
         - value: target-sea-1.unit.tests.
-          weight: 100
+          weight: 10
         - value: target-sea-2.unit.tests.
-          weight: 175
+          weight: 14
     rules:
     - geos:
       - EU-GB

tests/test_octodns_record.py

@@ -2460,7 +2460,7 @@ class TestDynamicRecords(TestCase):
                             'weight': 1,
                             'value': '6.6.6.6',
                         }, {
-                            'weight': 256,
+                            'weight': 16,
                             'value': '7.7.7.7',
                         }],
                     },
@@ -2484,7 +2484,7 @@ class TestDynamicRecords(TestCase):
         }
         with self.assertRaises(ValidationError) as ctx:
             Record.new(self.zone, 'bad', a_data)
-        self.assertEquals(['invalid weight "256" in pool "three" value 2'],
+        self.assertEquals(['invalid weight "16" in pool "three" value 2'],
                           ctx.exception.reasons)
 
         # invalid non-int weight