From 40ea41f938ea6126db1f5766883af7aa1ec63e31 Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Mon, 17 Jan 2022 15:23:41 -0300 Subject: [PATCH 1/4] remove datetime from bot-profile channel_msgs --- .../source-slack/source_slack/schemas/channel_messages.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-slack/source_slack/schemas/channel_messages.json b/airbyte-integrations/connectors/source-slack/source_slack/schemas/channel_messages.json index 5b94bf0c604da..e616ac54b5659 100644 --- a/airbyte-integrations/connectors/source-slack/source_slack/schemas/channel_messages.json +++ b/airbyte-integrations/connectors/source-slack/source_slack/schemas/channel_messages.json @@ -38,8 +38,7 @@ "type": ["null", "string"] }, "updated": { - "type": ["null", "string"], - "format": "date-time" + "type": ["null", "string"] } }, "type": ["null", "object"] From 13dc6f8a923d6b9736c3093b0eda3403df9ae141 Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Tue, 18 Jan 2022 10:41:34 -0300 Subject: [PATCH 2/4] correct retry-after --- .../connectors/source-slack/source_slack/source.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-slack/source_slack/source.py b/airbyte-integrations/connectors/source-slack/source_slack/source.py index 0809df2fec333..2ca50d34ac7a2 100644 --- a/airbyte-integrations/connectors/source-slack/source_slack/source.py +++ b/airbyte-integrations/connectors/source-slack/source_slack/source.py @@ -65,8 +65,8 @@ def backoff_time(self, response: requests.Response) -> Optional[float]: fall back on default retry behavior. Rate Limits Docs: https://api.slack.com/docs/rate-limits#web""" - if "Retry-After" in response.headers: - return int(response.headers["Retry-After"]) + if "retry-after" in response.headers: + return int(response.headers["retry-after"]) else: self.logger.info("Retry-after header not found. Using default backoff value") return 5 From 7f03f447ba5078f4587f9fc1b0157548a88bf75a Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Tue, 18 Jan 2022 10:48:27 -0300 Subject: [PATCH 3/4] return retry-after --- .../connectors/source-slack/source_slack/source.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-slack/source_slack/source.py b/airbyte-integrations/connectors/source-slack/source_slack/source.py index 2ca50d34ac7a2..0809df2fec333 100644 --- a/airbyte-integrations/connectors/source-slack/source_slack/source.py +++ b/airbyte-integrations/connectors/source-slack/source_slack/source.py @@ -65,8 +65,8 @@ def backoff_time(self, response: requests.Response) -> Optional[float]: fall back on default retry behavior. Rate Limits Docs: https://api.slack.com/docs/rate-limits#web""" - if "retry-after" in response.headers: - return int(response.headers["retry-after"]) + if "Retry-After" in response.headers: + return int(response.headers["Retry-After"]) else: self.logger.info("Retry-after header not found. Using default backoff value") return 5 From e8eb7dbe0678149c0e1cc2d1e5ed4938601dbb82 Mon Sep 17 00:00:00 2001 From: Marcos Marx Date: Wed, 26 Jan 2022 17:15:07 -0300 Subject: [PATCH 4/4] bump connector version --- .../c2281cee-86f9-4a86-bb48-d23286b4c7bd.json | 2 +- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- airbyte-integrations/connectors/source-slack/Dockerfile | 2 +- docs/integrations/sources/slack.md | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/c2281cee-86f9-4a86-bb48-d23286b4c7bd.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/c2281cee-86f9-4a86-bb48-d23286b4c7bd.json index 0b6d16bd6ed1f..59270745453bf 100644 --- a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/c2281cee-86f9-4a86-bb48-d23286b4c7bd.json +++ b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/c2281cee-86f9-4a86-bb48-d23286b4c7bd.json @@ -2,7 +2,7 @@ "sourceDefinitionId": "c2281cee-86f9-4a86-bb48-d23286b4c7bd", "name": "Slack", "dockerRepository": "airbyte/source-slack", - "dockerImageTag": "0.1.13", + "dockerImageTag": "0.1.14", "documentationUrl": "https://docs.airbyte.io/integrations/sources/slack", "icon": "slack.svg" } diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 7160cb6ecc2d3..1f9c5351d20b4 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -648,7 +648,7 @@ - name: Slack sourceDefinitionId: c2281cee-86f9-4a86-bb48-d23286b4c7bd dockerRepository: airbyte/source-slack - dockerImageTag: 0.1.13 + dockerImageTag: 0.1.14 documentationUrl: https://docs.airbyte.io/integrations/sources/slack icon: slack.svg sourceType: api diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index e8cafd8576377..a03c360d50b1d 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -6792,7 +6792,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-slack:0.1.13" +- dockerImage: "airbyte/source-slack:0.1.14" spec: documentationUrl: "https://docs.airbyte.io/integrations/sources/slack" connectionSpecification: diff --git a/airbyte-integrations/connectors/source-slack/Dockerfile b/airbyte-integrations/connectors/source-slack/Dockerfile index e76c29e9c5306..190c716155433 100644 --- a/airbyte-integrations/connectors/source-slack/Dockerfile +++ b/airbyte-integrations/connectors/source-slack/Dockerfile @@ -16,5 +16,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.13 +LABEL io.airbyte.version=0.1.14 LABEL io.airbyte.name=airbyte/source-slack diff --git a/docs/integrations/sources/slack.md b/docs/integrations/sources/slack.md index a00ef8ea605e7..4d87f62493408 100644 --- a/docs/integrations/sources/slack.md +++ b/docs/integrations/sources/slack.md @@ -111,6 +111,7 @@ We recommend creating a restricted, read-only key specifically for Airbyte acces | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | +| 0.1.14 | 2022-01-26 | [9575](https://github.com/airbytehq/airbyte/pull/9575) | Correct schema | | 0.1.13 | 2021-11-08 | [7499](https://github.com/airbytehq/airbyte/pull/7499) | Remove base-python dependencies | | 0.1.12 | 2021-10-07 | [6570](https://github.com/airbytehq/airbyte/pull/6570) | Implement OAuth support with OAuth authenticator | | 0.1.11 | 2021-08-27 | [5830](https://github.com/airbytehq/airbyte/pull/5830) | Fixed sync operations hang forever issue |