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

Source Recurly: Update CDK #34622

Merged
merged 23 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0f09213
add retry attempts to connection_check; update accounts schema
ChristoGrab Dec 14, 2023
541e050
update coupons, invoices, line_items schemas
ChristoGrab Dec 14, 2023
f063e12
update measured_units, plans, subscriptions, transactions schemas
ChristoGrab Dec 15, 2023
8feaa2c
Merge branch 'master' of https://github.com/airbytehq/airbyte into ch…
ChristoGrab Jan 18, 2024
afb50f1
Merge branch 'master' of https://github.com/airbytehq/airbyte into ch…
ChristoGrab Jan 29, 2024
2e1a42d
schema updates
ChristoGrab Jan 29, 2024
1424e27
unpin CDK, schema updates galore
ChristoGrab Jan 29, 2024
ba7f6c8
update sample future_state to per-stream
ChristoGrab Jan 29, 2024
60337cc
update test-config file
ChristoGrab Jan 29, 2024
2f990f7
remove non empty streams from empty_streams list
ChristoGrab Jan 30, 2024
869daa0
chore: format
ChristoGrab Jan 30, 2024
9889ae0
Merge branch 'master' of https://github.com/airbytehq/airbyte into ch…
ChristoGrab Feb 22, 2024
b018ae3
chore: format
ChristoGrab Feb 22, 2024
a2e04cb
migrate to base image
ChristoGrab Feb 22, 2024
eb8f594
update connector README
ChristoGrab Feb 23, 2024
e220a55
use poetry for dependencies
ChristoGrab Feb 23, 2024
6e205fc
add fraud_info to transactions schema
ChristoGrab Feb 23, 2024
4c056ae
skip comprehensive incremental tests
ChristoGrab Feb 23, 2024
fc21412
update empty_streams list
ChristoGrab Feb 23, 2024
ff6536c
seed data for empty streams and update schemas
ChristoGrab Feb 23, 2024
706280d
chore: cleanup unused imports
ChristoGrab Feb 23, 2024
2e207b6
enable connector in metadata registries
ChristoGrab Feb 23, 2024
f0ae7e4
remove advanced build section from README
ChristoGrab Feb 23, 2024
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
38 changes: 0 additions & 38 deletions airbyte-integrations/connectors/source-recurly/Dockerfile

This file was deleted.

111 changes: 59 additions & 52 deletions airbyte-integrations/connectors/source-recurly/README.md
Original file line number Diff line number Diff line change
@@ -1,97 +1,104 @@
# Amazon Seller-Partner Source
# Recurly source connector

This is the repository for the Amazon Seller-Partner source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/amazon-seller-partner).
This is the repository for the Recurly source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/recurly).

## Local development

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

#### Build & Activate Virtual Environment and install dependencies
From this connector directory, create a virtual environment:
```
python -m venv .venv
```
* Python (~=3.9)
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)

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
### Installing the connector

From this connector directory, run:

```bash
poetry install --with dev
```
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.
### Creating credentials

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/amazon-seller-partner)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_amazon_seller-partner/integration_tests/spec.json` file.
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/recurly)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_recurly/spec.json` file.
Note that the `secrets` directory is gitignored by default, 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 amazon-seller-partner test creds`
**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source recurly 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

```bash
poetry run source-recurly spec
poetry run source-recurly check --config secrets/config.json
poetry run source-recurly discover --config secrets/config.json
poetry run source-recurly read --config secrets/config.json --catalog sample_files/configured_catalog.json
```

### Locally running the connector docker image
### Running unit tests

To run unit tests locally, from the connector directory run:

#### Build
**Via [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) (recommended):**
```bash
airbyte-ci connectors --name source-amazon-seller-partner build
poetry run pytest unit_tests
```

An image will be built with the tag `airbyte/source-amazon-seller-partner:dev`.
### Building the docker image

1. Install [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
2. Run the following command to build the docker image:

**Via `docker build`:**
```bash
docker build -t airbyte/source-amazon-seller-partner:dev .
airbyte-ci connectors --name=source-recurly build
```

#### Run
An image will be available on your host with the tag `airbyte/source-recurly:dev`.

### Running the docker container

Then run any of the connector commands as follows:
```
docker run --rm airbyte/source-amazon-seller-partner:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-amazon-seller-partner:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-amazon-seller-partner:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-amazon-seller-partner:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json

```bash
docker run --rm airbyte/source-recurly:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-recurly:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-recurly:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-recurly:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```

## Testing
### Running our CI test suite

You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):

```bash
airbyte-ci connectors --name=source-recurly test
```

### Customizing acceptance Tests
Customize `acceptance-test-config.yml` file to configure tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) 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.

## 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
Customize the `acceptance-test-config.yml` file to configure acceptance tests. See our [Connector Acceptance Tests reference](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
If your connector requires you to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.

### Dependency Management

All of your dependencies should be managed via Poetry. To add a new dependency, run:

```bash
poetry add <package-name>
```

Please commit the changes to the `pyproject.toml` and `poetry.lock` files.

## Publishing a new version of the connector

### 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 our test suite: `airbyte-ci connectors --name=source-recurly test`
2. Bump the connector version in `metadata.yaml`: increment the `dockerImageTag` value. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
2. Bump the connector version listed as `dockerImageTag` in `metadata.yaml`. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
3. Make sure the `metadata.yaml` content is up to date.
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/recurly.md`).
5. Create a Pull Request: use [our PR naming conventions](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#pull-request-title-convention).
6. Pat yourself on the back for being an awesome contributor.
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.

8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
# See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference)
# for more information about how to configure these tests
connector_image: airbyte/source-recurly:dev
tests:
acceptance_tests:
spec:
- spec_path: "source_recurly/spec.json"
tests:
- spec_path: "source_recurly/spec.json"
connection:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "integration_tests/invalid_config.json"
status: "failed"
tests:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "integration_tests/invalid_config.json"
status: "failed"
discovery:
- config_path: "secrets/config.json"
tests:
- config_path: "secrets/config.json"
basic_read:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
empty_streams:
[
"account_coupon_redemptions",
"account_notes",
"add_ons",
"billing_infos",
"credit_payments",
"line_items",
"shipping_methods",
"unique_coupons",
"export_dates",
]
tests:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
empty_streams:
- name: "add_ons"
bypass_reason: "Cannot seed this stream with free sandbox account"
- name: "billing_infos"
bypass_reason: "Cannot seed this stream with free sandbox account"
- name: "credit_payments"
bypass_reason: "Cannot seed this stream with free sandbox account"
- name: "shipping_methods"
bypass_reason: "Cannot seed this stream with free sandbox account"
full_refresh:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
tests:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
incremental:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state_path: "integration_tests/future_state.json"
tests:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state:
future_state_path: "integration_tests/future_state.json"
skip_comprehensive_incremental_tests: true
Copy link
Contributor Author

@ChristoGrab ChristoGrab Feb 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have to skip this test, explanation courtesy of a much wiser engineer than I:
Test skip reason

Loading
Loading