🐛 Source Github, Instagram, Zendesk Support / Talk - revert spec changes and improve (#29031)

Baz · jbfbell · commit 0e945f1b4f56 · 2023-08-04T17:26:50.000-07:00
diff --git a/airbyte-integrations/connectors/source-github/Dockerfile b/airbyte-integrations/connectors/source-github/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=1.0.3
+LABEL io.airbyte.version=1.0.4
 LABEL io.airbyte.name=airbyte/source-github
diff --git a/airbyte-integrations/connectors/source-github/metadata.yaml b/airbyte-integrations/connectors/source-github/metadata.yaml
@@ -5,7 +5,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: ef69ef6e-aa7f-4af1-a01d-ef775033524e
-  dockerImageTag: 1.0.3
+  dockerImageTag: 1.0.4
   maxSecondsBetweenMessages: 5400
   dockerRepository: airbyte/source-github
   githubIssueLabel: source-github
diff --git a/airbyte-integrations/connectors/source-github/source_github/spec.json b/airbyte-integrations/connectors/source-github/source_github/spec.json
@@ -29,6 +29,18 @@
                 "title": "Access Token",
                 "description": "OAuth access token",
                 "airbyte_secret": true
+              },
+              "client_id": {
+                "type": "string",
+                "title": "Client Id",
+                "description": "OAuth Client Id",
+                "airbyte_secret": true
+              },
+              "client_secret": {
+                "type": "string",
+                "title": "Client ssecret",
+                "description": "OAuth Client secret",
+                "airbyte_secret": true
               }
             }
           },
@@ -117,6 +129,20 @@
             "type": "string"
           }
         }
+      },
+      "complete_oauth_server_output_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "client_id": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_id"]
+          },
+          "client_secret": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_secret"]
+          }
+        }
       }
     }
   }
diff --git a/airbyte-integrations/connectors/source-instagram/Dockerfile b/airbyte-integrations/connectors/source-instagram/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=1.0.10
+LABEL io.airbyte.version=1.0.11
 LABEL io.airbyte.name=airbyte/source-instagram
diff --git a/airbyte-integrations/connectors/source-instagram/acceptance-test-config.yml b/airbyte-integrations/connectors/source-instagram/acceptance-test-config.yml
@@ -59,6 +59,13 @@ acceptance_tests:
     tests:
       - config_path: "secrets/config.json"
         configured_catalog_path: "integration_tests/configured_catalog.json"
+        ignored_fields:
+          user_lifetime_insights:
+            - name: value
+              bypass_reason: Floating values from sync-to-sync, due to live updating info.
+          user_insights:
+            - name: profile_views
+              bypass_reason: Floating values from sync-to-sync, due to live updating info.
   incremental:
     tests:
       - config_path: "secrets/config.json"
diff --git a/airbyte-integrations/connectors/source-instagram/integration_tests/spec.json b/airbyte-integrations/connectors/source-instagram/integration_tests/spec.json
@@ -18,6 +18,20 @@
         "description": "The value of the access token generated with <b>instagram_basic, instagram_manage_insights, pages_show_list, pages_read_engagement, Instagram Public Content Access</b> permissions. See the <a href=\"https://docs.airbyte.com/integrations/sources/instagram/#step-1-set-up-instagram\">docs</a> for more information",
         "airbyte_secret": true,
         "type": "string"
+      },
+      "client_id": {
+        "title": "Client Id",
+        "description": "The Client ID for your Oauth application",
+        "airbyte_secret": true,
+        "airbyte_hidden": true,
+        "type": "string"
+      },
+      "client_secret": {
+        "title": "Client Secret",
+        "description": "The Client Secret for your Oauth application",
+        "airbyte_secret": true,
+        "airbyte_hidden": true,
+        "type": "string"
       }
     },
     "required": ["start_date", "access_token"]
@@ -48,6 +62,23 @@
             "type": "string"
           }
         }
+      },
+      "complete_oauth_server_output_specification": {
+        "type": "object",
+        "properties": {
+          "client_id": {
+            "type": "string",
+            "path_in_connector_config": [
+              "client_id"
+            ]
+          },
+          "client_secret": {
+            "type": "string",
+            "path_in_connector_config": [
+              "client_secret"
+            ]
+          }
+        }
       }
     }
   }
diff --git a/airbyte-integrations/connectors/source-instagram/metadata.yaml b/airbyte-integrations/connectors/source-instagram/metadata.yaml
@@ -5,7 +5,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: 6acf6b55-4f1e-4fca-944e-1a3caef8aba8
-  dockerImageTag: 1.0.10
+  dockerImageTag: 1.0.11
   dockerRepository: airbyte/source-instagram
   githubIssueLabel: source-instagram
   icon: instagram.svg
diff --git a/airbyte-integrations/connectors/source-instagram/source_instagram/source.py b/airbyte-integrations/connectors/source-instagram/source_instagram/source.py
@@ -3,7 +3,7 @@
 #
 
 from datetime import datetime
-from typing import Any, List, Mapping, Tuple
+from typing import Any, List, Mapping, Optional, Tuple
 
 from airbyte_cdk.models import AdvancedAuth, ConnectorSpecification, DestinationSyncMode, OAuthConfigSpecification
 from airbyte_cdk.sources import AbstractSource
@@ -34,6 +34,18 @@ class Config:
         airbyte_secret=True,
     )
 
+    client_id: Optional[str] = Field(
+        description=("The Client ID for your Oauth application"),
+        airbyte_secret=True,
+        airbyte_hidden=True,
+    )
+
+    client_secret: Optional[str] = Field(
+        description=("The Client Secret for your Oauth application"),
+        airbyte_secret=True,
+        airbyte_hidden=True,
+    )
+
 
 class SourceInstagram(AbstractSource):
     def check_connection(self, logger, config: Mapping[str, Any]) -> Tuple[bool, Any]:
@@ -96,6 +108,13 @@ def spec(self, *args, **kwargs) -> ConnectorSpecification:
                         "type": "object",
                         "properties": {"client_id": {"type": "string"}, "client_secret": {"type": "string"}},
                     },
+                    complete_oauth_server_output_specification={
+                        "type": "object",
+                        "properties": {
+                            "client_id": {"type": "string", "path_in_connector_config": ["client_id"]},
+                            "client_secret": {"type": "string", "path_in_connector_config": ["client_secret"]},
+                        },
+                    },
                 ),
             ),
         )
diff --git a/airbyte-integrations/connectors/source-zendesk-support/Dockerfile b/airbyte-integrations/connectors/source-zendesk-support/Dockerfile
@@ -25,5 +25,5 @@ COPY source_zendesk_support ./source_zendesk_support
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.10.5
+LABEL io.airbyte.version=0.10.6
 LABEL io.airbyte.name=airbyte/source-zendesk-support
diff --git a/airbyte-integrations/connectors/source-zendesk-support/metadata.yaml b/airbyte-integrations/connectors/source-zendesk-support/metadata.yaml
@@ -7,7 +7,7 @@ data:
   connectorType: source
   maxSecondsBetweenMessages: 10800
   definitionId: 79c1aa37-dae3-42ae-b333-d1c105477715
-  dockerImageTag: 0.10.5
+  dockerImageTag: 0.10.6
   dockerRepository: airbyte/source-zendesk-support
   githubIssueLabel: source-zendesk-support
   icon: zendesk-support.svg
diff --git a/airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/spec.json b/airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/spec.json
@@ -41,6 +41,18 @@
                 "title": "Access Token",
                 "description": "The value of the API token generated. See the <a href=\"https://docs.airbyte.com/integrations/sources/zendesk-support\">docs</a> for more information.",
                 "airbyte_secret": true
+              },
+              "client_id": {
+                "type": "string",
+                "title": "Client ID",
+                "description": "Client ID",
+                "airbyte_secret": true
+              },
+              "client_secret": {
+                "type": "string",
+                "title": "Client Secret",
+                "description": "Client Secret",
+                "airbyte_secret": true
               }
             }
           },
@@ -106,6 +118,20 @@
           }
         }
       },
+      "complete_oauth_server_output_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "client_id": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_id"]
+          },
+          "client_secret": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_secret"]
+          }
+        }
+      },
       "oauth_user_input_from_connector_config_specification": {
         "type": "object",
         "additionalProperties": false,
diff --git a/airbyte-integrations/connectors/source-zendesk-talk/Dockerfile b/airbyte-integrations/connectors/source-zendesk-talk/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.8
+LABEL io.airbyte.version=0.1.9
 LABEL io.airbyte.name=airbyte/source-zendesk-talk
diff --git a/airbyte-integrations/connectors/source-zendesk-talk/metadata.yaml b/airbyte-integrations/connectors/source-zendesk-talk/metadata.yaml
@@ -6,7 +6,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: c8630570-086d-4a40-99ae-ea5b18673071
-  dockerImageTag: 0.1.8
+  dockerImageTag: 0.1.9
   dockerRepository: airbyte/source-zendesk-talk
   githubIssueLabel: source-zendesk-talk
   icon: zendesk-talk.svg
diff --git a/airbyte-integrations/connectors/source-zendesk-talk/source_zendesk_talk/spec.json b/airbyte-integrations/connectors/source-zendesk-talk/source_zendesk_talk/spec.json
@@ -57,6 +57,18 @@
                 "title": "Access Token",
                 "description": "The value of the API token generated. See the <a href=\"https://docs.airbyte.com/integrations/sources/zendesk-talk\">docs</a> for more information.",
                 "airbyte_secret": true
+              },
+              "client_id": {
+                "type": "string",
+                "title": "Client ID",
+                "description": "Client ID",
+                "airbyte_secret": true
+              },
+              "client_secret": {
+                "type": "string",
+                "title": "Client Secret",
+                "description": "Client Secret",
+                "airbyte_secret": true
               }
             }
           }
@@ -100,6 +112,20 @@
           }
         }
       },
+      "complete_oauth_server_output_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "client_id": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_id"]
+          },
+          "client_secret": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_secret"]
+          }
+        }
+      },
       "oauth_user_input_from_connector_config_specification": {
         "type": "object",
         "additionalProperties": false,
diff --git a/docs/integrations/sources/github.md b/docs/integrations/sources/github.md
@@ -163,6 +163,7 @@ The GitHub connector should not run into GitHub API limitations under normal usa
 
 | Version | Date       | Pull Request                                                                                                      | Subject                                                                                                                                                             |
 |:--------|:-----------|:------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 1.0.4   | 2023-08-03 | [29031](https://github.com/airbytehq/airbyte/pull/29031) | Reverted `advancedAuth` spec changes  |
 | 1.0.3   | 2023-08-01 | [28910](https://github.com/airbytehq/airbyte/pull/28910) | Updated `advancedAuth` broken references  |
 | 1.0.2   | 2023-07-11 | [28144](https://github.com/airbytehq/airbyte/pull/28144)                                                          | Add `archived_at` property to `Organizations` schema parameter                                                                                                                               |
 | 1.0.1   | 2023-05-22 | [25838](https://github.com/airbytehq/airbyte/pull/25838)                                                          | Deprecate "page size" input parameter                                                                                                                               |
diff --git a/docs/integrations/sources/instagram.md b/docs/integrations/sources/instagram.md
@@ -82,6 +82,7 @@ AirbyteRecords are required to conform to the [Airbyte type](https://docs.airbyt
 
 | Version | Date | Pull Request | Subject |
 |:--------|:-----|:-------------|:--------|
+| 1.0.11   | 2023-08-03 | [29031](https://github.com/airbytehq/airbyte/pull/29031) | Reverted `advancedAuth` spec changes  |
 | 1.0.10   | 2023-08-01 | [28910](https://github.com/airbytehq/airbyte/pull/28910) | Updated `advancedAuth` broken references  |
 | 1.0.9   | 2023-07-01 | [27908](https://github.com/airbytehq/airbyte/pull/27908) | Fix bug when `user_lifetime_insights` stream returns `Key Error (end_time)`, refactored `state` to use `IncrementalMixin`  |
 | 1.0.8   | 2023-05-26 | [26767](https://github.com/airbytehq/airbyte/pull/26767) | Handle permission error for `insights`  |
diff --git a/docs/integrations/sources/zendesk-support.md b/docs/integrations/sources/zendesk-support.md
@@ -79,6 +79,7 @@ The Zendesk connector ideally should not run into Zendesk API limitations under
 
 | Version  | Date       | Pull Request                                             | Subject                                                                                                                                                                                                                            |
 |:---------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `0.10.6` | 2023-08-04 | [29031](https://github.com/airbytehq/airbyte/pull/29031) | Reverted `advancedAuth` spec changes |
 | `0.10.5` | 2023-08-01 | [28910](https://github.com/airbytehq/airbyte/pull/28910) | Updated `advancedAuth` broken references |
 | `0.10.4` | 2023-07-25 | [28397](https://github.com/airbytehq/airbyte/pull/28397) | Handle 404 Error                                                                                                                                                                                                                   |
 | `0.10.3` | 2023-07-24 | [28612](https://github.com/airbytehq/airbyte/pull/28612) | Fix pagination for stream `TicketMetricEvents`                                                                                                                                                                                     |
diff --git a/docs/integrations/sources/zendesk-talk.md b/docs/integrations/sources/zendesk-talk.md
@@ -76,6 +76,7 @@ The Zendesk connector should not run into Zendesk API limitations under normal u
 
 | Version | Date       | Pull Request | Subject                           |
 |:--------|:-----------| :-----       |:----------------------------------|
+| `0.1.9` | 2023-08-03 | [29031](https://github.com/airbytehq/airbyte/pull/29031) | Reverted `advancedAuth` spec changes |
 | `0.1.8` | 2023-08-01 | [28910](https://github.com/airbytehq/airbyte/pull/28910) | Updated `advancedAuth` broken references |
 | `0.1.7` | 2023-02-10 | [22815](https://github.com/airbytehq/airbyte/pull/22815) | Specified date formatting in specification                                                     |
 | `0.1.6` | 2023-01-27 | [22028](https://github.com/airbytehq/airbyte/pull/22028) | Set `AvailabilityStrategy` for streams explicitly to `None`                                                     |

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,18 @@`
`29`	`29`	`"title": "Access Token",`
`30`	`30`	`"description": "OAuth access token",`
`31`	`31`	`"airbyte_secret": true`
	`32`	`+ },`
	`33`	`+ "client_id": {`
	`34`	`+ "type": "string",`
	`35`	`+ "title": "Client Id",`
	`36`	`+ "description": "OAuth Client Id",`
	`37`	`+ "airbyte_secret": true`
	`38`	`+ },`
	`39`	`+ "client_secret": {`
	`40`	`+ "type": "string",`
	`41`	`+ "title": "Client ssecret",`
	`42`	`+ "description": "OAuth Client secret",`
	`43`	`+ "airbyte_secret": true`
`32`	`44`	`}`
`33`	`45`	`}`
`34`	`46`	`},`
`@@ -117,6 +129,20 @@`
`117`	`129`	`"type": "string"`
`118`	`130`	`}`
`119`	`131`	`}`
	`132`	`+ },`
	`133`	`+ "complete_oauth_server_output_specification": {`
	`134`	`+ "type": "object",`
	`135`	`+ "additionalProperties": false,`
	`136`	`+ "properties": {`
	`137`	`+ "client_id": {`
	`138`	`+ "type": "string",`
	`139`	`+ "path_in_connector_config": ["credentials", "client_id"]`
	`140`	`+ },`
	`141`	`+ "client_secret": {`
	`142`	`+ "type": "string",`
	`143`	`+ "path_in_connector_config": ["credentials", "client_secret"]`
	`144`	`+ }`
	`145`	`+ }`
`120`	`146`	`}`
`121`	`147`	`}`
`122`	`148`	`}`