ref(ecosystem): use new base class for integration client (#17784)

Author: Stephen Cefali

src/sentry/api/endpoints/group_integration_details.py

@@ -9,7 +9,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models.integration import IntegrationIssueConfigSerializer
 from sentry.integrations import IntegrationFeatures
-from sentry.integrations.exceptions import IntegrationError, IntegrationFormError
+from sentry.shared_integrations.exceptions import IntegrationError, IntegrationFormError
 from sentry.models import Activity, ExternalIssue, GroupLink, Integration
 from sentry.signals import integration_issue_created, integration_issue_linked
 

src/sentry/api/endpoints/organization_integration_details.py

@@ -7,7 +7,7 @@
 
 from sentry.api.bases.organization import OrganizationEndpoint, OrganizationIntegrationsPermission
 from sentry.api.serializers import serialize
-from sentry.integrations.exceptions import IntegrationError
+from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.models import Integration, ObjectStatus, OrganizationIntegration
 from sentry.tasks.deletion import delete_organization_integration
 

src/sentry/api/endpoints/organization_integration_repos.py

@@ -5,7 +5,7 @@
 
 from sentry.constants import ObjectStatus
 from sentry.api.bases.organization import OrganizationEndpoint, OrganizationIntegrationsPermission
-from sentry.integrations.exceptions import IntegrationError
+from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.integrations.repositories import RepositoryMixin
 from sentry.models import Integration
 

src/sentry/identity/oauth2.py

@@ -12,7 +12,7 @@
 
 from sentry.auth.exceptions import IdentityNotValid
 from sentry.http import safe_urlopen, safe_urlread
-from sentry.integrations.exceptions import ApiError
+from sentry.shared_integrations.exceptions import ApiError
 from sentry.utils import json
 from sentry.utils.http import absolute_uri
 from sentry.pipeline import PipelineView

src/sentry/integrations/base.py

@@ -18,15 +18,19 @@
 from sentry.exceptions import InvalidIdentity
 from sentry.pipeline import PipelineProvider
 
-from .exceptions import (
+from sentry.shared_integrations.exceptions import (
     ApiHostError,
     ApiError,
     ApiUnauthorized,
     IntegrationError,
     IntegrationFormError,
     UnsupportedResponseType,
 )
-from .constants import ERR_UNAUTHORIZED, ERR_INTERNAL, ERR_UNSUPPORTED_RESPONSE_TYPE
+from sentry.shared_integrations.constants import (
+    ERR_UNAUTHORIZED,
+    ERR_INTERNAL,
+    ERR_UNSUPPORTED_RESPONSE_TYPE,
+)
 from sentry.models import Identity, OrganizationIntegration
 
 

src/sentry/integrations/bitbucket/integration.py

@@ -16,7 +16,7 @@
 from sentry.identity.pipeline import IdentityProviderPipeline
 from django.utils.translation import ugettext_lazy as _
 
-from sentry.integrations.exceptions import ApiError
+from sentry.shared_integrations.exceptions import ApiError
 from sentry.models import Repository
 from sentry.tasks.integrations import migrate_repo
 from sentry.utils.http import absolute_uri

src/sentry/integrations/bitbucket/issues.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from django.core.urlresolvers import reverse
 from sentry.integrations.issues import IssueBasicMixin
-from sentry.integrations.exceptions import ApiError, IntegrationFormError
+from sentry.shared_integrations.exceptions import ApiError, IntegrationFormError
 
 
 ISSUE_TYPES = (

src/sentry/integrations/bitbucket/repository.py

@@ -7,7 +7,7 @@
 from sentry.models import Integration
 from sentry.utils.http import absolute_uri
 
-from sentry.integrations.exceptions import ApiError, IntegrationError
+from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.models.apitoken import generate_token
 
 from .webhook import parse_raw_user_email, parse_raw_user_name

src/sentry/integrations/bitbucket/search.py

@@ -6,7 +6,7 @@
 from rest_framework.response import Response
 
 from sentry.api.bases.integration import IntegrationEndpoint
-from sentry.integrations.exceptions import ApiError
+from sentry.shared_integrations.exceptions import ApiError
 from sentry.models import Integration
 
 logger = logging.getLogger("sentry.integrations.bitbucket")

src/sentry/integrations/bitbucket_server/client.py

@@ -3,7 +3,8 @@
 from oauthlib.oauth1 import SIGNATURE_RSA
 from requests_oauthlib import OAuth1
 from six.moves.urllib.parse import parse_qsl
-from sentry.integrations.client import ApiClient, ApiError
+from sentry.integrations.client import ApiClient
+from sentry.shared_integrations.exceptions import ApiError
 
 
 class BitbucketServerAPIPath(object):

src/sentry/integrations/bitbucket_server/integration.py

@@ -20,7 +20,7 @@
 from sentry.pipeline import PipelineView
 from sentry.utils.compat import filter
 from django.utils.translation import ugettext_lazy as _
-from sentry.integrations.exceptions import ApiError
+from sentry.shared_integrations.exceptions import ApiError
 from sentry.models.repository import Repository
 from sentry.tasks.integrations import migrate_repo
 from sentry.web.helpers import render_to_response

src/sentry/integrations/bitbucket_server/repository.py

@@ -9,7 +9,7 @@
 from sentry.models.integration import Integration
 from sentry.plugins.providers.integration_repository import IntegrationRepositoryProvider
 from sentry.utils.http import absolute_uri
-from sentry.integrations.exceptions import ApiError, IntegrationError
+from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.utils.hashlib import md5_text
 
 
@@ -104,7 +104,9 @@ def _format_commits(self, client, repo, commit_list):
                 "author_name": c["author"].get("displayName", c["author"]["name"]),
                 "message": c["message"],
                 "timestamp": datetime.fromtimestamp(c["authorTimestamp"] / 1000, timezone.utc),
-                "patch_set": self._get_patchset(client, repo.config["project"], repo.config["repo"], c["id"]),
+                "patch_set": self._get_patchset(
+                    client, repo.config["project"], repo.config["repo"], c["id"]
+                ),
             }
             for c in commit_list["values"]
         ]