Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features/acc 7752 #53696

Closed
wants to merge 11 commits into from
Closed

Features/acc 7752 #53696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0f88164
bump cdk of select connectors to 1.8.0
dom-sc Dec 13, 2024
55b8859
fix commercetools auth
dom-sc Dec 13, 2024
f9fc5ba
Merge branch 'airbytehq:master' into feature/bump-cdk-version
dom-sc Jan 22, 2025
4337e3c
Merge remote-tracking branch 'origin/feature/bump-cdk-version'
mattjwinslow Jan 23, 2025
fca3ebd
PRODUCT-4129
mattjwinslow Jan 24, 2025
c7267b4
Merge pull request #1 from soundcommerce/feature/PRODUCT-4129-PRODUCT…
mattjwinslow Jan 25, 2025
1c3c21c
PRODUCT-4202
mattjwinslow Jan 29, 2025
32c9b84
Merge pull request #2 from soundcommerce/feature/PRODUCT-4202
mattjwinslow Jan 30, 2025
8c50b98
PRODUCT-4217
mattjwinslow Jan 31, 2025
6decd17
Merge pull request #4 from soundcommerce/features/product-4217
mattjwinslow Jan 31, 2025
996c81a
ACC-7752
mattjwinslow Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions airbyte-integrations/connectors/source-appsflyer/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[build-system]
requires = [ "poetry-core>=1.0.0",]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
version = "0.2.25"
name = "source-appsflyer"
description = "Source implementation for Appsflyer."
authors = [ "Airbyte <[email protected]>",]
authors = ["Airbyte <[email protected]>"]
license = "MIT"
readme = "README.md"
documentation = "https://docs.airbyte.com/integrations/sources/appsflyer"
Expand All @@ -17,7 +17,7 @@ include = "source_appsflyer"

[tool.poetry.dependencies]
python = "^3.9,<3.12"
airbyte-cdk = "0.80.0"
airbyte-cdk = "1.8.0"
pendulum = "==2.1.2"

[tool.poetry.scripts]
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-braintree/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include = "source_braintree"

[tool.poetry.dependencies]
python = "^3.9,<3.12"
airbyte-cdk = "^0.50"
airbyte-cdk = "1.8.0"
braintree = "^4.28.0"

[tool.poetry.scripts]
Expand Down
278 changes: 249 additions & 29 deletions ...te-integrations/connectors/source-commercetools/integration_tests/configured_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,284 @@
{
"streams": [
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"name": "customers",
"namespace": null,
"source_defined_cursor": true,
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"supported_sync_modes": ["incremental", "full_refresh"],
"name": "discount_codes",
"namespace": null,
"source_defined_cursor": true,
"default_cursor_field": ["lastModifiedAt"]
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_mode": "incremental",
"cursor_field": ["lastModifiedAt"],
"destination_sync_mode": "append"
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"name": "orders",
"namespace": null,
"source_defined_cursor": true,
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"supported_sync_modes": ["incremental", "full_refresh"],
"name": "payments",
"namespace": null,
"source_defined_cursor": true,
"default_cursor_field": ["lastModifiedAt"]
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_mode": "incremental",
"cursor_field": ["lastModifiedAt"],
"destination_sync_mode": "append"
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"name": "discount_codes",
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"supported_sync_modes": ["incremental", "full_refresh"],
"name": "products",
"namespace": null,
"source_defined_cursor": true,
"default_cursor_field": ["lastModifiedAt"]
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_mode": "incremental",
"cursor_field": ["lastModifiedAt"],
"destination_sync_mode": "append"
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"name": "payments",
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"supported_sync_modes": ["incremental", "full_refresh"],
"name": "carts",
"namespace": null,
"source_defined_cursor": true,
"default_cursor_field": ["lastModifiedAt"]
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_mode": "incremental",
"cursor_field": ["lastModifiedAt"],
"destination_sync_mode": "append"
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"name": "products",
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"name": "inventory",
"namespace": null,
"source_defined_cursor": true,
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"name": "standalone-prices",
"namespace": null,
"source_defined_cursor": true,
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"name": "product-discounts",
"namespace": null,
"source_defined_cursor": true,
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_id": null,
"sync_mode": "full_refresh"
},
{
"cursor_field": null,
"destination_sync_mode": "append",
"generation_id": null,
"minimum_generation_id": null,
"primary_key": null,
"stream": {
"default_cursor_field": [
"lastModifiedAt"
],
"is_resumable": true,
"json_schema": {},
"supported_sync_modes": ["incremental", "full_refresh"],
"name": "cart-discounts",
"namespace": null,
"source_defined_cursor": true,
"default_cursor_field": ["lastModifiedAt"]
"source_defined_primary_key": [
[
"id"
]
],
"supported_sync_modes": [
"full_refresh",
"incremental"
]
},
"sync_mode": "incremental",
"cursor_field": ["lastModifiedAt"],
"destination_sync_mode": "append"
"sync_id": null,
"sync_mode": "full_refresh"
}
]
}
}
6 changes: 3 additions & 3 deletions airbyte-integrations/connectors/source-commercetools/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[build-system]
requires = [ "poetry-core>=1.0.0",]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
version = "0.2.29"
name = "source-commercetools"
description = "Source implementation for Commercetools."
authors = [ "Airbyte <[email protected]>",]
authors = ["Airbyte <[email protected]>"]
license = "MIT"
readme = "README.md"
documentation = "https://docs.airbyte.com/integrations/sources/commercetools"
Expand All @@ -17,7 +17,7 @@ include = "source_commercetools"

[tool.poetry.dependencies]
python = "^3.9,<3.12"
airbyte-cdk = "1.0.0"
airbyte-cdk = "1.8.0"

[tool.poetry.scripts]
source-commercetools = "source_commercetools.run:run"
Expand Down
5 changes: 4 additions & 1 deletion airbyte-integrations/connectors/source-commercetools/source_commercetools/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ def _get_refresh_access_token_response(self):
region = self.config["region"]
project_key = self.config["project_key"]
host = self.config["host"]
url = f"https://auth.{region}.{host}.commercetools.com/oauth/token?grant_type=client_credentials&scope=manage_project:{project_key}"
logger.info(f"Refreshing access token for project {project_key}")
scopes = map(lambda s: s + ":" + project_key, self.config["scopes"].split(","))
scope_request = " ".join(scopes)
url = f"https://auth.{region}.{host}.commercetools.com/oauth/token?grant_type=client_credentials&scope={scope_request}"
try:
response = requests.post(url, auth=(self.config["client_id"], self.config["client_secret"]))
response.raise_for_status()
Expand Down
Loading
Loading