Skip to content

Commit a57f3b8

Browse files
bleonardbleonard
authored
source-kyriba: ensure inline schemas, updated cdk, poetry (where possible) (#37184)
1 parent 27f188a commit a57f3b8

File tree

12 files changed

+1240
-152
lines changed

12 files changed

+1240
-152
lines changed

‎airbyte-integrations/connectors/source-kyriba/README.md

+44-103
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,55 @@
1-
# Kyriba Source
1+
# Kyriba source connector
2+
23

34
This is the repository for the Kyriba source connector, written in Python.
4-
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/kyriba).
5+
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/kyriba).
56

67
## Local development
78

89
### Prerequisites
9-
**To iterate on this connector, make sure to complete this prerequisites section.**
10-
11-
#### Minimum Python version required `= 3.10.0`
10+
* Python (~=3.9)
11+
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
1212

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

19-
This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
20-
development environment of choice. To activate it from the terminal, run:
21-
```
22-
source .venv/bin/activate
23-
pip install -r requirements.txt
24-
pip install '.[tests]'
14+
### Installing the connector
15+
From this connector directory, run:
16+
```bash
17+
poetry install --with dev
2518
```
26-
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.
2719

28-
Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
29-
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
30-
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
31-
should work as you expect.
3220

33-
#### Create credentials
34-
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/kyriba)
35-
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_kyriba/spec.json` file.
21+
### Create credentials
22+
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/kyriba)
23+
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_kyriba/spec.yaml` file.
3624
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
37-
See `integration_tests/sample_config.json` for a sample config file.
25+
See `sample_files/sample_config.json` for a sample config file.
3826

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

4228
### Locally running the connector
4329
```
44-
python main.py spec
45-
python main.py check --config secrets/config.json
46-
python main.py discover --config secrets/config.json
47-
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
30+
poetry run source-kyriba spec
31+
poetry run source-kyriba check --config secrets/config.json
32+
poetry run source-kyriba discover --config secrets/config.json
33+
poetry run source-kyriba read --config secrets/config.json --catalog sample_files/configured_catalog.json
4834
```
4935

50-
### Locally running the connector docker image
51-
52-
53-
54-
55-
#### Use `airbyte-ci` to build your connector
56-
The Airbyte way of building this connector is to use our `airbyte-ci` tool.
57-
You can follow install instructions [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md#L1).
58-
Then running the following command will build your connector:
59-
60-
```bash
61-
airbyte-ci connectors --name source-kyriba build
36+
### Running unit tests
37+
To run unit tests locally, from the connector directory run:
6238
```
63-
Once the command is done, you will find your connector image in your local docker registry: `airbyte/source-kyriba:dev`.
64-
65-
##### Customizing our build process
66-
When contributing on our connector you might need to customize the build process to add a system dependency or set an env var.
67-
You can customize our build process by adding a `build_customization.py` module to your connector.
68-
This module should contain a `pre_connector_install` and `post_connector_install` async function that will mutate the base image and the connector container respectively.
69-
It will be imported at runtime by our build process and the functions will be called if they exist.
70-
71-
Here is an example of a `build_customization.py` module:
72-
```python
73-
from __future__ import annotations
74-
75-
from typing import TYPE_CHECKING
76-
77-
if TYPE_CHECKING:
78-
# Feel free to check the dagger documentation for more information on the Container object and its methods.
79-
# https://dagger-io.readthedocs.io/en/sdk-python-v0.6.4/
80-
from dagger import Container
81-
82-
83-
async def pre_connector_install(base_image_container: Container) -> Container:
84-
return await base_image_container.with_env_variable("MY_PRE_BUILD_ENV_VAR", "my_pre_build_env_var_value")
85-
86-
async def post_connector_install(connector_container: Container) -> Container:
87-
return await connector_container.with_env_variable("MY_POST_BUILD_ENV_VAR", "my_post_build_env_var_value")
39+
poetry run pytest unit_tests
8840
```
8941

90-
#### Build your own connector image
91-
This connector is built using our dynamic built process in `airbyte-ci`.
92-
The base image used to build it is defined within the metadata.yaml file under the `connectorBuildOptions`.
93-
The build logic is defined using [Dagger](https://dagger.io/) [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/pipelines/builds/python_connectors.py).
94-
It does not rely on a Dockerfile.
95-
96-
If you would like to patch our connector and build your own a simple approach would be to:
97-
98-
1. Create your own Dockerfile based on the latest version of the connector image.
99-
```Dockerfile
100-
FROM airbyte/source-kyriba:latest
42+
### Building the docker image
43+
1. Install [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
44+
2. Run the following command to build the docker image:
45+
```bash
46+
airbyte-ci connectors --name=source-kyriba build
47+
```
10148

102-
COPY . ./airbyte/integration_code
103-
RUN pip install ./airbyte/integration_code
49+
An image will be available on your host with the tag `airbyte/source-kyriba:dev`.
10450

105-
# The entrypoint and default env vars are already set in the base image
106-
# ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
107-
# ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
108-
```
109-
Please use this as an example. This is not optimized.
11051

111-
2. Build your image:
112-
```bash
113-
docker build -t airbyte/source-kyriba:dev .
114-
# Running the spec command against your patched connector
115-
docker run airbyte/source-kyriba:dev spec
116-
```
117-
#### Run
52+
### Running as a docker container
11853
Then run any of the connector commands as follows:
11954
```
12055
docker run --rm airbyte/source-kyriba:dev spec
@@ -123,28 +58,34 @@ docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-kyriba:dev discover --
12358
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-kyriba:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
12459
```
12560

126-
## Testing
61+
### Running our CI test suite
12762
You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):
12863
```bash
12964
airbyte-ci connectors --name=source-kyriba test
13065
```
13166

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

136-
## Dependency Management
137-
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.
138-
We split dependencies between two groups, dependencies that are:
139-
* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
140-
* required for the testing need to go to `TEST_REQUIREMENTS` list
71+
### Dependency Management
72+
All of your dependencies should be managed via Poetry.
73+
To add a new dependency, run:
74+
```bash
75+
poetry add <package-name>
76+
```
77+
78+
Please commit the changes to `pyproject.toml` and `poetry.lock` files.
14179

142-
### Publishing a new version of the connector
80+
## Publishing a new version of the connector
14381
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
14482
1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-kyriba test`
145-
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).
83+
2. Bump the connector version (please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors)):
84+
- bump the `dockerImageTag` value in in `metadata.yaml`
85+
- bump the `version` value in `pyproject.toml`
14686
3. Make sure the `metadata.yaml` content is up to date.
147-
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/kyriba.md`).
87+
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/kyriba.md`).
14888
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).
14989
6. Pat yourself on the back for being an awesome contributor.
15090
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
91+
8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.

‎airbyte-integrations/connectors/source-kyriba/metadata.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data:
77
connectorSubtype: api
88
connectorType: source
99
definitionId: 547dc08e-ab51-421d-953b-8f3745201a8c
10-
dockerImageTag: 0.1.1
10+
dockerImageTag: 0.1.3
1111
dockerRepository: airbyte/source-kyriba
1212
documentationUrl: https://docs.airbyte.com/integrations/sources/kyriba
1313
githubIssueLabel: source-kyriba

0 commit comments

Comments
 (0)