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.

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

🎉 New source: Square #4439

Merged
merged 39 commits into from
Jul 7, 2021
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
63d083a
Initial commit
TymoshokDmytro Jun 10, 2021
6a4f026
Add items, categories, discounts, taxes and locations full sync streams
TymoshokDmytro Jun 15, 2021
49044f7
Refactor. Add incremental sync to items, categories, discounts and taxes
TymoshokDmytro Jun 15, 2021
db50006
Merge branch 'master' of github.com:airbytehq/airbyte into dtymoshok/…
TymoshokDmytro Jun 16, 2021
04ee8c6
Fix the incremental stream
TymoshokDmytro Jun 16, 2021
2dbe9d9
Refactor code
TymoshokDmytro Jun 16, 2021
832d198
Minor refactoring
TymoshokDmytro Jun 16, 2021
e83470c
Minor refactoring
TymoshokDmytro Jun 16, 2021
b46251f
Fix incremental bug
TymoshokDmytro Jun 17, 2021
6f238b4
Merge branch 'master' of github.com:airbytehq/airbyte into dtymoshok/…
TymoshokDmytro Jun 22, 2021
54c52ca
Fix json configs for acceptance tests
TymoshokDmytro Jun 22, 2021
27ca8b2
Refacor invalid config message
TymoshokDmytro Jun 22, 2021
e4e0cb6
Add Team Members API
TymoshokDmytro Jun 22, 2021
00b646d
Add Team Member Wages + Refunds streams
TymoshokDmytro Jun 22, 2021
8d4eb46
Add payments and refunds streams
TymoshokDmytro Jun 23, 2021
d8252e3
Add customers API
TymoshokDmytro Jun 24, 2021
ee90627
Add ModifierList and Shifts streams
TymoshokDmytro Jun 24, 2021
17e7765
Add Orders stream + Rrefactor
TymoshokDmytro Jun 30, 2021
f37bac0
Merge branch 'master' of github.com:airbytehq/airbyte into dtymoshok/…
TymoshokDmytro Jun 30, 2021
98c1095
Documentation and version bumped
TymoshokDmytro Jun 30, 2021
12ae290
Fix merge conflicts
TymoshokDmytro Jun 30, 2021
304ff24
Fix build.md for square badge
TymoshokDmytro Jun 30, 2021
e1a3f0f
Format + add limits to request params of the streams
TymoshokDmytro Jun 30, 2021
406dc32
Refactor square.md file
TymoshokDmytro Jun 30, 2021
aa9077c
Fix ci_credentials.sh for square connector
TymoshokDmytro Jul 1, 2021
e4ad50e
Fix merge conflicts in airbyte-config/init/src/main/resources/seed/so…
TymoshokDmytro Jul 1, 2021
4ddfc1d
Some review fixes
TymoshokDmytro Jul 1, 2021
f94abfa
Merge branch 'master' of github.com:airbytehq/airbyte into dtymoshok/…
TymoshokDmytro Jul 5, 2021
063f86c
Refactor + update location separation
TymoshokDmytro Jul 5, 2021
179b127
Format
TymoshokDmytro Jul 5, 2021
bfd1c5d
Merge branch 'master' of github.com:airbytehq/airbyte into dtymoshok/…
TymoshokDmytro Jul 5, 2021
4332b90
Make Orders location input limit as stream slices
TymoshokDmytro Jul 5, 2021
a724843
Refactor + add unit tests for custom suncions in utils.py
TymoshokDmytro Jul 6, 2021
93ed15d
Format
TymoshokDmytro Jul 6, 2021
a259ead
Merge branch 'master' of github.com:airbytehq/airbyte into dtymoshok/…
TymoshokDmytro Jul 6, 2021
261e775
Fix SA tests problem
TymoshokDmytro Jul 6, 2021
e04ec9f
Add typehints + documentation update
TymoshokDmytro Jul 7, 2021
5af5231
Merge with master. Resolve merge conflicts in tools/bin/ci_credential…
TymoshokDmytro Jul 7, 2021
1410bd6
Remove unnecessary line in items.json
TymoshokDmytro Jul 7, 2021
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
1 change: 1 addition & 0 deletions .github/workflows/publish-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
SNOWFLAKE_INTEGRATION_TEST_CREDS: ${{ secrets.SNOWFLAKE_INTEGRATION_TEST_CREDS }}
SNOWFLAKE_S3_COPY_INTEGRATION_TEST_CREDS: ${{ secrets.SNOWFLAKE_S3_COPY_INTEGRATION_TEST_CREDS }}
SNOWFLAKE_GCS_COPY_INTEGRATION_TEST_CREDS: ${{ secrets.SNOWFLAKE_GCS_COPY_INTEGRATION_TEST_CREDS }}
SOURCE_SQUARE_CREDS: ${{ secrets.SOURCE_SQUARE_CREDS }}
SOURCE_MARKETO_SINGER_INTEGRATION_TEST_CONFIG: ${{ secrets.SOURCE_MARKETO_SINGER_INTEGRATION_TEST_CONFIG }}
SOURCE_RECURLY_INTEGRATION_TEST_CREDS: ${{ secrets.SOURCE_RECURLY_INTEGRATION_TEST_CREDS }}
STRIPE_INTEGRATION_TEST_CREDS: ${{ secrets.STRIPE_INTEGRATION_TEST_CREDS }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
SNOWFLAKE_INTEGRATION_TEST_CREDS: ${{ secrets.SNOWFLAKE_INTEGRATION_TEST_CREDS }}
SNOWFLAKE_S3_COPY_INTEGRATION_TEST_CREDS: ${{ secrets.SNOWFLAKE_S3_COPY_INTEGRATION_TEST_CREDS }}
SNOWFLAKE_GCS_COPY_INTEGRATION_TEST_CREDS: ${{ secrets.SNOWFLAKE_GCS_COPY_INTEGRATION_TEST_CREDS }}
SOURCE_SQUARE_CREDS: ${{ secrets.SOURCE_SQUARE_CREDS }}
SOURCE_MARKETO_SINGER_INTEGRATION_TEST_CONFIG: ${{ secrets.SOURCE_MARKETO_SINGER_INTEGRATION_TEST_CONFIG }}
SOURCE_RECURLY_INTEGRATION_TEST_CREDS: ${{ secrets.SOURCE_RECURLY_INTEGRATION_TEST_CREDS }}
STRIPE_INTEGRATION_TEST_CREDS: ${{ secrets.STRIPE_INTEGRATION_TEST_CREDS }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sourceDefinitionId": "77225a51-cd15-4a13-af02-65816bd0ecf4",
"name": "Square",
"dockerRepository": "airbyte/source-square",
"dockerImageTag": "0.1.0",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/square"
}
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,8 @@
dockerRepository: airbyte/source-okta
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/okta
- sourceDefinitionId: 77225a51-cd15-4a13-af02-65816bd0ecf4
name: Square
dockerRepository: airbyte/source-square
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.io/integrations/sources/square
2 changes: 2 additions & 0 deletions airbyte-integrations/builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@

Snowflake [![source-snowflake](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatus-api.airbyte.io%2Ftests%2Fsummary%2Fsource-snowflake%2Fbadge.json)](https://status-api.airbyte.io/tests/summary/source-snowflake)

Square [![source-square](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatus-api.airbyte.io%2Ftests%2Fsummary%2Fsource-square%2Fbadge.json)](https://status-api.airbyte.io/tests/summary/source-square)

Stripe [![source-stripe](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatus-api.airbyte.io%2Ftests%2Fsummary%2Fsource-stripe%2Fbadge.json)](https://status-api.airbyte.io/tests/summary/source-stripe)

Tempo [![source-tempo](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatus-api.airbyte.io%2Ftests%2Fsummary%2Fsource-tempo%2Fbadge.json)](https://status-api.airbyte.io/tests/summary/source-tempo)
Expand Down
7 changes: 7 additions & 0 deletions airbyte-integrations/connectors/source-square/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*
!Dockerfile
!Dockerfile.test
!main.py
!source_square
!setup.py
!secrets
16 changes: 16 additions & 0 deletions airbyte-integrations/connectors/source-square/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM python:3.7-slim

# Bash is installed for more convenient debugging.
RUN apt-get update && apt-get install -y bash && rm -rf /var/lib/apt/lists/*

WORKDIR /airbyte/integration_code
COPY source_square ./source_square
COPY main.py ./
COPY setup.py ./
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.0
LABEL io.airbyte.name=airbyte/source-square
131 changes: 131 additions & 0 deletions airbyte-integrations/connectors/source-square/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
# Square Source

This is the repository for the Square source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/square).

## Local development

### Prerequisites
**To iterate on this connector, make sure to complete this prerequisites section.**

#### Minimum Python version required `= 3.7.0`

#### Build & Activate Virtual Environment and install dependencies
From this connector directory, create a virtual environment:
```
python -m venv .venv
```

This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
development environment of choice. To activate it from the terminal, run:
```
source .venv/bin/activate
pip install -r requirements.txt
```
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.

Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
If this is mumbo jumbo to you, don't worry about it, just put your deps in `setup.py` but install using `pip install -r requirements.txt` and everything
should work as you expect.

#### Building via Gradle
You can also build the connector in Gradle. This is typically used in CI and not needed for your development workflow.

To build using Gradle, from the Airbyte repository root, run:
```
./gradlew :airbyte-integrations:connectors:source-square:build
```

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/square)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_square/spec.json` file.
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
See `integration_tests/sample_config.json` for a sample config file.

**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source square test creds`
and place them into `secrets/config.json`.

### Locally running the connector
```
python main.py spec
python main.py check --config secrets/config.json
python main.py discover --config secrets/config.json
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
```

### Locally running the connector docker image

#### Build
First, make sure you build the latest Docker image:
```
docker build . -t airbyte/source-square:dev
```

You can also build the connector image via Gradle:
```
./gradlew :airbyte-integrations:connectors:source-square:airbyteDocker
```
When building via Gradle, the docker image name and tag, respectively, are the values of the `io.airbyte.name` and `io.airbyte.version` `LABEL`s in
the Dockerfile.

#### Run
Then run any of the connector commands as follows:
```
docker run --rm airbyte/source-square:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-square:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-square:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-square:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```
## Testing
Make sure to familiarize yourself with [pytest test discovery](https://docs.pytest.org/en/latest/goodpractices.html#test-discovery) to know how your test files and methods should be named.
First install test dependencies into your virtual environment:
```
pip install .[tests]
```
### Unit Tests
To run unit tests locally, from the connector directory run:
```
python -m pytest unit_tests
```

### Integration Tests
There are two types of integration tests: Acceptance Tests (Airbyte's test suite for all source connectors) and custom integration tests (which are specific to this connector).
#### Custom Integration tests
Place custom tests inside `integration_tests/` folder, then, from the connector root, run
```
python -m pytest integration_tests
```
#### Acceptance Tests
Customize `acceptance-test-config.yml` file to configure tests. See [Source Acceptance Tests](source-acceptance-tests.md) for more information.
If your connector requires to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.
To run your integration tests with acceptance tests, from the connector root, run
```
python -m pytest integration_tests -p integration_tests.acceptance
```
To run your integration tests with docker

### Using gradle to run tests
All commands should be run from airbyte project root.
To run unit tests:
```
./gradlew :airbyte-integrations:connectors:source-square:unitTest
```
To run acceptance and custom integration tests:
```
./gradlew :airbyte-integrations:connectors:source-square:integrationTest
```

## Dependency Management
All of your dependencies should go in `setup.py`, NOT `requirements.txt`. The requirements file is only used to connect internal Airbyte dependencies in the monorepo for local development.
We split dependencies between two groups, dependencies that are:
* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
* required for the testing need to go to `TEST_REQUIREMENTS` list

### Publishing a new version of the connector
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
1. Make sure your changes are passing unit and integration tests.
1. Bump the connector version in `Dockerfile` -- just increment the value of the `LABEL io.airbyte.version` appropriately (we use [SemVer](https://semver.org/)).
1. Create a Pull Request.
1. Pat yourself on the back for being an awesome contributor.
1. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
connector_image: airbyte/source-square:dev
tests:
spec:
- spec_path: "source_square/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"
validate_output_from_all_streams: yes
incremental:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state_path: "integration_tests/abnormal_state.json"
full_refresh:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env sh
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
14 changes: 14 additions & 0 deletions airbyte-integrations/connectors/source-square/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'airbyte-python'
id 'airbyte-docker'
id 'airbyte-source-acceptance-test'
}

airbytePython {
moduleDirectory 'source_square'
}

dependencies {
implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs)
implementation files(project(':airbyte-integrations:bases:base-python').airbyteDocker.outputs)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"items": {
"updated_at": "2200-01-01T00:00:00+00:00"
},
"categories": {
"updated_at": "2200-01-01T00:00:00+00:00"
},
"discounts": {
"updated_at": "2200-01-01T00:00:00+00:00"
},
"taxes": {
"updated_at": "2200-01-01T00:00:00+00:00"
},
"modifier_list": {
"updated_at": "2200-01-01T00:00:00+00:00"
},
"refunds": {
"created_at": "2200-01-01T00:00:00+00:00"
},
"payments": {
"created_at": "2200-01-01T00:00:00+00:00"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# MIT License
#
# Copyright (c) 2020 Airbyte
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#


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
Loading