octodns-cloudns 0.0.4__tar.gz → 0.0.6__tar.gz

{octodns-cloudns-0.0.4 → octodns_cloudns-0.0.6}/PKG-INFO

@@ -1,17 +1,32 @@
 Metadata-Version: 2.1
 Name: octodns-cloudns
-Version: 0.0.4
+Version: 0.0.6
 Summary:  ClouDNS API provider for octoDNS
 Home-page: https://github.com/octodns/octodns-cloudns
 Author: ClouDNS
 Author-email: support@cloudns.net
 License: MIT
-Platform: UNKNOWN
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: octodns>=0.9.17
+Requires-Dist: requests>=2.27.0
 Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-network; extra == "dev"
+Requires-Dist: requests_mock; extra == "dev"
+Requires-Dist: black<24.0.0,>=23.1.0; extra == "dev"
+Requires-Dist: build>=0.7.0; extra == "dev"
+Requires-Dist: isort>=5.11.5; extra == "dev"
+Requires-Dist: pyflakes>=2.2.0; extra == "dev"
+Requires-Dist: readme_renderer[md]>=26.0; extra == "dev"
+Requires-Dist: twine>=3.4.2; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-network; extra == "test"
+Requires-Dist: requests_mock; extra == "test"
 
 ## ClouDNS API provider for octoDNS
 
@@ -64,5 +79,3 @@ ClouDNSProvider does not support dynamic records.
 ### Development
 
 See the [/script/](/script/) directory for some tools to help with the development process. They generally follow the [Script to rule them all](https://github.com/github/scripts-to-rule-them-all) pattern. Most useful is `./script/bootstrap` which will create a venv and install both the runtime and development related requirements. It will also hook up a pre-commit hook that covers most of what's run by CI.
-
-

{octodns-cloudns-0.0.4 → octodns_cloudns-0.0.6}/octodns_cloudns/__init__.py

@@ -8,7 +8,7 @@ from octodns.record import Record
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
-__version__ = __VERSION__ = '0.0.4'
+__version__ = __VERSION__ = '0.0.6'
 
 class ClouDNSClientException(ProviderException):
     pass
@@ -580,75 +580,89 @@ class ClouDNSProvider(BaseProvider):
         zone = existing.zone
         record_ids = []
         for record_id, record in self.zone_records(zone).items():
-            for value in existing.values:
-                if existing._type == 'NAPTR' and record['type'] == 'NAPTR':                    
-                    if (
-                        existing.name == record['host']
-                        and value.order == int(record['order'])
-                        and value.preference == int(record['pref'])
-                        and value.flags == record['flag']
-                    ):
-                        record_ids.append(record_id)
+                if existing._type == 'NAPTR' and record['type'] == 'NAPTR':
+                    for value in existing.values:
+                        if (
+                            existing.name == record['host']
+                            and value.order == int(record['order'])
+                            and value.preference == int(record['pref'])
+                            and value.flags == record['flag']
+                        ):
+                            record_ids.append(record_id)
                 elif existing._type == 'SSHFP' and record['type'] == 'SSHFP':
-                    if (
-                        existing.name == record['host']
-                        and value.fingerprint_type == int(record['fp_type'])
-                        and value.algorithm == int(record['algorithm'])
-                        and value.fingerprint == record['record']
-                    ):
-                        record_ids.append(record_id)
+                    for value in existing.values:
+                        if (
+                            existing.name == record['host']
+                            and value.fingerprint_type == int(record['fp_type'])
+                            and value.algorithm == int(record['algorithm'])
+                            and value.fingerprint == record['record']
+                        ):
+                            record_ids.append(record_id)
                 elif existing._type == 'SRV' and record['type'] == 'SRV':
-                    if (
-                        existing.name == record['host']
-                        and value.priority == int(record['priority'])
-                        and value.weight == int(record['weight'])
-                        and value.port == record['port']
-                        and value.target == record['record']
-                    ):
-                        record_ids.append(record_id)
+                    for value in existing.values:
+                        if (
+                            existing.name == record['host']
+                            and value.priority == int(record['priority'])
+                            and value.weight == int(record['weight'])
+                            and value.port == record['port']
+                            and value.target == record['record']
+                        ):
+                            record_ids.append(record_id)
                 elif existing._type == 'CAA' and record['type'] == 'CAA':
-                    if (
-                        existing.name == record['host']
-                        and value.flags == record['caa_flag']
-                        and value.tag == record['caa_type']
-                        and value.value == record['caa_value']
-                    ):
-                        record_ids.append(record_id)
+                    for value in existing.values:
+                        if (
+                            existing.name == record['host']
+                            and value.flags == record['caa_flag']
+                            and value.tag == record['caa_type']
+                            and value.value == record['caa_value']
+                        ):
+                            record_ids.append(record_id)
                 elif existing._type == 'MX' and record['type'] == 'MX':
-                    if (
-                        existing.name == record['host']
-                        and value.preference == int(record['priority'])
-                        and value.exchange == record['record']
-                    ):
-                        record_ids.append(record_id)
+                    for value in existing.values:
+                        if (
+                            existing.name == record['host']
+                            and value.preference == int(record['priority'])
+                            and value.exchange == record['record']
+                        ):
+                            record_ids.append(record_id)
                         
                 elif existing._type == 'LOC' and record['type'] == 'LOC':
-                    if (
-                        existing.name == record['host']
-                        and value.lat_degrees == record['lat_deg']
-                        and value.lat_minutes == record['lat_min']
-                        and value.lat_seconds == record['lat_sec']
-                        and value.lat_direction == record['lat_dir']
-                        and value.long_degrees == record['long_deg']
-                        and value.long_minutes == record['long_min']
-                        and value.long_seconds == record['long_sec']
-                        and value.long_direction == record['long_dir']
-                        and value.altitude == record['altitude']
-                        and value.size == record['size']
-                        and value.precision_horz == record['h_precision']
-                        and value.precision_vert == record['v_precision']
-                    ):
-                        record_ids.append(record_id)
+                    for value in existing.values:
+                        if (
+                            existing.name == record['host']
+                            and value.lat_degrees == record['lat_deg']
+                            and value.lat_minutes == record['lat_min']
+                            and value.lat_seconds == record['lat_sec']
+                            and value.lat_direction == record['lat_dir']
+                            and value.long_degrees == record['long_deg']
+                            and value.long_minutes == record['long_min']
+                            and value.long_seconds == record['long_sec']
+                            and value.long_direction == record['long_dir']
+                            and value.altitude == record['altitude']
+                            and value.size == record['size']
+                            and value.precision_horz == record['h_precision']
+                            and value.precision_vert == record['v_precision']
+                        ):
+                            record_ids.append(record_id)
                 else:
                     if (record == 'Failed' or record == 'Missing domain-name'):
                         continue
-                    if (
-                        existing.name == record['host']
-                        and existing._type == record['type']
-                        and value == record['record']
-                    ):
-                        print(record['record'])
-                        record_ids.append(record_id)
+                    
+                    if hasattr(existing, 'value'):
+                        if (
+                            existing.name == record['host']
+                            and existing._type == record['type']
+                            and existing.value == record['record']
+                        ):
+                            record_ids.append(record_id)
+                    elif hasattr(existing, 'values'):
+                        for value in existing.values:
+                            if (
+                                existing.name == record['host']
+                                and existing._type == record['type']
+                                and value == record['record']
+                            ):
+                                record_ids.append(record_id)
         return record_ids
 
 

{octodns-cloudns-0.0.4 → octodns_cloudns-0.0.6}/octodns_cloudns.egg-info/PKG-INFO

@@ -1,17 +1,32 @@
 Metadata-Version: 2.1
 Name: octodns-cloudns
-Version: 0.0.4
+Version: 0.0.6
 Summary:  ClouDNS API provider for octoDNS
 Home-page: https://github.com/octodns/octodns-cloudns
 Author: ClouDNS
 Author-email: support@cloudns.net
 License: MIT
-Platform: UNKNOWN
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: octodns>=0.9.17
+Requires-Dist: requests>=2.27.0
 Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-network; extra == "dev"
+Requires-Dist: requests_mock; extra == "dev"
+Requires-Dist: black<24.0.0,>=23.1.0; extra == "dev"
+Requires-Dist: build>=0.7.0; extra == "dev"
+Requires-Dist: isort>=5.11.5; extra == "dev"
+Requires-Dist: pyflakes>=2.2.0; extra == "dev"
+Requires-Dist: readme_renderer[md]>=26.0; extra == "dev"
+Requires-Dist: twine>=3.4.2; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-network; extra == "test"
+Requires-Dist: requests_mock; extra == "test"
 
 ## ClouDNS API provider for octoDNS
 
@@ -64,5 +79,3 @@ ClouDNSProvider does not support dynamic records.
 ### Development
 
 See the [/script/](/script/) directory for some tools to help with the development process. They generally follow the [Script to rule them all](https://github.com/github/scripts-to-rule-them-all) pattern. Most useful is `./script/bootstrap` which will create a venv and install both the runtime and development related requirements. It will also hook up a pre-commit hook that covers most of what's run by CI.
-
-

{octodns-cloudns-0.0.4 → octodns_cloudns-0.0.6}/octodns_cloudns.egg-info/SOURCES.txt

@@ -6,4 +6,5 @@ octodns_cloudns.egg-info/PKG-INFO
 octodns_cloudns.egg-info/SOURCES.txt
 octodns_cloudns.egg-info/dependency_links.txt
 octodns_cloudns.egg-info/requires.txt
-octodns_cloudns.egg-info/top_level.txt
+octodns_cloudns.egg-info/top_level.txt
+tests/test_octodns_cloudns_provider.py

octodns_cloudns-0.0.6/tests/test_octodns_cloudns_provider.py

@@ -0,0 +1,214 @@
+import unittest
+from unittest.mock import Mock, patch
+from octodns.zone import Zone
+from octodns.record import Record
+from octodns.provider.cloudns import (
+    ClouDNSProvider,
+    ClouDNSClient,
+    ClouDNSClientUnknownDomainName
+)
+
+class TestClouDNSClient(unittest.TestCase):
+
+    def setUp(self):
+        self.client = ClouDNSClient('456', '123456')
+
+    @patch('requests.Session.get')
+    def test_raw_request_success(self, mock_get):
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.text = 'Success response'
+        mock_get.return_value = mock_response
+
+        response = self.client._raw_request('dns/get-zone-info', 'domain-name=example.com')
+
+        self.assertEqual(response.text, 'Success response')
+        mock_get.assert_called_with('https://apidev.cloudns.net/dns/get-zone-info.json?auth-id=456&auth-password=123456&domain-name=example.com')
+
+class TestClouDNSProvider(unittest.TestCase):
+    def setUp(self):
+        self.provider = ClouDNSProvider('test', '456', '123456')
+    
+    # Invalid authentication
+    @patch('octodns.provider.cloudns.ClouDNSClient')
+    def test_invalid_authentication(self, mock_clouDNSClient):
+        # Arrange
+        mock_clouDNSClient.side_effect = Exception('Invalid authentication, incorrect username, ID, or password.')
+
+        # Act & Assert
+        with self.assertRaises(Exception) as context:
+            ClouDNSProvider('test', 'invalid_user_id', 'invalid_password')
+
+        self.assertTrue('Invalid authentication' in str(context.exception))
+
+    # Invalid Domain
+    @patch('octodns.provider.cloudns.ClouDNSClient.zone_records')
+    def test_populate_creates_zone_when_not_exist(self, mock_zone_records):
+        provider = ClouDNSProvider('test', '456', '123456')
+        zone = Zone('venkofgdge.invalidtld.', [])
+
+        mock_zone_records.side_effect = ClouDNSClientUnknownDomainName('Missing domain name')
+
+        with self.assertRaises(ClouDNSClientUnknownDomainName):
+            provider.populate(zone)
+
+    # Zone creation success
+    @patch('octodns.provider.cloudns.ClouDNSClient.zone_create')
+    def test_zone_create(self, mock_zone_create):
+        provider = ClouDNSProvider('test', '456', '123456')
+        zone = Zone('example552525.com.', [])
+
+        mock_zone_create.return_value = {'status': 'Success'}
+        response = provider._client.zone_create(zone.name[:-1], 'master')
+
+        mock_zone_create.assert_called_once_with('example552525.com', 'master')
+        self.assertEqual(response['status'], 'Success')
+        
+    @patch.object(ClouDNSClient, '_request')
+    def test_zone_create_failure(self, mock_request):
+        mock_request.return_value = {'status': 'Failed'}
+        response = self.provider.zone_create('example.cosdm', 'master')
+        
+        self.assertEqual(response['status'], 'Failed')
+
+    # Test records
+    @patch('octodns.provider.cloudns.ClouDNSProvider.populate')
+    def test_populate_creates_A_record(self, mock_populate):
+        provider = ClouDNSProvider('test', '456', '123456')
+        zone_name = 'example786.com.'
+        zone = Zone(zone_name, [])
+
+        mock_populate.return_value = {'status': 'Success'}
+
+        provider.populate(zone)
+
+        expected_argument = zone
+        actual_argument = mock_populate.call_args[0][0]
+        self.assertEqual(actual_argument, expected_argument)
+    
+    def test_record_creation(self):
+        zone_name = 'example.com.'
+        zone = Zone(zone_name, [])
+        
+        a_record_data = {
+            'type': 'A',
+            'ttl': 3600,
+            'values': ['1.2.3.4']
+        }
+        a_record = Record.new(zone, 'www', a_record_data)
+        self.assertEqual(a_record.ttl, 3600)
+        self.assertEqual(a_record.name, 'www')
+        self.assertEqual(a_record.data['value'], '1.2.3.4')
+
+        cname_record_data = {
+            'type': 'CNAME',
+            'ttl': 3600,
+            'value': 'example.com.'
+        }
+        cname_record = Record.new(zone, 'sub', cname_record_data)
+        self.assertEqual(cname_record.ttl, 3600)
+        self.assertEqual(cname_record.name, 'sub')
+        self.assertEqual(cname_record.data['value'], 'example.com.')
+        
+        mx_record_data = {
+            'type': 'MX',
+            'ttl': 3600,
+            'values': [{'preference': 10, 'exchange': 'mailforwadrd.cloudns.net.'}]
+        }
+        mx_record = Record.new(zone, '', mx_record_data)
+        self.assertEqual(mx_record.ttl, 3600)
+        self.assertEqual(mx_record.name, '')
+        self.assertEqual(str(mx_record.data['value']), "'10 mailforwadrd.cloudns.net.'")
+        
+        txt_record_data = {
+            'type': 'TXT',
+            'ttl': 3600,
+            'value': 'v=spf1 -a -mx -ip:192.168.0.1'
+        }
+        txt_record = Record.new(zone, '', txt_record_data)
+        self.assertEqual(txt_record.ttl, 3600)
+        self.assertEqual(txt_record.name, '')
+        self.assertEqual(txt_record.data['value'], "v=spf1 -a -mx -ip:192.168.0.1")
+        
+        srv_record_data = {
+            'type': 'SRV',
+            'ttl': 3600,
+            'values': [{'priority': 10, 'weight': 50, 'port': 443, 'target': 'bigbox.example.com.'}]
+        }
+        srv_record = Record.new(zone, '_sip._tcp', srv_record_data)
+        self.assertEqual(srv_record.ttl, 3600)
+        self.assertEqual(srv_record.name, '_sip._tcp')
+        self.assertEqual(str(srv_record.data['value']), "'10 50 443 bigbox.example.com.'")
+        
+        loc_record_data = {
+            'type': 'LOC',
+            'ttl': 3600,
+            'values': [{"lat_degrees": 10, "lat_minutes": 11 ,"lat_seconds": 12, "lat_direction": 'S',
+                           "long_degrees": 13, "long_minutes": 14, "long_seconds": 15, "long_direction": 'W',
+                           "altitude": 16, "size": 17, "precision_horz": 20, "precision_vert": 21}]
+        }
+        loc_record = Record.new(zone, '', loc_record_data)
+        self.assertEqual(loc_record.ttl, 3600)
+        self.assertEqual(loc_record.name, '')
+        self.assertEqual(str(loc_record.data['value']), "'10 11 12.000 S 13 14 15.000 W 16.00m 17.00m 20.00m 21.00m'")
+        
+        sshfp_record_data = {
+            'type': 'SSHFP',
+            'ttl': 3600,
+            'values': [{"algorithm": 1, "fingerprint_type": 1 ,"fingerprint": '123456789abcdef67890123456789abcdef67890'}]
+        }
+        sshfp_record = Record.new(zone, '', sshfp_record_data)
+        self.assertEqual(sshfp_record.ttl, 3600)
+        self.assertEqual(sshfp_record.name, '')
+        self.assertEqual(str(sshfp_record.data['value']), "'1 1 123456789abcdef67890123456789abcdef67890'")
+        
+        naptr_record_data = {
+            'type': 'NAPTR',
+            'ttl': 3600,
+            'values': [{"order": 10, "preference": 100, "flags": 'S', "service": 'SIP D2U',
+                            "regexp": '$!sip:info@bar.example.com!', "replacement": ''}]
+        }
+        naptr_record = Record.new(zone, '', naptr_record_data)
+        self.assertEqual(naptr_record.ttl, 3600)
+        self.assertEqual(naptr_record.name, '')
+        self.assertEqual(str(naptr_record.data['value']), "'10 100 \"S\" \"SIP D2U\" \"$!sip:info@bar.example.com!\" '")
+        
+        tlsa_record_data = {
+            'type': 'TLSA',
+            'ttl': 3600,
+            'values': [{"certificate_association_data": 'F34834E4BEB8DCBE0D289E3B0F3BEAB16495620088B5CE9EF766E56254B80944', "certificate_usage": 0,
+                        "selector": '1', "matching_type": 1}]
+        }
+        tlsa_record = Record.new(zone, '_443._tcp', tlsa_record_data)
+        self.assertEqual(tlsa_record.ttl, 3600)
+        self.assertEqual(tlsa_record.name, '_443._tcp')
+        
+        geo_a_record_data = {
+            'type': 'A',
+            'ttl': 3600,
+            'values': ['192.168.1.1'],
+            'geo': {
+                'AF': [
+                    '2.2.3.4',
+                    '2.2.3.5'
+                ],
+                'AS-JP': [
+                    '3.2.3.4',
+                    '3.2.3.5'
+                ],
+                'NA-US-CA': [
+                    '4.2.3.4',
+                    '4.2.3.5'
+                ]
+            }
+        }
+
+        geo_a_record = Record.new(zone, '', geo_a_record_data)
+        self.assertEqual(geo_a_record.ttl, 3600)
+        self.assertEqual(geo_a_record.name, '')
+        self.assertEqual(str(geo_a_record.data['value']), "192.168.1.1")
+        self.assertEqual(str(geo_a_record.data['geo']), "{'AF': ['2.2.3.4', '2.2.3.5'], 'AS-JP': ['3.2.3.4', '3.2.3.5'], 'NA-US-CA': ['4.2.3.4', '4.2.3.5']}")
+
+
+if __name__ == '__main__':
+    unittest.main()

{octodns-cloudns-0.0.4 → octodns_cloudns-0.0.6}/octodns_cloudns.egg-info/requires.txt

@@ -2,15 +2,15 @@ octodns>=0.9.17
 requests>=2.27.0
 
 [dev]
+pytest
+pytest-cov
+pytest-network
+requests_mock
 black<24.0.0,>=23.1.0
 build>=0.7.0
 isort>=5.11.5
 pyflakes>=2.2.0
-pytest
-pytest-cov
-pytest-network
 readme_renderer[md]>=26.0
-requests_mock
 twine>=3.4.2
 
 [test]