Skip to content

Commit 58b6a1b

Browse files
htruemaneliziarioZirochkaam-ronchisherifnada
authored
🎉 Amazon SP extra endpoint support (#5248)
* Add GET_FBA_INVENTORY_AGED_DATA data * Add GET_MERCHANT_LISTINGS_ALL_DATA stream support * Update schemas * Update configured_catalog.json * Update connector to airbyte-cdk * Add amazon seller partner test creds * Update state sample files * Apply code format * Update acceptance-test-config.yml * Add dummy integration test * Refactor auth signature. Update streams.py * Remove print_function import from auth.py * Refactor source class. Add pydantic spec. PR fixes. * Add dummy integration test * Typing added. Add _create_prepared_request docstring. * Add extra streams and schemas * Update docs and spec * Post merge code fixes * Fix test setup * Fix test setup * Add sample_state.json * Update reports streams logics. Update test and config files. * Update tests config. Small code style fixes. * Add reports stream slices. Update check_connection method. * Post review fixes. * Streams update * Add reports document retrieval and decrypting. Update schemas and configs. * Add CVS parsing into result rows * Update ReportsAmazonSPStream class to be the child of Stream class. Update GET_FLAT_FILE_OPEN_LISTINGS_DATA and GET_MERCHANT_LISTINGS_ALL_DATA schemas. * Schema updates * Source check method updated * Update ReportsAmazonSPStream retry report logics * Update check_connection source method * Update reports read_records method. Update report schemas. * Update streams.py * Update acceptance tests config. Add small code fixes. * Update report read_records logics * Add reports streams rate limit handling logics. Add rate limit unit tests. * Source Amazon SP: Update reports streams logics. (#5311) * Update check connection method * #5796 silence printing full config when config validation fails (#5879) * - #5796 silence printing full config when config validation fails * fix unit tests after config validation check changes Co-authored-by: Marcos Eliziario Santos <[email protected]> * Format google-search-console schemas (#6047) * Update ads_insights.json (#5946) fix ads_insights schema according to [facebook docs](https://developers.facebook.com/docs/marketing-api/reference/adgroup/insights/) and my own data * Bump connectors version + update docs (#6060) * 🐛 Source Facebook Marketing: Convert values' types according to schema types (#4978) * Convert values' types according to schema types * Put streams back to `configured_catalog.json` Put back `ads_insights` and `ads_insights_age_and_gender` streams. * Pickup changes from #5946 * Implement change request + fix previous PR * Update schema * Remove items_type from convert_to_schema_types() * Bump connectors version * add oauth to connector_base dependencies (#6064) * use spec when persisting source configs (#6036) * switch most usages of writing sources to using specs * fix other usages * fix test * only wait on the server in the scheduler, not the worker * fix * rephrase sanity check and remove stdout * 🎉 Source Stripe: Add `PaymentIntents` stream (#6004) * Add `PaymentIntents` stream * Update docs * Implement change request + few updates Split `source.py` file into `source.py` and `streams.py` files. Update `payment_intents.json` file. * Bump connectors version + update docs * Add skeleton for databricks destination (#5629) Co-authored-by: Liren Tu <[email protected]> Co-authored-by: LiRen Tu <[email protected]> * Revert "Add skeleton for databricks destination (#5629)" (#6066) This reverts commit 79256c4. * 🎉 New Destination: Databricks (#5998) Implement new destination connector for databricks delta lake. Resolves #2075. Co-authored-by: George Claireaux <[email protected]> Co-authored-by: Sherif A. Nada <[email protected]> * Source PostHog: add support for self-hosted instances (#6058) * publish #6058 (#6059) * Destination Kafka: correct spec json and data types in config (#6040) * correct spec json and data types in config * bump version * correct tests * correct config parser NPE * format files Co-authored-by: Marcos Marx <[email protected]> * Fix or delete broken links (#6069) * Fix more doc issues (#6072) * 🎉 Added optional platform flag for build image script (#6000) * Fix dependabot security alert. (#6073) * Pin set value to greater than 4.0.1 to fix security warning. * Format the rest of the connectors. * add coverage report (#6045) Co-authored-by: Dmytro Rezchykov <[email protected]> * Fix the format of the data returned by Google Ads oauth to match the config accepted by the connector (#6032) * update salesforce docs (#6081) * 🎉 Source Github: add caching for all streams (#5949) * Source Github: add checking for all streams * bump version, update changelogs * Disable automatic migration acceptance test (#5988) - The automatic migration acceptance test no longer works because of the new Flyway migration system. - The file-based migration system is being deprecated. * 🎉 CDK: Add requests native authenticator support (#5731) * Add requests native auth class * Update init file. Update type annotations. Bump version. * Update TokenAuthenticator implementation. Update Oauth2Authenticator implemetation. Add CHANGELOG.md record. * Update Oauth2Authenticator default value setting. Update CHANGELOG.md * Add requests native authenticator tests * Add CDK requests native __call__ method tests. Update CHANGELOG.md * Add outdated auth deprication messages * Update requests native auth __call__ method tests * Bump CDK version to 0.1.20 * Interface changes to support separating secrets from the config (#6065) * Interface changes to support separating secrets from the config * Cleanup from PR comments and whitespace * Update log message for empty env variable (#6115) Co-authored-by: Jared Rhizor <[email protected]> * Bump Airbyte version from 0.29.17-alpha to 0.29.18-alpha (#6125) Co-authored-by: davinchia <[email protected]> * return auth spec in the API when getting definition specification (#6121) * Ignore python test coverage files (#6144) * CDK: support nested refs resolving (#6044) Co-authored-by: Dmytro Rezchykov <[email protected]> * feat: path for nested fields (#6130) * feat: path for nested fields * fix: clipRule error * fix: remove field name * Fix request middleware for ConnectionService (#6148) * Jamakase/update onboarding flow (#5656) * Doc explains normalization full-refresh implications (#6097) * update docs * add info in quickstart connection page * update abhi comments Co-authored-by: Marcos Marx <[email protected]> * Fix migration validation issue (#6154) Resolves #6151. * Bump Airbyte version from 0.29.18-alpha to 0.29.19-alpha (#6156) Co-authored-by: tuliren <[email protected]> * Add information on which destinations support Incremental - Deduped History in their docs (#6031) Co-authored-by: Abhi Vaidyanatha <[email protected]> * Update Airbyte Spec acknowledgements. (#6155) Co-authored-by: Abhi Vaidyanatha <[email protected]> * Update new integration request * Add back the migration acceptance test (#6163) * 🎉 Create a Helm Chart For Airbyte (#5891) See number #1868. This creates an initial helm chart for installing Airbyte in Kubernetes to make it easier for users who are more familiar with helm. It also includes GitHub actions to help continually test that the chart works in the most basic case. All of the templates are based off of the kustomize folder, but minio and postgres have been removed in favor of adding the bitnami helm charts as dependencies since they have an active community and allow easily tweaking their install. * Fix OAuth Summary strings (#6143) Co-authored-by: Marcos Eliziario Santos <[email protected]> Co-authored-by: Marcos Eliziario Santos <[email protected]> Co-authored-by: oleh.zorenko <[email protected]> Co-authored-by: Mauro <[email protected]> Co-authored-by: Sherif A. Nada <[email protected]> Co-authored-by: Jared Rhizor <[email protected]> Co-authored-by: George Claireaux <[email protected]> Co-authored-by: Liren Tu <[email protected]> Co-authored-by: LiRen Tu <[email protected]> Co-authored-by: coeurdestenebres <[email protected]> Co-authored-by: Marcos Marx <[email protected]> Co-authored-by: Marcos Marx <[email protected]> Co-authored-by: Harsha Teja Kanna <[email protected]> Co-authored-by: Davin Chia <[email protected]> Co-authored-by: Dmytro <[email protected]> Co-authored-by: Dmytro Rezchykov <[email protected]> Co-authored-by: Yevhenii <[email protected]> Co-authored-by: Jenny Brown <[email protected]> Co-authored-by: davinchia <[email protected]> Co-authored-by: Iakov Salikov <[email protected]> Co-authored-by: Artem Astapenko <[email protected]> Co-authored-by: tuliren <[email protected]> Co-authored-by: Abhi Vaidyanatha <[email protected]> Co-authored-by: Abhi Vaidyanatha <[email protected]> Co-authored-by: Jonathan Stacks <[email protected]> Co-authored-by: Christophe Duong <[email protected]> * Bump source version. Update source docs. * Mock time.sleep in test_reports_stream_send_request_backoff_exception test * Acceptance test basic_read test disabled Co-authored-by: Marcos Eliziario Santos <[email protected]> Co-authored-by: Marcos Eliziario Santos <[email protected]> Co-authored-by: oleh.zorenko <[email protected]> Co-authored-by: Mauro <[email protected]> Co-authored-by: Sherif A. Nada <[email protected]> Co-authored-by: Jared Rhizor <[email protected]> Co-authored-by: George Claireaux <[email protected]> Co-authored-by: Liren Tu <[email protected]> Co-authored-by: LiRen Tu <[email protected]> Co-authored-by: coeurdestenebres <[email protected]> Co-authored-by: Marcos Marx <[email protected]> Co-authored-by: Marcos Marx <[email protected]> Co-authored-by: Harsha Teja Kanna <[email protected]> Co-authored-by: Davin Chia <[email protected]> Co-authored-by: Dmytro <[email protected]> Co-authored-by: Dmytro Rezchykov <[email protected]> Co-authored-by: Yevhenii <[email protected]> Co-authored-by: Jenny Brown <[email protected]> Co-authored-by: davinchia <[email protected]> Co-authored-by: Iakov Salikov <[email protected]> Co-authored-by: Artem Astapenko <[email protected]> Co-authored-by: tuliren <[email protected]> Co-authored-by: Abhi Vaidyanatha <[email protected]> Co-authored-by: Abhi Vaidyanatha <[email protected]> Co-authored-by: Jonathan Stacks <[email protected]> Co-authored-by: Christophe Duong <[email protected]>
1 parent 0a027a1 commit 58b6a1b

25 files changed

+1467
-255
lines changed

‎airbyte-integrations/connectors/source-amazon-seller-partner/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ RUN pip install .
1212
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
1313
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
1414

15-
LABEL io.airbyte.version=0.2.0
15+
LABEL io.airbyte.version=0.2.1
1616
LABEL io.airbyte.name=airbyte/source-amazon-seller-partner

‎airbyte-integrations/connectors/source-amazon-seller-partner/acceptance-test-config.yml

+34-18
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,38 @@ tests:
33
spec:
44
- spec_path: "source_amazon_seller_partner/spec.json"
55
connection:
6-
- config_path: "secrets/config.json"
7-
status: "succeed"
8-
- config_path: "integration_tests/invalid_config.json"
9-
status: "failed"
6+
- config_path: "secrets/config.json"
7+
status: "succeed"
8+
timeout_seconds: 60
9+
- config_path: "integration_tests/invalid_config.json"
10+
status: "failed"
11+
timeout_seconds: 60
1012
discovery:
11-
- config_path: "secrets/config.json"
12-
basic_read:
13-
- config_path: "secrets/config.json"
14-
configured_catalog_path: "integration_tests/configured_catalog_no_orders.json"
15-
empty_streams: []
16-
incremental:
17-
- config_path: "secrets/config.json"
18-
configured_catalog_path: "integration_tests/configured_catalog_no_orders.json"
19-
future_state_path: "integration_tests/abnormal_state.json"
20-
cursor_paths:
21-
GET_FLAT_FILE_ALL_ORDERS_DATA_BY_ORDER_DATE_GENERAL: ["createdTime"]
22-
full_refresh:
23-
- config_path: "secrets/config.json"
24-
configured_catalog_path: "integration_tests/configured_catalog.json"
13+
- config_path: "secrets/config.json"
14+
# TODO: uncomment when at least one record exist
15+
# basic_read:
16+
# - config_path: "secrets/config.json"
17+
# configured_catalog_path: "integration_tests/configured_catalog.json"
18+
# empty_streams:
19+
# [
20+
# "Orders",
21+
# "GET_FLAT_FILE_ALL_ORDERS_DATA_BY_ORDER_DATE_GENERAL",
22+
# "GET_MERCHANT_LISTINGS_ALL_DATA",
23+
# "GET_FBA_INVENTORY_AGED_DATA",
24+
# "GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL",
25+
# "GET_FLAT_FILE_OPEN_LISTINGS_DATA",
26+
# "GET_FBA_FULFILLMENT_REMOVAL_ORDER_DETAIL_DATA",
27+
# "GET_FBA_FULFILLMENT_REMOVAL_SHIPMENT_DETAIL_DATA",
28+
# "GET_VENDOR_INVENTORY_HEALTH_AND_PLANNING_REPORT",
29+
# "VendorDirectFulfillmentShipping",
30+
# ]
31+
# TODO: uncomment when Orders (or any other incremental) stream is filled with data
32+
# incremental:
33+
# - config_path: "secrets/config.json"
34+
# configured_catalog_path: "integration_tests/configured_catalog.json"
35+
# future_state_path: "integration_tests/future_state.json"
36+
# cursor_paths:
37+
# Orders: ["LastUpdateDate"]
38+
# full_refresh:
39+
# - config_path: "secrets/config.json"
40+
# configured_catalog_path: "integration_tests/configured_catalog.json"

‎airbyte-integrations/connectors/source-amazon-seller-partner/integration_tests/abnormal_state.json

-14
This file was deleted.

‎airbyte-integrations/connectors/source-amazon-seller-partner/integration_tests/configured_catalog.json

+63-18
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,82 @@
1616
"stream": {
1717
"name": "GET_FLAT_FILE_ALL_ORDERS_DATA_BY_ORDER_DATE_GENERAL",
1818
"json_schema": {},
19-
"supported_sync_modes": ["full_refresh", "incremental"],
20-
"source_defined_cursor": true,
21-
"default_cursor_field": ["createdTime"]
19+
"supported_sync_modes": ["full_refresh"]
2220
},
23-
"sync_mode": "incremental",
24-
"destination_sync_mode": "append",
25-
"cursor_field": ["createdTime"]
21+
"sync_mode": "full_refresh",
22+
"destination_sync_mode": "overwrite"
2623
},
2724
{
2825
"stream": {
2926
"name": "GET_MERCHANT_LISTINGS_ALL_DATA",
3027
"json_schema": {},
31-
"supported_sync_modes": ["full_refresh", "incremental"],
32-
"source_defined_cursor": true,
33-
"default_cursor_field": ["createdTime"]
28+
"supported_sync_modes": ["full_refresh"]
3429
},
35-
"sync_mode": "incremental",
36-
"destination_sync_mode": "append",
37-
"cursor_field": ["createdTime"]
30+
"sync_mode": "full_refresh",
31+
"destination_sync_mode": "overwrite"
3832
},
3933
{
4034
"stream": {
4135
"name": "GET_FBA_INVENTORY_AGED_DATA",
4236
"json_schema": {},
43-
"supported_sync_modes": ["full_refresh", "incremental"],
44-
"source_defined_cursor": true,
45-
"default_cursor_field": ["createdTime"]
37+
"supported_sync_modes": ["full_refresh"]
4638
},
47-
"sync_mode": "incremental",
48-
"destination_sync_mode": "append",
49-
"cursor_field": ["createdTime"]
39+
"sync_mode": "full_refresh",
40+
"destination_sync_mode": "overwrite"
41+
},
42+
{
43+
"stream": {
44+
"name": "GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL",
45+
"json_schema": {},
46+
"supported_sync_modes": ["full_refresh"]
47+
},
48+
"sync_mode": "full_refresh",
49+
"destination_sync_mode": "overwrite"
50+
},
51+
{
52+
"stream": {
53+
"name": "GET_FLAT_FILE_OPEN_LISTINGS_DATA",
54+
"json_schema": {},
55+
"supported_sync_modes": ["full_refresh"]
56+
},
57+
"sync_mode": "full_refresh",
58+
"destination_sync_mode": "overwrite"
59+
},
60+
{
61+
"stream": {
62+
"name": "GET_FBA_FULFILLMENT_REMOVAL_ORDER_DETAIL_DATA",
63+
"json_schema": {},
64+
"supported_sync_modes": ["full_refresh"]
65+
},
66+
"sync_mode": "full_refresh",
67+
"destination_sync_mode": "overwrite"
68+
},
69+
{
70+
"stream": {
71+
"name": "GET_FBA_FULFILLMENT_REMOVAL_SHIPMENT_DETAIL_DATA",
72+
"json_schema": {},
73+
"supported_sync_modes": ["full_refresh"]
74+
},
75+
"sync_mode": "full_refresh",
76+
"destination_sync_mode": "overwrite"
77+
},
78+
{
79+
"stream": {
80+
"name": "GET_VENDOR_INVENTORY_HEALTH_AND_PLANNING_REPORT",
81+
"json_schema": {},
82+
"supported_sync_modes": ["full_refresh"]
83+
},
84+
"sync_mode": "full_refresh",
85+
"destination_sync_mode": "overwrite"
86+
},
87+
{
88+
"stream": {
89+
"name": "VendorDirectFulfillmentShipping",
90+
"json_schema": {},
91+
"supported_sync_modes": ["full_refresh"]
92+
},
93+
"sync_mode": "full_refresh",
94+
"destination_sync_mode": "overwrite"
5095
}
5196
]
5297
}

‎airbyte-integrations/connectors/source-amazon-seller-partner/integration_tests/configured_catalog_no_empty_streams.json

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"streams": [
3+
{
4+
"stream": {
5+
"name": "GET_FLAT_FILE_ALL_ORDERS_DATA_BY_ORDER_DATE_GENERAL",
6+
"json_schema": {},
7+
"supported_sync_modes": ["full_refresh"]
8+
},
9+
"sync_mode": "full_refresh",
10+
"destination_sync_mode": "overwrite"
11+
},
12+
{
13+
"stream": {
14+
"name": "GET_FBA_INVENTORY_AGED_DATA",
15+
"json_schema": {},
16+
"supported_sync_modes": ["full_refresh"]
17+
},
18+
"sync_mode": "full_refresh",
19+
"destination_sync_mode": "overwrite"
20+
},
21+
{
22+
"stream": {
23+
"name": "GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL",
24+
"json_schema": {},
25+
"supported_sync_modes": ["full_refresh"]
26+
},
27+
"sync_mode": "full_refresh",
28+
"destination_sync_mode": "overwrite"
29+
},
30+
{
31+
"stream": {
32+
"name": "GET_FBA_FULFILLMENT_REMOVAL_ORDER_DETAIL_DATA",
33+
"json_schema": {},
34+
"supported_sync_modes": ["full_refresh"]
35+
},
36+
"sync_mode": "full_refresh",
37+
"destination_sync_mode": "overwrite"
38+
},
39+
{
40+
"stream": {
41+
"name": "GET_FBA_FULFILLMENT_REMOVAL_SHIPMENT_DETAIL_DATA",
42+
"json_schema": {},
43+
"supported_sync_modes": ["full_refresh"]
44+
},
45+
"sync_mode": "full_refresh",
46+
"destination_sync_mode": "overwrite"
47+
}
48+
]
49+
}

‎airbyte-integrations/connectors/source-amazon-seller-partner/integration_tests/configured_catalog_no_orders.json

-40
This file was deleted.

‎airbyte-integrations/connectors/source-amazon-seller-partner/integration_tests/future_state.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Orders": {
3+
"LastUpdateDate": "2121-07-01T00:00:00Z"
4+
}
5+
}

‎airbyte-integrations/connectors/source-amazon-seller-partner/integration_tests/sample_state.json

+15
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,20 @@
1010
},
1111
"GET_FBA_INVENTORY_AGED_DATA": {
1212
"createdTime": "2021-07-01T00:00:00Z"
13+
},
14+
"GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL": {
15+
"createdTime": "2021-07-01T00:00:00Z"
16+
},
17+
"GET_FLAT_FILE_OPEN_LISTINGS_DATA": {
18+
"createdTime": "2021-07-01T00:00:00Z"
19+
},
20+
"GET_FBA_FULFILLMENT_REMOVAL_ORDER_DETAIL_DATA": {
21+
"createdTime": "2021-07-01T00:00:00Z"
22+
},
23+
"GET_FBA_FULFILLMENT_REMOVAL_SHIPMENT_DETAIL_DATA": {
24+
"createdTime": "2021-07-01T00:00:00Z"
25+
},
26+
"GET_VENDOR_INVENTORY_HEALTH_REPORT": {
27+
"createdTime": "2021-07-01T00:00:00Z"
1328
}
1429
}

‎airbyte-integrations/connectors/source-amazon-seller-partner/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from setuptools import find_packages, setup
2727

28-
MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1", "boto3~=1.16", "pendulum~=2.1"]
28+
MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1", "boto3~=1.16", "pendulum~=2.1", "pycryptodome~=3.10"]
2929

3030
TEST_REQUIREMENTS = [
3131
"pytest~=6.1",

‎airbyte-integrations/connectors/source-amazon-seller-partner/source_amazon_seller_partner/auth.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import hmac
2727
import urllib.parse
2828
from typing import Any, Mapping
29+
from urllib.parse import urlparse
2930

3031
import pendulum
3132
import requests
3233
from airbyte_cdk.sources.streams.http.auth import Oauth2Authenticator
3334
from requests.auth import AuthBase
34-
from requests.compat import urlparse
3535

3636

3737
class AWSAuthenticator(Oauth2Authenticator):

0 commit comments

Comments
 (0)