octodns-cloudns 0.0.7__py3-none-any.whl → 0.0.11__py3-none-any.whl

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.7'
+__version__ = __VERSION__ = '0.0.11'
 
 class ClouDNSClientException(ProviderException):
     pass
@@ -44,7 +44,8 @@ class ClouDNSClientGeoDNSNotSupported(ClouDNSClientException):
 
 
 class ClouDNSClient(object):
-    def __init__(self, auth_id, auth_password, sub_auth=False):
+    def __init__(self, auth_id, auth_password, id, sub_auth=False):
+        self.log = getLogger(f"ClouDNSProvider[{id}]")
         session = Session()
         session.headers.update(
             {
@@ -75,9 +76,9 @@ class ClouDNSClient(object):
         
     def _raw_request(self, function, params=''):
         url = self._urlbase.format(function, params)
-        logger.debug(f"Request URL: {url}")
+        self.log.debug(f"Request URL: {url}")
         response = self._session.get(url)
-        logger.debug(f"Request Response: {response.text}")
+        self.log.debug(f"Request Response: {response.text}")
         return response
         
     def _handle_response(self, response):
@@ -117,7 +118,7 @@ class ClouDNSClient(object):
 
         single_types = ['CNAME', 'A', 'AAAA', 'DNAME', 'ALIAS', 'NS', 'PTR', 'SPF', 'TXT']
         if rrset_type in single_types:
-            params += '&record={}'.format(rrset_values[0].replace('\;', ';').replace('+', '%2B'))
+            params += '&record={}'.format(rrset_values[0].replace(r'\;', ';').replace('+', '%2B'))
             
         if(geodns is True):
             for location in rrset_locations:
@@ -241,11 +242,11 @@ class ClouDNSProvider(BaseProvider):
         ]
     )
 
-    def __init__(self, id, auth_id, auth_password, *args, **kwargs):
+    def __init__(self, id, auth_id, auth_password, sub_auth=False, *args, **kwargs):
         self.log = getLogger(f"ClouDNSProvider[{id}]")
-        self.log.debug("__init__: id=%s, auth_id=***", id)
+        self.log.debug("__init__: id=%s, auth_id=***, auth_password=***, sub_auth=%s", id, sub_auth)
         super().__init__(id, *args, **kwargs)
-        self._client = ClouDNSClient(auth_id, auth_password)
+        self._client = ClouDNSClient(auth_id, auth_password, id, sub_auth)
 
         self._zone_records = {}
 
@@ -371,27 +372,10 @@ class ClouDNSProvider(BaseProvider):
 
         values = defaultdict(lambda: defaultdict(list))
         records_data = self.zone_records(zone)
-        
+
         if 'status' in records_data and records_data['status'] == 'Failed':
-            self.log.info("populate: no existing zone, trying to create it")
-            response = self._client.zone_create(zone.name[:-1], 'master')
-            if 'id' in response and response['id'] == 'not_found':
-                e = ClouDNSClientUnknownDomainName(
-                    'Missing domain name'
-                )
-                e.__cause__ = None
-                raise e
-            
-            if (self.isGeoDNS(response['statusDescription'])):
-                response = self._client.zone_create(zone.name[:-1], 'geodns')
-            
-            if(response['status'] == 'Failed'):
-                e = ClouDNSClientUnknownDomainName(f"{response['status']} : {response['statusDescription']}")
-                e.__cause__ = None
-                raise e
-            self.log.info("populate: zone has been successfully created")
-            records_data = self._client.zone_records(zone.name[:-1])
-            
+            return []
+
         for record_id, record in records_data.items():
             _type = record["type"]
             
@@ -412,7 +396,7 @@ class ClouDNSProvider(BaseProvider):
                 )
                 zone.add_record(record, lenient=lenient)
         exists = zone.name in self._zone_records
-        print(
+        self.log.debug(
             "populate:   found %s records, exists=%s",
             len(zone.records) - before,
             exists,
@@ -644,6 +628,13 @@ class ClouDNSProvider(BaseProvider):
                             and value.precision_vert == record['v_precision']
                         ):
                             record_ids.append(record_id)
+                elif existing._type == 'CNAME' and record['type'] == 'CNAME':
+                    if (
+                            existing.name == record['host']
+                            and existing._type == record['type']
+                            and existing.value == record['record']+'.'
+                    ):
+                        record_ids.append(record_id)
                 else:
                     if (record == 'Failed' or record == 'Missing domain-name'):
                         continue
@@ -679,27 +670,24 @@ class ClouDNSProvider(BaseProvider):
         desired = plan.desired
         
         changes = plan.changes
-        zone = desired.name[:-1]
+        zone_name = desired.name[:-1]
         self.log.debug("_apply: zone=%s, len(changes)=%d", desired.name, len(changes))
 
-        try:
-            self._client.zone(zone)
-        except ClouDNSClientNotFound:
-            self.log.info("_apply: no existing zone, trying to create it")
-            try:
-                self._client.zone_create(zone, 'master')
-                self.log.info("_apply: zone has been successfully created")
-            except ClouDNSClientNotFound:
-                e = ClouDNSClientUnknownDomainName(
-                    "Domain " + zone + " is not "
-                    "registered at ClouDNS. "
-                    "Please register or "
-                    "transfer it here "
-                    "to be able to manage its "
-                    "DNS zone."
-                )
-                e.__cause__ = None
-                raise e
+        # Does the zone actually exist?
+        zone = self._client.zone(zone_name)
+        if zone['status'] == 'Failed':
+            # All errors other than nonexistent zone.
+            if not zone['statusDescription'] == 'Missing domain-name':
+                raise ClouDNSClientException(zone)
+
+            # Check if subscription only allows GeoDNS zones.
+            geodns_only = self.isGeoDNS(zone['statusDescription'])
+
+            # Trying to create the zone.
+            zone = self._client.zone_create(zone_name, 'geodns' if geodns_only else 'master')
+            if zone['status'] == 'Failed':
+                raise ClouDNSClientException(zone)
+            self.log.info("_apply: zone has been successfully created")
 
         for change in changes:
             class_name = change.__class__.__name__

{octodns_cloudns-0.0.7.dist-info → octodns_cloudns-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: octodns-cloudns
-Version: 0.0.7
+Version: 0.0.11
 Summary: ClouDNS API provider for octoDNS
 Home-page: https://github.com/octodns/octodns-cloudns
 Author: ClouDNS
@@ -40,28 +40,30 @@ An [octoDNS](https://github.com/octodns/octodns/) provider that targets ClouDNS.
 pip install octodns-cloudns
 ```
 
-#### requirements.txt/setup.py
-
-Pinning specific versions or SHAs is recommended to avoid unplanned upgrades.
+### Configuration
 
-##### Versions
+For more safety, we recommend you to use an API sub-user with limited permissions.
+You can create it from [your ClouDNS account](https://www.cloudns.net/api-settings/)
+and store your credentials in environment variables:
 
-```
-# Start with the latest versions and don't just copy what's here
-octodns==0.9.14
-octodns-cloudns==0.0.1
+```bash
+export CLOUDNS_API_AUTH_ID=XXXXX
+export CLOUDNS_API_AUTH_PASSWORD=XXXXX
 ```
 
-### Configuration
+Then add your ClouDNS account to your octoDNS configuration file:
 
 ```yaml
 providers:
   cloudns_account:
-    class: octodns.provider.cloudns.ClouDNSProvider
-    auth_id: <api_auth_id>
-    auth_password: <api_auth_password>
+    class: octodns_cloudns.ClouDNSProvider
+    auth_id: env/CLOUDNS_API_AUTH_ID
+    auth_password: env/CLOUDNS_API_AUTH_PASSWORD
+    # "sub_auth" must be enabled if *only* you log in using a sub-user.
+    sub_auth: true
 ```
 
+
 ### Support Information
 
 #### GeoDNS records

octodns_cloudns-0.0.11.dist-info/RECORD

@@ -0,0 +1,6 @@
+octodns_cloudns/__init__.py,sha256=V9YpwsD5Zr_Ar_ScNPyP7g0HUPIYDkA_NO-H6crQd08,27446
+octodns_cloudns-0.0.11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+octodns_cloudns-0.0.11.dist-info/METADATA,sha256=s716VVNH2DbEJ7h5b7LaXJWiqBmYnb18w5JJU_S-48w,2625
+octodns_cloudns-0.0.11.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
+octodns_cloudns-0.0.11.dist-info/top_level.txt,sha256=t-gGz4zcl1yUE6hyw-aaR6KggpKY25v5xwsSJw-zBdY,16
+octodns_cloudns-0.0.11.dist-info/RECORD,,

{octodns_cloudns-0.0.7.dist-info → octodns_cloudns-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.3.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

octodns_cloudns-0.0.7.dist-info/RECORD

@@ -1,6 +0,0 @@
-octodns_cloudns/__init__.py,sha256=9sjFwxl8YsQvY72Fzu3scPqJzbA4wITiUfMYjtyZ9IM,27844
-octodns_cloudns-0.0.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-octodns_cloudns-0.0.7.dist-info/METADATA,sha256=36DM7VzJyeSqvlSatYuLqtod8401_noGLUcJSbcJ_rQ,2387
-octodns_cloudns-0.0.7.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-octodns_cloudns-0.0.7.dist-info/top_level.txt,sha256=t-gGz4zcl1yUE6hyw-aaR6KggpKY25v5xwsSJw-zBdY,16
-octodns_cloudns-0.0.7.dist-info/RECORD,,