From 4924bcb9ba0d5ae160caa92a396cf637e9af4565 Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Tue, 4 Mar 2025 18:31:23 +0530 Subject: [PATCH 01/11] Update manifest according to the description --- .../connectors/source-sendgrid/manifest.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index 063f0702a569..693d307f3706 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -1,4 +1,4 @@ -version: 5.13.0 +version: 6.36.3 type: DeclarativeSource @@ -604,7 +604,7 @@ definitions: - timeout completed: - ready - urls_extractor: + download_target_extractor: type: DpathExtractor field_path: - urls @@ -620,7 +620,7 @@ definitions: polling_requester: type: HttpRequester path: >- - /v3/marketing/contacts/exports/{{stream_slice['create_job_response'].json()['id'] + /v3/marketing/contacts/exports/{{creation_response['id'] }} url_base: https://api.sendgrid.com http_method: GET @@ -637,7 +637,7 @@ definitions: api_token: "{{ config['api_key'] }}" download_requester: type: HttpRequester - path: "{{stream_slice.extra_fields['url']}}" + path: "{{download_target}}" url_base: "" http_method: GET download_extractor: From b799c36d402562e935b0dfdf8811c678218892d2 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Tue, 4 Mar 2025 13:06:38 +0000 Subject: [PATCH 02/11] chore: bump-version --- airbyte-integrations/connectors/source-sendgrid/metadata.yaml | 2 +- docs/integrations/sources/sendgrid.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/metadata.yaml b/airbyte-integrations/connectors/source-sendgrid/metadata.yaml index 1ca85b090b74..32a7c48018ca 100644 --- a/airbyte-integrations/connectors/source-sendgrid/metadata.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/metadata.yaml @@ -10,7 +10,7 @@ data: connectorSubtype: api connectorType: source definitionId: fbb5fbe2-16ad-4cf4-af7d-ff9d9c316c87 - dockerImageTag: 1.2.9 + dockerImageTag: 1.3.0 releases: breakingChanges: 1.0.0: diff --git a/docs/integrations/sources/sendgrid.md b/docs/integrations/sources/sendgrid.md index 0b7815e1925b..478ef9dfe444 100644 --- a/docs/integrations/sources/sendgrid.md +++ b/docs/integrations/sources/sendgrid.md @@ -89,6 +89,7 @@ The connector is restricted by normal Sendgrid [requests limitation](https://doc | Version | Date | Pull Request | Subject | |:--------|:-----------| :------------------------------------------------------- |:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| 1.3.0 | 2025-03-04 | [55185](https://github.com/airbytehq/airbyte/pull/55185) | Update manifest for adapting changes with AsyncRetriever | | 1.2.9 | 2025-02-23 | [54625](https://github.com/airbytehq/airbyte/pull/54625) | Update dependencies | | 1.2.8 | 2025-02-15 | [54013](https://github.com/airbytehq/airbyte/pull/54013) | Update dependencies | | 1.2.7 | 2025-02-08 | [53508](https://github.com/airbytehq/airbyte/pull/53508) | Update dependencies | From d73ef27a0f9ee5927b3945e0dd4129b6a8d7dce9 Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Tue, 4 Mar 2025 20:08:31 +0530 Subject: [PATCH 03/11] update version --- airbyte-integrations/connectors/source-sendgrid/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index 693d307f3706..11bb8869e947 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -1,4 +1,4 @@ -version: 6.36.3 +version: 6.33.0 type: DeclarativeSource From ba870703d26f6ccf75e3ca59fb1434d9a6e7825e Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Wed, 5 Mar 2025 07:19:37 +0530 Subject: [PATCH 04/11] update cdk version and manifest --- airbyte-integrations/connectors/source-sendgrid/manifest.yaml | 2 +- airbyte-integrations/connectors/source-sendgrid/metadata.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index 11bb8869e947..693d307f3706 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -1,4 +1,4 @@ -version: 6.33.0 +version: 6.36.3 type: DeclarativeSource diff --git a/airbyte-integrations/connectors/source-sendgrid/metadata.yaml b/airbyte-integrations/connectors/source-sendgrid/metadata.yaml index 32a7c48018ca..1f789b68ee4e 100644 --- a/airbyte-integrations/connectors/source-sendgrid/metadata.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/metadata.yaml @@ -6,7 +6,7 @@ data: hosts: - api.sendgrid.com connectorBuildOptions: - baseImage: docker.io/airbyte/source-declarative-manifest:6.36.1@sha256:52ad641b57995fbd43975d64f9a68fac15fcb80687df0f7acc27c4942a3b6bbb + baseImage: docker.io/airbyte/source-declarative-manifest:6.36.4@sha256:a612db8bc977a46d7d2e0442f5c6be26da6039ee83a8aceb7be545e4cbdd7040 connectorSubtype: api connectorType: source definitionId: fbb5fbe2-16ad-4cf4-af7d-ff9d9c316c87 From f1eef639dba3c2be0f1f5605cf25686fce46a926 Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 20:05:48 +0530 Subject: [PATCH 05/11] update download_decoder --- .../connectors/source-sendgrid/manifest.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index 693d307f3706..65c7057f45ab 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -640,8 +640,10 @@ definitions: path: "{{download_target}}" url_base: "" http_method: GET - download_extractor: - type: ResponseToFileExtractor + download_decoder: + type: GzipDecoder + decoder: + type: CsvDecoder schema_loader: type: InlineSchemaLoader schema: From 9bf9d1af6b53b80b2b9001ffc5418a963ca3d199 Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 20:59:27 +0530 Subject: [PATCH 06/11] update CDK --- airbyte-integrations/connectors/source-sendgrid/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/metadata.yaml b/airbyte-integrations/connectors/source-sendgrid/metadata.yaml index 1f789b68ee4e..8765d05bc180 100644 --- a/airbyte-integrations/connectors/source-sendgrid/metadata.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/metadata.yaml @@ -6,7 +6,7 @@ data: hosts: - api.sendgrid.com connectorBuildOptions: - baseImage: docker.io/airbyte/source-declarative-manifest:6.36.4@sha256:a612db8bc977a46d7d2e0442f5c6be26da6039ee83a8aceb7be545e4cbdd7040 + baseImage: docker.io/airbyte/source-declarative-manifest:6.38.3@sha256:fcba02266f262aabc2f37e4f14574aa1c8c5cffd018504bab28803e405c93afe connectorSubtype: api connectorType: source definitionId: fbb5fbe2-16ad-4cf4-af7d-ff9d9c316c87 From e8bcc17e2379076dc04c5ad921822c2e4d138cbe Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 21:11:43 +0530 Subject: [PATCH 07/11] update url_base --- airbyte-integrations/connectors/source-sendgrid/manifest.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index 65c7057f45ab..48a7d04d0e4e 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -637,8 +637,7 @@ definitions: api_token: "{{ config['api_key'] }}" download_requester: type: HttpRequester - path: "{{download_target}}" - url_base: "" + url_base: "{{download_target}}" http_method: GET download_decoder: type: GzipDecoder From 0f07a380cd70a8647a0b7b1d896df5e025f2dcff Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 21:31:59 +0530 Subject: [PATCH 08/11] update alternate emails as string --- airbyte-integrations/connectors/source-sendgrid/manifest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index 48a7d04d0e4e..eadef4aea3bb 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -1067,6 +1067,7 @@ schemas: type: - 'null' - array + - string city: type: - string From 66834d64b5ff0ca4f6384cb207a73563e0a77e8d Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 21:50:53 +0530 Subject: [PATCH 09/11] update cdk --- airbyte-integrations/connectors/source-sendgrid/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml index eadef4aea3bb..e40c3cc4e5b6 100644 --- a/airbyte-integrations/connectors/source-sendgrid/manifest.yaml +++ b/airbyte-integrations/connectors/source-sendgrid/manifest.yaml @@ -1,4 +1,4 @@ -version: 6.36.3 +version: 6.38.3 type: DeclarativeSource From bc859f1529dd21690c29f56aae8735fff3f5d863 Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 23:03:59 +0530 Subject: [PATCH 10/11] add bounces for no records --- .../connectors/source-sendgrid/acceptance-test-config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/airbyte-integrations/connectors/source-sendgrid/acceptance-test-config.yml b/airbyte-integrations/connectors/source-sendgrid/acceptance-test-config.yml index b0508289b05b..f67d944666a6 100644 --- a/airbyte-integrations/connectors/source-sendgrid/acceptance-test-config.yml +++ b/airbyte-integrations/connectors/source-sendgrid/acceptance-test-config.yml @@ -43,6 +43,8 @@ acceptance_tests: bypass_reason: "can not populate" - name: blocks bypass_reason: "can not populate" + - name: bounces + bypass_reason: "can not populate" fail_on_extra_columns: false incremental: tests: From 28bb72da7342aa9629645df31d7aefe36be025cc Mon Sep 17 00:00:00 2001 From: btkcodedev Date: Mon, 10 Mar 2025 23:47:21 +0530 Subject: [PATCH 11/11] remove expected records --- .../integration_tests/expected_records.jsonl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/airbyte-integrations/connectors/source-sendgrid/integration_tests/expected_records.jsonl b/airbyte-integrations/connectors/source-sendgrid/integration_tests/expected_records.jsonl index 933c7e4a911e..d9abe7c342a4 100644 --- a/airbyte-integrations/connectors/source-sendgrid/integration_tests/expected_records.jsonl +++ b/airbyte-integrations/connectors/source-sendgrid/integration_tests/expected_records.jsonl @@ -184,12 +184,6 @@ {"stream": "suppression_group_members", "data": {"email": "test-forsuppressiongroup number8@example.com", "group_id": 14772, "group_name": "Test Suggestions Group 12", "created_at": 1612363238}, "emitted_at": 1631093393000} {"stream": "suppression_group_members", "data": {"email": "test-forsuppressiongroup number9@example.com", "group_id": 14772, "group_name": "Test Suggestions Group 12", "created_at": 1612363238}, "emitted_at": 1631093393000} {"stream": "suppression_group_members", "data": {"email": "avida.d3@gmail.com", "group_id": 14780, "group_name": "Test Suggestions Group 20", "created_at": 1631093329}, "emitted_at": 1631093393000} -{"stream": "bounces", "data": {"status": "", "reason": "Invalid Domain", "email": "vadym.hevlich@zazmic_com", "created": 1621439283}, "emitted_at": 1708535996116} -{"stream": "bounces", "data": {"status": "", "reason": "Invalid Domain", "email": "vadym.hevlich@zazmicinvalid", "created": 1621439221}, "emitted_at": 1708535996116} -{"stream": "bounces", "data": {"status": "", "reason": "Invalid Domain", "email": "vadym.hevlich@zazmicio", "created": 1621439211}, "emitted_at": 1708535996116} -{"stream": "bounces", "data": {"status": "", "reason": "Invalid Domain", "email": "vadym.hevlich@zazmiccom2", "created": 1621437507}, "emitted_at": 1708535996117} -{"stream": "bounces", "data": {"status": "", "reason": "Invalid Domain", "email": "vadym.hevlich@zazmiccom1", "created": 1621437504}, "emitted_at": 1708535996117} -{"stream": "bounces", "data": {"status": "", "reason": "Invalid Domain", "email": "vadym.hevlich@zazmiccom", "created": 1621426437}, "emitted_at": 1708535996117} {"stream": "campaigns", "data": {"created_at": "2021-09-08T09:07:48Z", "id": "3c5a9fa6-1084-11ec-ac32-4228d699bad5", "name": "Untitled Single Send", "status": "triggered", "updated_at": "2021-09-08T09:11:08Z", "is_abtest": false, "channels": ["email"]}, "emitted_at": 1678791750589} {"stream": "campaigns", "data": {"created_at": "2021-09-08T09:04:36Z", "id": "c9f286fb-1083-11ec-ae03-ca0fc7f28419", "name": "Copy of Untitled Single Send", "status": "triggered", "updated_at": "2021-09-08T09:09:08Z", "is_abtest": false, "channels": ["email"]}, "emitted_at": 1678791750589} {"stream": "campaigns", "data": {"created_at": "2021-09-08T08:53:59Z", "id": "4e5be6a3-1082-11ec-8512-9afd40c324e6", "name": "Untitled Single Send", "status": "triggered", "updated_at": "2021-09-08T08:57:08Z", "is_abtest": false, "channels": ["email"]}, "emitted_at": 1678791750590}