-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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.
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
🎉 Source Drift: migrate to the CDK #7247
Merged
vitaliizazmic
merged 4 commits into
master
from
vitalii/7041_drift_refactor_to_use_the_cdk
Oct 27, 2021
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a2e2200
Drift #5190 - migrate to CDK, add acceptance tests
vitaliizazmic 4a34fb1
Source Drift #7041 - fixing according to PR review
vitaliizazmic 501a6aa
Merge branch 'master' into vitalii/7041_drift_refactor_to_use_the_cdk
vitaliizazmic be7cf99
Source Drift #7041 - bump version and update changelogs
vitaliizazmic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| * | ||
| !Dockerfile | ||
| !main.py | ||
| !source_drift | ||
| !setup.py | ||
| !secrets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,38 @@ | ||
| FROM airbyte/integration-base-python:0.1.1 | ||
| FROM python:3.7.11-alpine3.14 as base | ||
|
|
||
| # Bash is installed for more convenient debugging. | ||
| RUN apt-get update && apt-get install -y bash && rm -rf /var/lib/apt/lists/* | ||
| # build and load all requirements | ||
| FROM base as builder | ||
| WORKDIR /airbyte/integration_code | ||
|
|
||
| # upgrade pip to the latest version | ||
| RUN apk --no-cache upgrade \ | ||
| && pip install --upgrade pip \ | ||
| && apk --no-cache add tzdata build-base | ||
|
|
||
| ENV CODE_PATH="source_drift" | ||
| ENV AIRBYTE_IMPL_MODULE="source_drift" | ||
| ENV AIRBYTE_IMPL_PATH="SourceDrift" | ||
|
|
||
| WORKDIR /airbyte/integration_code | ||
| COPY $CODE_PATH ./$CODE_PATH | ||
| COPY setup.py ./ | ||
| RUN pip install . | ||
| # install necessary packages to a temporary folder | ||
| RUN pip install --prefix=/install . | ||
|
|
||
| # build a clean environment | ||
| FROM base | ||
| WORKDIR /airbyte/integration_code | ||
|
|
||
| # copy all loaded and built libraries to a pure basic image | ||
| COPY --from=builder /install /usr/local | ||
| # add default timezone settings | ||
| COPY --from=builder /usr/share/zoneinfo/Etc/UTC /etc/localtime | ||
| RUN echo "Etc/UTC" > /etc/timezone | ||
|
|
||
| # bash is installed for more convenient debugging. | ||
| RUN apk --no-cache add bash | ||
|
|
||
| # copy payload code only | ||
| COPY main.py ./ | ||
| COPY source_drift ./source_drift | ||
|
|
||
| ENV AIRBYTE_ENTRYPOINT "/airbyte/base.sh" | ||
| ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" | ||
| ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] | ||
|
|
||
| LABEL io.airbyte.version=0.2.2 | ||
| LABEL io.airbyte.name=airbyte/source-drift | ||
20 changes: 20 additions & 0 deletions
20
airbyte-integrations/connectors/source-drift/acceptance-test-config.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # See [Source Acceptance Tests](https://docs.airbyte.io/connector-development/testing-connectors/source-acceptance-tests-reference) | ||
| # for more information about how to configure these tests | ||
| connector_image: airbyte/source-drift:dev | ||
| tests: | ||
| spec: | ||
| - spec_path: "source_drift/spec.json" | ||
| connection: | ||
| - config_path: "secrets/config.json" | ||
| status: "succeed" | ||
| - config_path: "integration_tests/invalid_config.json" | ||
| status: "failed" | ||
| discovery: | ||
| - config_path: "secrets/config.json" | ||
| basic_read: | ||
| - config_path: "secrets/config.json" | ||
| configured_catalog_path: "integration_tests/configured_catalog.json" | ||
| empty_streams: ["accounts", ] | ||
| full_refresh: | ||
| - config_path: "secrets/config.json" | ||
| configured_catalog_path: "integration_tests/configured_catalog.json" |
16 changes: 16 additions & 0 deletions
16
airbyte-integrations/connectors/source-drift/acceptance-test-docker.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
| # Build latest connector image | ||
| docker build . -t $(cat acceptance-test-config.yml | grep "connector_image" | head -n 1 | cut -d: -f2) | ||
|
|
||
| # Pull latest acctest image | ||
| docker pull airbyte/source-acceptance-test:latest | ||
|
|
||
| # Run | ||
| docker run --rm -it \ | ||
| -v /var/run/docker.sock:/var/run/docker.sock \ | ||
| -v /tmp:/tmp \ | ||
| -v $(pwd):/test_input \ | ||
| airbyte/source-acceptance-test \ | ||
| --acceptance-test-config /test_input | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,13 @@ | ||
| plugins { | ||
| id 'airbyte-python' | ||
| id 'airbyte-docker' | ||
| id 'airbyte-standard-source-test-file' | ||
| id 'airbyte-source-acceptance-test' | ||
| } | ||
|
|
||
| airbytePython { | ||
| moduleDirectory 'source_drift' | ||
| } | ||
|
|
||
| airbyteStandardSourceTestFile { | ||
| specPath = "source_drift/spec.json" | ||
| configPath = "secrets/config.json" | ||
| configuredCatalogPath = "sample_files/configured_catalog.json" | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation files(project(':airbyte-integrations:bases:base-standard-source-test-file').airbyteDocker.outputs) | ||
| implementation files(project(':airbyte-integrations:bases:base-python').airbyteDocker.outputs) | ||
| implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs) | ||
| } |
3 changes: 3 additions & 0 deletions
3
airbyte-integrations/connectors/source-drift/integration_tests/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # | ||
| # Copyright (c) 2021 Airbyte, Inc., all rights reserved. | ||
| # |
14 changes: 14 additions & 0 deletions
14
airbyte-integrations/connectors/source-drift/integration_tests/acceptance.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # | ||
| # Copyright (c) 2021 Airbyte, Inc., all rights reserved. | ||
| # | ||
|
|
||
|
|
||
| import pytest | ||
|
|
||
| pytest_plugins = ("source_acceptance_test.plugin",) | ||
|
|
||
|
|
||
| @pytest.fixture(scope="session", autouse=True) | ||
| def connector_setup(): | ||
| """ This fixture is a placeholder for external resources that acceptance test might require.""" | ||
| yield |
167 changes: 167 additions & 0 deletions
167
airbyte-integrations/connectors/source-drift/integration_tests/catalog.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| { | ||
| "streams": [ | ||
| { | ||
| "name": "accounts", | ||
| "json_schema": { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "type": "object", | ||
| "properties": { | ||
| "ownerId": { | ||
| "type": "integer" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "domain": { | ||
| "type": "string" | ||
| }, | ||
| "accountId": { | ||
| "type": "string" | ||
| }, | ||
| "customProperties": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "object", | ||
| "properties": { | ||
| "label": { | ||
| "type": "string" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "value": {}, | ||
| "type": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "deleted": { | ||
| "type": "boolean" | ||
| }, | ||
| "createDateTime": { | ||
| "type": "integer" | ||
| }, | ||
| "updateDateTime": { | ||
| "type": "integer" | ||
| }, | ||
| "targeted": { | ||
| "type": "boolean" | ||
| } | ||
| } | ||
| }, | ||
| "supported_sync_modes": ["full_refresh"], | ||
| "source_defined_cursor": false | ||
| }, | ||
| { | ||
| "name": "conversations", | ||
| "json_schema": { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "integer" | ||
| }, | ||
| "participants": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "integer" | ||
| } | ||
| }, | ||
| "status": { | ||
| "type": "string", | ||
| "enum": ["open", "closed", "pending", "bulk_sent"] | ||
| }, | ||
| "contactId": { | ||
| "type": "integer" | ||
| }, | ||
| "inboxId": { | ||
| "type": "integer" | ||
| }, | ||
| "createdAt": { | ||
| "type": "integer" | ||
| }, | ||
| "updatedAt": { | ||
| "type": "integer" | ||
| }, | ||
| "relatedPlaybookId": { | ||
| "type": ["null", "string"] | ||
| }, | ||
| "conversationTags": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "object", | ||
| "properties": { | ||
| "color": { | ||
| "type": "string", | ||
| "description": "HEX value" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "supported_sync_modes": ["full_refresh"], | ||
| "source_defined_cursor": false | ||
| }, | ||
| { | ||
| "name": "users", | ||
| "json_schema": { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "integer" | ||
| }, | ||
| "orgId": { | ||
| "type": "integer" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "alias": { | ||
| "type": "string" | ||
| }, | ||
| "email": { | ||
| "type": "string" | ||
| }, | ||
| "phone": { | ||
| "type": "string" | ||
| }, | ||
| "locale": { | ||
| "type": "string" | ||
| }, | ||
| "availability": { | ||
| "type": "string" | ||
| }, | ||
| "role": { | ||
| "type": "string" | ||
| }, | ||
| "timeZone": { | ||
| "type": "string" | ||
| }, | ||
| "avatarUrl": { | ||
| "type": "string" | ||
| }, | ||
| "verified": { | ||
| "type": "boolean" | ||
| }, | ||
| "bot": { | ||
| "type": "boolean" | ||
| }, | ||
| "createdAt": { | ||
| "type": "integer" | ||
| }, | ||
| "updatedAt": { | ||
| "type": "integer" | ||
| } | ||
| } | ||
| }, | ||
| "supported_sync_modes": ["full_refresh"], | ||
| "source_defined_cursor": false | ||
| } | ||
| ] | ||
| } |
31 changes: 31 additions & 0 deletions
31
airbyte-integrations/connectors/source-drift/integration_tests/configured_catalog.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { | ||
| "streams": [ | ||
| { | ||
| "stream": { | ||
| "name": "accounts", | ||
| "json_schema": {}, | ||
| "supported_sync_modes": ["full_refresh"] | ||
| }, | ||
| "sync_mode": "full_refresh", | ||
| "destination_sync_mode": "overwrite" | ||
| }, | ||
| { | ||
| "stream": { | ||
| "name": "conversations", | ||
| "json_schema": {}, | ||
| "supported_sync_modes": ["full_refresh"] | ||
| }, | ||
| "sync_mode": "full_refresh", | ||
| "destination_sync_mode": "overwrite" | ||
| }, | ||
| { | ||
| "stream": { | ||
| "name": "users", | ||
| "json_schema": {}, | ||
| "supported_sync_modes": ["full_refresh"] | ||
| }, | ||
| "sync_mode": "full_refresh", | ||
| "destination_sync_mode": "overwrite" | ||
| } | ||
| ] | ||
| } |
3 changes: 3 additions & 0 deletions
3
airbyte-integrations/connectors/source-drift/integration_tests/invalid_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "access_token": "invalid_access_token" | ||
| } |
3 changes: 3 additions & 0 deletions
3
airbyte-integrations/connectors/source-drift/integration_tests/sample_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "access_token": "1234567890abcdefghijk" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| # This file is autogenerated -- only edit if you know what you are doing. Use setup.py for declaring dependencies. | ||
| -e ../../bases/airbyte-protocol | ||
| -e ../../bases/base-python | ||
| -e ../../bases/source-acceptance-test | ||
| -e . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.