🎉 Source Github - added user friendly messages, added AirbyteTracedException config_error

airbyte-integrations/connectors/source-github/source_github/schemas/assignees.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/branches.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/collaborators.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/comments.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/commit_comment_reactions.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "$ref": "reaction.json"
 }

airbyte-integrations/connectors/source-github/source_github/schemas/commit_comments.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/commits.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/deployments.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "url": {

airbyte-integrations/connectors/source-github/source_github/schemas/events.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/issue_comment_reactions.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "$ref": "reaction.json"
 }

airbyte-integrations/connectors/source-github/source_github/schemas/issue_events.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/issue_labels.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/issue_milestones.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/issue_reactions.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": ["null", "object"],
   "properties": {
     "id": {

airbyte-integrations/connectors/source-github/source_github/schemas/issues.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/organizations.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "login": {

airbyte-integrations/connectors/source-github/source_github/schemas/project_cards.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "https://json-schema.org/schema#",
   "type": "object",
   "properties": {
     "url": {

airbyte-integrations/connectors/source-github/source_github/schemas/project_columns.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "url": {

airbyte-integrations/connectors/source-github/source_github/schemas/projects.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_comment_reactions.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "id": {

airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_commits.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "sha": {

airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/pull_requests.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/releases.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/repositories.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "id": {

airbyte-integrations/connectors/source-github/source_github/schemas/review_comments.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/reviews.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/stargazers.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/tags.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "repository": {

airbyte-integrations/connectors/source-github/source_github/schemas/team_members.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "login": {

airbyte-integrations/connectors/source-github/source_github/schemas/team_memberships.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "state": {

airbyte-integrations/connectors/source-github/source_github/schemas/teams.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "organization": {

airbyte-integrations/connectors/source-github/source_github/schemas/users.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": ["null", "object"],
   "properties": {
     "organization": {

airbyte-integrations/connectors/source-github/source_github/schemas/workflow_jobs.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft-04/schema#",
   "type": "object",
   "properties": {
     "id": {

airbyte-integrations/connectors/source-github/source_github/schemas/workflow_runs.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft-04/schema#",
   "type": "object",
   "properties": {
     "id": {

airbyte-integrations/connectors/source-github/source_github/schemas/workflows.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft-04/schema#",
   "type": ["null", "object"],
   "properties": {
     "id": {

airbyte-integrations/connectors/source-github/source_github/source.py

@@ -2,14 +2,14 @@
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
-
 from typing import Any, Dict, List, Mapping, Tuple
 
 from airbyte_cdk import AirbyteLogger
-from airbyte_cdk.models import SyncMode
+from airbyte_cdk.models import FailureType, SyncMode
 from airbyte_cdk.sources import AbstractSource
 from airbyte_cdk.sources.streams import Stream
 from airbyte_cdk.sources.streams.http.auth import MultipleTokenAuthenticator
+from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 
 from .streams import (
     Assignees,
@@ -150,6 +150,21 @@ def _get_branches_data(selected_branches: str, full_refresh_args: Dict[str, Any]
 
         return default_branches, branches_to_pull
 
+    def user_friendly_error_message(self, message: str) -> str:
+        user_message = ""
+        if "404 Client Error: Not Found for url: https://api.github.com/repos/" in message:
+            # 404 Client Error: Not Found for url: https://api.github.com/repos/airbytehq/airbyte3?per_page=100
+            full_repo_name = message.split("https://api.github.com/repos/")[1].split("?")[0]
+            user_message = f'Repo name: "{full_repo_name}" is unknown, "repository" config option should use existing full repo name <organization>/<repository>'
+        elif "404 Client Error: Not Found for url: https://api.github.com/orgs/" in message:
+            # 404 Client Error: Not Found for url: https://api.github.com/orgs/airbytehqBLA/repos?per_page=100
+            org_name = message.split("https://api.github.com/orgs/")[1].split("/")[0]
+            user_message = f'Organization name: "{org_name}" is unknown, "repository" config option should be updated'
+        elif "401 Client Error: Unauthorized for url" in message:
+            # 401 Client Error: Unauthorized for url: https://api.github.com/orgs/datarootsio/repos?per_page=100&sort=updated&direction=desc
+            user_message = "Bad credentials, re-authentication or access token renewal is required"
+        return user_message
+
     def check_connection(self, logger: AirbyteLogger, config: Mapping[str, Any]) -> Tuple[bool, Any]:
         try:
             authenticator = self._get_authenticator(config)
@@ -160,24 +175,26 @@ def check_connection(self, logger: AirbyteLogger, config: Mapping[str, Any]) ->
 
         except Exception as e:
             message = repr(e)
-            if "404 Client Error: Not Found for url: https://api.github.com/repos/" in message:
-                # HTTPError('404 Client Error: Not Found for url: https://api.github.com/repos/airbytehq/airbyte3?per_page=100')"
-                full_repo_name = message.split("https://api.github.com/repos/")[1]
-                full_repo_name = full_repo_name.split("?")[0]
-                message = f'Unknown repo name: "{full_repo_name}", use existing full repo name <organization>/<repository>'
-            elif "404 Client Error: Not Found for url: https://api.github.com/orgs/" in message:
-                # HTTPError('404 Client Error: Not Found for url: https://api.github.com/orgs/airbytehqBLA/repos?per_page=100')"
-                org_name = message.split("https://api.github.com/orgs/")[1]
-                org_name = org_name.split("/")[0]
-                message = f'Unknown organization name: "{org_name}"'
-
-            return False, message
+            user_message = self.user_friendly_error_message(message)
+            return False, user_message or message
 
     def streams(self, config: Mapping[str, Any]) -> List[Stream]:
         authenticator = self._get_authenticator(config)
-        organizations, repositories = self._get_org_repositories(config=config, authenticator=authenticator)
+        try:
+            organizations, repositories = self._get_org_repositories(config=config, authenticator=authenticator)
+        except Exception as e:
+            message = repr(e)
+            user_message = self.user_friendly_error_message(message)
+            if user_message:
+                raise AirbyteTracedException(
+                    internal_message=message, message=user_message, failure_type=FailureType.config_error, exception=e
+                )
+            else:
+                raise e
+
         if not any((organizations, repositories)):
             raise Exception("No streams available. Please check permissions")
+
         page_size = config.get("page_size_for_large_streams", DEFAULT_PAGE_SIZE_FOR_LARGE_STREAM)
 
         organization_args = {"authenticator": authenticator, "organizations": organizations}

airbyte-integrations/connectors/source-github/source_github/streams.py

@@ -41,7 +41,6 @@ def __init__(self, repositories: List[str], page_size_for_large_streams: int, **
         MAX_RETRIES = 3
         adapter = requests.adapters.HTTPAdapter(max_retries=MAX_RETRIES)
         self._session.mount("https://", adapter)
-        self._session.mount("http://", adapter)
 
     @property
     def availability_strategy(self) -> Optional["AvailabilityStrategy"]: