Skip to content

Commit 8716e45

Browse files
authored
✨ source-zendesk-talk: migrate to poetry (#35156)
1 parent 7e6624e commit 8716e45

File tree

6 files changed

+1108
-170
lines changed

6 files changed

+1108
-170
lines changed
Lines changed: 44 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,91 @@
1-
# Zendesk Talk Source
1+
# Zendesk-Talk source connector
22

3-
This is the repository for the Zendesk Talk 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/zendesk-talk).
3+
4+
This is the repository for the Zendesk-Talk source connector, written in Python.
5+
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/zendesk-talk).
56

67
## Local development
78

89
### Prerequisites
10+
* Python (~=3.9)
11+
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
912

10-
**To iterate on this connector, make sure to complete this prerequisites section.**
11-
12-
#### Minimum Python version required `= 3.7.0`
13-
14-
#### Build & Activate Virtual Environment and install dependencies
15-
16-
From this connector directory, create a virtual environment:
1713

14+
### Installing the connector
15+
From this connector directory, run:
1816
```bash
19-
python -m venv .venv
17+
poetry install --with dev
2018
```
2119

22-
This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
23-
development environment of choice. To activate it from the terminal, run:
24-
25-
```bash
26-
source .venv/bin/activate
27-
pip install -r requirements.txt
28-
```
2920

30-
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.
31-
32-
Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
33-
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
34-
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
35-
should work as you expect.
36-
37-
#### Create credentials
38-
39-
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/zendesk-talk)
40-
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_zendesk_talk/spec.json` file.
41-
Note that the `secrets` directory is gitignored by default, so there is no danger of accidentally checking in sensitive information.
21+
### Create credentials
22+
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/zendesk-talk)
23+
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_zendesk_talk/spec.yaml` file.
24+
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
4225
See `sample_files/sample_config.json` for a sample config file.
4326

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

4728
### Locally running the connector
48-
49-
```bash
50-
python main.py spec
51-
python main.py check --config secrets/config.json
52-
python main.py discover --config secrets/config.json
53-
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
5429
```
55-
56-
### Locally running the connector docker image
57-
58-
#### Use `airbyte-ci` to build your connector
59-
60-
The Airbyte way of building this connector is to use our `airbyte-ci` tool.
61-
You can follow install instructions [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md#L1).
62-
Then running the following command will build your connector:
63-
64-
```bash
65-
airbyte-ci connectors --name=source-zendesk-talk build
30+
poetry run source-zendesk-talk spec
31+
poetry run source-zendesk-talk check --config secrets/config.json
32+
poetry run source-zendesk-talk discover --config secrets/config.json
33+
poetry run source-zendesk-talk read --config secrets/config.json --catalog sample_files/configured_catalog.json
6634
```
6735

68-
Once the command is done, you will find your connector image in your local docker registry: `airbyte/source-zendesk-talk:dev`.
69-
70-
##### Customizing our build process
71-
72-
When contributing on our connector you might need to customize the build process to add a system dependency or set an env var.
73-
You can customize our build process by adding a `build_customization.py` module to your connector.
74-
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.
75-
It will be imported at runtime by our build process and the functions will be called if they exist.
76-
77-
Here is an example of a `build_customization.py` module:
78-
79-
```python
80-
from __future__ import annotations
81-
82-
from typing import TYPE_CHECKING
83-
84-
if TYPE_CHECKING:
85-
# Feel free to check the dagger documentation for more information on the Container object and its methods.
86-
# https://dagger-io.readthedocs.io/en/sdk-python-v0.6.4/
87-
from dagger import Container
88-
89-
90-
async def pre_connector_install(base_image_container: Container) -> Container:
91-
return await base_image_container.with_env_variable("MY_PRE_BUILD_ENV_VAR", "my_pre_build_env_var_value")
92-
93-
async def post_connector_install(connector_container: Container) -> Container:
94-
return await connector_container.with_env_variable("MY_POST_BUILD_ENV_VAR", "my_post_build_env_var_value")
36+
### Running unit tests
37+
To run unit tests locally, from the connector directory run:
9538
```
96-
97-
#### Build your own connector image
98-
99-
This connector is built using our dynamic built process in `airbyte-ci`.
100-
The base image used to build it is defined within the metadata.yaml file under the `connectorBuildOptions`.
101-
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).
102-
It does not rely on a Dockerfile.
103-
104-
If you would like to patch our connector and build your own a simple approach would be to:
105-
106-
1. Create your own Dockerfile based on the latest version of the connector image.
107-
108-
```Dockerfile
109-
FROM airbyte/source-zendesk-talk:latest
110-
111-
COPY . ./airbyte/integration_code
112-
RUN pip install ./airbyte/integration_code
113-
114-
# The entrypoint and default env vars are already set in the base image
115-
# ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
116-
# ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
39+
poetry run pytest unit_tests
11740
```
11841

119-
Please use this as an example. This is not optimized.
120-
121-
2. Build your image:
122-
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:
12345
```bash
124-
docker build -t airbyte/source-zendesk-talk:dev .
125-
# Running the spec command against your patched connector
126-
docker run airbyte/source-zendesk-talk:dev spec
46+
airbyte-ci connectors --name=source-zendesk-talk build
12747
```
12848

129-
#### Run
49+
An image will be available on your host with the tag `airbyte/source-zendesk-talk:dev`.
13050

131-
Then run any of the connector commands as follows:
13251

133-
```bash
52+
### Running as a docker container
53+
Then run any of the connector commands as follows:
54+
```
13455
docker run --rm airbyte/source-zendesk-talk:dev spec
13556
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-zendesk-talk:dev check --config /secrets/config.json
13657
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-zendesk-talk:dev discover --config /secrets/config.json
137-
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/sample_files:/sample_files airbyte/source-zendesk-talk:dev read --config /secrets/config.json --catalog /sample_files/configured_catalog.json
58+
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-zendesk-talk:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
13859
```
13960

140-
## Testing
141-
61+
### Running our CI test suite
14262
You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):
143-
14463
```bash
14564
airbyte-ci connectors --name=source-zendesk-talk test
14665
```
14766

14867
### Customizing acceptance Tests
149-
150-
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.
15169
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.
15270

153-
## Dependency Management
154-
155-
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.
156-
We split dependencies between two groups, dependencies that are:
157-
158-
* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
159-
* 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+
```
16077

161-
### Publishing a new version of the connector
78+
Please commit the changes to `pyproject.toml` and `poetry.lock` files.
16279

80+
## Publishing a new version of the connector
16381
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
164-
16582
1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-zendesk-talk test`
166-
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`
16786
3. Make sure the `metadata.yaml` content is up to date.
168-
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/zendesk-talk.md`).
87+
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/zendesk-talk.md`).
16988
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).
17089
6. Pat yourself on the back for being an awesome contributor.
17190
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-zendesk-talk/metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ data:
1111
connectorSubtype: api
1212
connectorType: source
1313
definitionId: c8630570-086d-4a40-99ae-ea5b18673071
14-
dockerImageTag: 0.1.11
14+
dockerImageTag: 0.1.12
1515
dockerRepository: airbyte/source-zendesk-talk
1616
documentationUrl: https://docs.airbyte.com/integrations/sources/zendesk-talk
1717
githubIssueLabel: source-zendesk-talk

0 commit comments

Comments
 (0)