Skip to content

Commit 9b2388c

Browse files
authored
🎉 Source intercom: migration to CDK (#4676)
* Added Intercom implementation * Updated segments docs * Updated _send_request method to new airbyte-cdk version * Updated cursor field to datetime string * Added filtering by state for incremental sync * Updated cursor paths for test incremental sync * Added dict type validation to get_data method * Updated catalog * Updated typing for start_date * Updated singer seed to cdk seed * Updated connector docs * Updated sample config file * Sorted streams alphabetically * Removed placeholder comments * Renamed rate_limit to queries_per_hour * Updated common sleep time to backoff_time method
1 parent e577b49 commit 9b2388c

37 files changed

+3607
-21
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"sourceDefinitionId": "d8313939-3782-41b0-be29-b3ca20d8dd3a",
33
"name": "Intercom",
4-
"dockerRepository": "airbyte/source-intercom-singer",
5-
"dockerImageTag": "0.2.3",
6-
"documentationUrl": "https://hub.docker.com/r/airbyte/source-intercom-singer",
4+
"dockerRepository": "airbyte/source-intercom",
5+
"dockerImageTag": "0.1.0",
6+
"documentationUrl": "https://hub.docker.com/r/airbyte/source-intercom",
77
"icon": "intercom.svg"
88
}

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@
184184
icon: zendesk.svg
185185
- sourceDefinitionId: d8313939-3782-41b0-be29-b3ca20d8dd3a
186186
name: Intercom
187-
dockerRepository: airbyte/source-intercom-singer
188-
dockerImageTag: 0.2.3
189-
documentationUrl: https://hub.docker.com/r/airbyte/source-intercom-singer
187+
dockerRepository: airbyte/source-intercom
188+
dockerImageTag: 0.1.0
189+
documentationUrl: https://hub.docker.com/r/airbyte/source-intercom
190190
icon: intercom.svg
191191
- sourceDefinitionId: 68e63de2-bb83-4c7e-93fa-a8a9051e3993
192192
name: Jira

airbyte-integrations/builds.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

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

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

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

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*
2+
!Dockerfile
3+
!Dockerfile.test
4+
!main.py
5+
!source_intercom
6+
!setup.py
7+
!secrets
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM python:3.7-slim
2+
3+
# Bash is installed for more convenient debugging.
4+
RUN apt-get update && apt-get install -y bash && rm -rf /var/lib/apt/lists/*
5+
6+
WORKDIR /airbyte/integration_code
7+
COPY source_intercom ./source_intercom
8+
COPY main.py ./
9+
COPY setup.py ./
10+
RUN pip install .
11+
12+
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
13+
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
14+
15+
LABEL io.airbyte.version=0.1.0
16+
LABEL io.airbyte.name=airbyte/source-intercom
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
# Intercom Source
2+
3+
This is the repository for the Intercom 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/intercom).
5+
6+
## Local development
7+
8+
### Prerequisites
9+
**To iterate on this connector, make sure to complete this prerequisites section.**
10+
11+
#### Minimum Python version required `= 3.7.0`
12+
13+
#### Build & Activate Virtual Environment and install dependencies
14+
From this connector directory, create a virtual environment:
15+
```
16+
python -m venv .venv
17+
```
18+
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+
```
25+
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.
26+
27+
Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
28+
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
29+
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
30+
should work as you expect.
31+
32+
#### Building via Gradle
33+
You can also build the connector in Gradle. This is typically used in CI and not needed for your development workflow.
34+
35+
To build using Gradle, from the Airbyte repository root, run:
36+
```
37+
./gradlew :airbyte-integrations:connectors:source-intercom:build
38+
```
39+
40+
#### Create credentials
41+
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/intercom)
42+
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_intercom/spec.json` file.
43+
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
44+
See `integration_tests/sample_config.json` for a sample config file.
45+
46+
**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source intercom test creds`
47+
and place them into `secrets/config.json`.
48+
49+
### Locally running the connector
50+
```
51+
python main.py spec
52+
python main.py check --config secrets/config.json
53+
python main.py discover --config secrets/config.json
54+
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
55+
```
56+
57+
### Locally running the connector docker image
58+
59+
#### Build
60+
First, make sure you build the latest Docker image:
61+
```
62+
docker build . -t airbyte/source-intercom:dev
63+
```
64+
65+
You can also build the connector image via Gradle:
66+
```
67+
./gradlew :airbyte-integrations:connectors:source-intercom:airbyteDocker
68+
```
69+
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
70+
the Dockerfile.
71+
72+
#### Run
73+
Then run any of the connector commands as follows:
74+
```
75+
docker run --rm airbyte/source-intercom:dev spec
76+
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-intercom:dev check --config /secrets/config.json
77+
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-intercom:dev discover --config /secrets/config.json
78+
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-intercom:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
79+
```
80+
## Testing
81+
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.
82+
First install test dependencies into your virtual environment:
83+
```
84+
pip install .[tests]
85+
```
86+
### Unit Tests
87+
To run unit tests locally, from the connector directory run:
88+
```
89+
python -m pytest unit_tests
90+
```
91+
92+
### Integration Tests
93+
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).
94+
#### Custom Integration tests
95+
Place custom tests inside `integration_tests/` folder, then, from the connector root, run
96+
```
97+
python -m pytest integration_tests
98+
```
99+
#### Acceptance Tests
100+
Customize `acceptance-test-config.yml` file to configure tests. See [Source Acceptance Tests](source-acceptance-tests.md) for more information.
101+
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.
102+
To run your integration tests with acceptance tests, from the connector root, run
103+
```
104+
python -m pytest integration_tests -p integration_tests.acceptance
105+
```
106+
To run your integration tests with docker
107+
108+
### Using gradle to run tests
109+
All commands should be run from airbyte project root.
110+
To run unit tests:
111+
```
112+
./gradlew :airbyte-integrations:connectors:source-intercom:unitTest
113+
```
114+
To run acceptance and custom integration tests:
115+
```
116+
./gradlew :airbyte-integrations:connectors:source-intercom:integrationTest
117+
```
118+
119+
## Dependency Management
120+
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.
121+
We split dependencies between two groups, dependencies that are:
122+
* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
123+
* required for the testing need to go to `TEST_REQUIREMENTS` list
124+
125+
### Publishing a new version of the connector
126+
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
127+
1. Make sure your changes are passing unit and integration tests.
128+
1. Bump the connector version in `Dockerfile` -- just increment the value of the `LABEL io.airbyte.version` appropriately (we use [SemVer](https://semver.org/)).
129+
1. Create a Pull Request.
130+
1. Pat yourself on the back for being an awesome contributor.
131+
1. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# See [Source Acceptance Tests](https://docs.airbyte.io/contributing-to-airbyte/building-new-connector/source-acceptance-tests.md)
2+
# for more information about how to configure these tests
3+
connector_image: airbyte/source-intercom:dev
4+
tests:
5+
spec:
6+
- spec_path: "source_intercom/spec.json"
7+
connection:
8+
- config_path: "secrets/config.json"
9+
status: "succeed"
10+
- config_path: "integration_tests/invalid_config.json"
11+
status: "failed"
12+
discovery:
13+
- config_path: "secrets/config.json"
14+
basic_read:
15+
- config_path: "secrets/config.json"
16+
configured_catalog_path: "integration_tests/configured_catalog.json"
17+
validate_output_from_all_streams: yes
18+
incremental:
19+
- config_path: "secrets/config.json"
20+
configured_catalog_path: "integration_tests/configured_catalog.json"
21+
future_state_path: "integration_tests/abnormal_state.json"
22+
cursor_paths:
23+
companies: ["updated_at"]
24+
company_segments: ["updated_at"]
25+
conversations: ["updated_at"]
26+
conversation_parts: ["updated_at"]
27+
contacts: ["updated_at"]
28+
segments: ["updated_at"]
29+
full_refresh:
30+
- config_path: "secrets/config.json"
31+
configured_catalog_path: "integration_tests/configured_catalog.json"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env sh
2+
docker run --rm -it \
3+
-v /var/run/docker.sock:/var/run/docker.sock \
4+
-v /tmp:/tmp \
5+
-v $(pwd):/test_input \
6+
airbyte/source-acceptance-test \
7+
--acceptance-test-config /test_input
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
plugins {
2+
id 'airbyte-python'
3+
id 'airbyte-docker'
4+
id 'airbyte-source-acceptance-test'
5+
}
6+
7+
airbytePython {
8+
moduleDirectory 'source_intercom'
9+
}
10+
11+
dependencies {
12+
implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs)
13+
implementation files(project(':airbyte-integrations:bases:base-python').airbyteDocker.outputs)
14+
}

airbyte-integrations/connectors/source-intercom/integration_tests/__init__.py

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"companies": {
3+
"updated_at": "2022-07-12T10:44:09+00:00"
4+
},
5+
"company_segments": {
6+
"updated_at": "2022-07-12T10:44:09+00:00"
7+
},
8+
"conversations": {
9+
"updated_at": "2022-07-12T10:44:09+00:00"
10+
},
11+
"conversation_parts": {
12+
"updated_at": "2022-07-12T10:44:09+00:00"
13+
},
14+
"contacts": {
15+
"updated_at": "2022-07-12T10:44:09+00:00"
16+
},
17+
"segments": {
18+
"updated_at": "2022-07-12T10:44:09+00:00"
19+
}
20+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#
2+
# MIT License
3+
#
4+
# Copyright (c) 2020 Airbyte
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all
14+
# copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
#
24+
25+
26+
import pytest
27+
28+
pytest_plugins = ("source_acceptance_test.plugin",)
29+
30+
31+
@pytest.fixture(scope="session", autouse=True)
32+
def connector_setup():
33+
yield

0 commit comments

Comments
 (0)