From af22e8c9c7323605737768ff14ae8a276099c327 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Tue, 31 Aug 2021 19:39:04 -0700 Subject: [PATCH] Use ProviderException as the base for all provider exception classes --- octodns/provider/azuredns.py | 3 ++- octodns/provider/cloudflare.py | 3 ++- octodns/provider/constellix.py | 3 ++- octodns/provider/digitalocean.py | 3 ++- octodns/provider/dnsimple.py | 3 ++- octodns/provider/dnsmadeeasy.py | 3 ++- octodns/provider/easydns.py | 3 ++- octodns/provider/edgedns.py | 3 ++- octodns/provider/gandi.py | 3 ++- octodns/provider/gcore.py | 3 ++- octodns/provider/hetzner.py | 3 ++- octodns/provider/mythicbeasts.py | 5 +++-- octodns/provider/ns1.py | 3 ++- octodns/provider/route53.py | 3 ++- octodns/provider/selectel.py | 3 ++- octodns/provider/transip.py | 3 ++- octodns/provider/ultra.py | 3 ++- 17 files changed, 35 insertions(+), 18 deletions(-) diff --git a/octodns/provider/azuredns.py b/octodns/provider/azuredns.py index 20a9d7b..0b4e1c9 100644 --- a/octodns/provider/azuredns.py +++ b/octodns/provider/azuredns.py @@ -20,10 +20,11 @@ from azure.mgmt.trafficmanager.models import Profile, DnsConfig, \ import logging from functools import reduce from ..record import Record, Update, GeoCodes +from . import ProviderException from .base import BaseProvider -class AzureException(Exception): +class AzureException(ProviderException): pass diff --git a/octodns/provider/cloudflare.py b/octodns/provider/cloudflare.py index ad057eb..a774acc 100644 --- a/octodns/provider/cloudflare.py +++ b/octodns/provider/cloudflare.py @@ -13,10 +13,11 @@ from time import sleep from urllib.parse import urlsplit from ..record import Record, Update +from . import ProviderException from .base import BaseProvider -class CloudflareError(Exception): +class CloudflareError(ProviderException): def __init__(self, data): try: message = data['errors'][0]['message'] diff --git a/octodns/provider/constellix.py b/octodns/provider/constellix.py index cd0d85b..14a7e49 100644 --- a/octodns/provider/constellix.py +++ b/octodns/provider/constellix.py @@ -15,10 +15,11 @@ import logging import time from ..record import Record +from . import ProviderException from .base import BaseProvider -class ConstellixClientException(Exception): +class ConstellixClientException(ProviderException): pass diff --git a/octodns/provider/digitalocean.py b/octodns/provider/digitalocean.py index 6ccee1d..fe31754 100644 --- a/octodns/provider/digitalocean.py +++ b/octodns/provider/digitalocean.py @@ -10,10 +10,11 @@ from requests import Session import logging from ..record import Record +from . import ProviderException from .base import BaseProvider -class DigitalOceanClientException(Exception): +class DigitalOceanClientException(ProviderException): pass diff --git a/octodns/provider/dnsimple.py b/octodns/provider/dnsimple.py index a4b9350..009e829 100644 --- a/octodns/provider/dnsimple.py +++ b/octodns/provider/dnsimple.py @@ -10,10 +10,11 @@ from requests import Session import logging from ..record import Record +from . import ProviderException from .base import BaseProvider -class DnsimpleClientException(Exception): +class DnsimpleClientException(ProviderException): pass diff --git a/octodns/provider/dnsmadeeasy.py b/octodns/provider/dnsmadeeasy.py index b222b5c..ddd40d2 100644 --- a/octodns/provider/dnsmadeeasy.py +++ b/octodns/provider/dnsmadeeasy.py @@ -13,10 +13,11 @@ import hmac import logging from ..record import Record +from . import ProviderException from .base import BaseProvider -class DnsMadeEasyClientException(Exception): +class DnsMadeEasyClientException(ProviderException): pass diff --git a/octodns/provider/easydns.py b/octodns/provider/easydns.py index d7a75a4..67c846a 100644 --- a/octodns/provider/easydns.py +++ b/octodns/provider/easydns.py @@ -12,10 +12,11 @@ import logging import base64 from ..record import Record +from . import ProviderException from .base import BaseProvider -class EasyDNSClientException(Exception): +class EasyDNSClientException(ProviderException): pass diff --git a/octodns/provider/edgedns.py b/octodns/provider/edgedns.py index 26f0917..1dde770 100644 --- a/octodns/provider/edgedns.py +++ b/octodns/provider/edgedns.py @@ -12,10 +12,11 @@ from collections import defaultdict from logging import getLogger from ..record import Record +from . import ProviderException from .base import BaseProvider -class AkamaiClientNotFound(Exception): +class AkamaiClientNotFound(ProviderException): def __init__(self, resp): message = "404: Resource not found" diff --git a/octodns/provider/gandi.py b/octodns/provider/gandi.py index 8401ea4..0938ac9 100644 --- a/octodns/provider/gandi.py +++ b/octodns/provider/gandi.py @@ -10,10 +10,11 @@ from requests import Session import logging from ..record import Record +from . import ProviderException from .base import BaseProvider -class GandiClientException(Exception): +class GandiClientException(ProviderException): pass diff --git a/octodns/provider/gcore.py b/octodns/provider/gcore.py index bbbf81f..b76f90e 100644 --- a/octodns/provider/gcore.py +++ b/octodns/provider/gcore.py @@ -17,10 +17,11 @@ import urllib.parse from ..record import GeoCodes from ..record import Record +from . import ProviderException from .base import BaseProvider -class GCoreClientException(Exception): +class GCoreClientException(ProviderException): def __init__(self, r): super(GCoreClientException, self).__init__(r.text) diff --git a/octodns/provider/hetzner.py b/octodns/provider/hetzner.py index 53914f5..b1b2884 100644 --- a/octodns/provider/hetzner.py +++ b/octodns/provider/hetzner.py @@ -10,10 +10,11 @@ from requests import Session import logging from ..record import Record +from . import ProviderException from .base import BaseProvider -class HetznerClientException(Exception): +class HetznerClientException(ProviderException): pass diff --git a/octodns/provider/mythicbeasts.py b/octodns/provider/mythicbeasts.py index e1a2b04..683209d 100644 --- a/octodns/provider/mythicbeasts.py +++ b/octodns/provider/mythicbeasts.py @@ -11,6 +11,7 @@ from requests import Session from logging import getLogger from ..record import Record +from . import ProviderException from .base import BaseProvider from collections import defaultdict @@ -34,7 +35,7 @@ def remove_trailing_dot(value): return value[:-1] -class MythicBeastsUnauthorizedException(Exception): +class MythicBeastsUnauthorizedException(ProviderException): def __init__(self, zone, *args): self.zone = zone self.message = 'Mythic Beasts unauthorized for zone: {}'.format( @@ -45,7 +46,7 @@ class MythicBeastsUnauthorizedException(Exception): self.message, self.zone, *args) -class MythicBeastsRecordException(Exception): +class MythicBeastsRecordException(ProviderException): def __init__(self, zone, command, *args): self.zone = zone self.command = command diff --git a/octodns/provider/ns1.py b/octodns/provider/ns1.py index 38b9240..8c09f39 100644 --- a/octodns/provider/ns1.py +++ b/octodns/provider/ns1.py @@ -17,6 +17,7 @@ from uuid import uuid4 from six import text_type from ..record import Record, Update +from . import ProviderException from .base import BaseProvider @@ -24,7 +25,7 @@ def _ensure_endswith_dot(string): return string if string.endswith('.') else '{}.'.format(string) -class Ns1Exception(Exception): +class Ns1Exception(ProviderException): pass diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py index b4bd557..14d15ce 100644 --- a/octodns/provider/route53.py +++ b/octodns/provider/route53.py @@ -20,6 +20,7 @@ from ..equality import EqualityTupleMixin from ..record import Record, Update from ..record.geo import GeoCodes from ..zone import Zone +from . import ProviderException from .base import BaseProvider octal_re = re.compile(r'\\(\d\d\d)') @@ -513,7 +514,7 @@ class _Route53GeoRecord(_Route53Record): self.values) -class Route53ProviderException(Exception): +class Route53ProviderException(ProviderException): pass diff --git a/octodns/provider/selectel.py b/octodns/provider/selectel.py index b9a99aa..87f8d4f 100644 --- a/octodns/provider/selectel.py +++ b/octodns/provider/selectel.py @@ -12,6 +12,7 @@ from logging import getLogger from requests import Session from ..record import Record, Update +from . import ProviderException from .base import BaseProvider @@ -20,7 +21,7 @@ def escape_semicolon(s): return s.replace(';', '\\;') -class SelectelAuthenticationRequired(Exception): +class SelectelAuthenticationRequired(ProviderException): def __init__(self, msg): message = 'Authorization failed. Invalid or empty token.' super(SelectelAuthenticationRequired, self).__init__(message) diff --git a/octodns/provider/transip.py b/octodns/provider/transip.py index 6ccbe22..2bdedc4 100644 --- a/octodns/provider/transip.py +++ b/octodns/provider/transip.py @@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function, \ from suds import WebFault from collections import defaultdict +from . import ProviderException from .base import BaseProvider from logging import getLogger from ..record import Record @@ -15,7 +16,7 @@ from transip.service.domain import DomainService from transip.service.objects import DnsEntry -class TransipException(Exception): +class TransipException(ProviderException): pass diff --git a/octodns/provider/ultra.py b/octodns/provider/ultra.py index afa4d0a..e382a33 100644 --- a/octodns/provider/ultra.py +++ b/octodns/provider/ultra.py @@ -3,10 +3,11 @@ from logging import getLogger from requests import Session from ..record import Record +from . import ProviderException from .base import BaseProvider -class UltraClientException(Exception): +class UltraClientException(ProviderException): ''' Base Ultra exception type '''