Skip to content

Commit 473a3a9

Browse files
authored
source-insightly: ensure inline schemas, updated cdk, poetry (where possible) (#37177)
1 parent 386067d commit 473a3a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4106
-2050
lines changed

airbyte-integrations/connectors/source-insightly/Dockerfile

-38
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,91 @@
1-
# Insightly Source
1+
# Insightly source connector
22

3-
This is the repository for the Insightly configuration based source connector.
3+
4+
This is the repository for the Insightly source connector, written in Python.
45
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/insightly).
56

67
## Local development
78

8-
#### Building via Gradle
9-
10-
You can also build the connector in Gradle. This is typically used in CI and not needed for your development workflow.
9+
### Prerequisites
10+
* Python (~=3.9)
11+
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
1112

12-
To build using Gradle, from the Airbyte repository root, run:
1313

14-
```
15-
./gradlew :airbyte-integrations:connectors:source-insightly:build
14+
### Installing the connector
15+
From this connector directory, run:
16+
```bash
17+
poetry install --with dev
1618
```
1719

18-
#### Create credentials
1920

21+
### Create credentials
2022
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/insightly)
2123
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_insightly/spec.yaml` file.
2224
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
23-
See `integration_tests/sample_config.json` for a sample config file.
24-
25-
**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source insightly test creds`
26-
and place them into `secrets/config.json`.
25+
See `sample_files/sample_config.json` for a sample config file.
2726

28-
### Locally running the connector docker image
2927

30-
#### Build
28+
### Locally running the connector
29+
```
30+
poetry run source-insightly spec
31+
poetry run source-insightly check --config secrets/config.json
32+
poetry run source-insightly discover --config secrets/config.json
33+
poetry run source-insightly read --config secrets/config.json --catalog sample_files/configured_catalog.json
34+
```
3135

32-
**Via [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) (recommended):**
36+
### Running unit tests
37+
To run unit tests locally, from the connector directory run:
38+
```
39+
poetry run pytest unit_tests
40+
```
3341

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:
3445
```bash
3546
airbyte-ci connectors --name=source-insightly build
3647
```
3748

38-
An image will be built with the tag `airbyte/source-insightly:dev`.
39-
40-
**Via `docker build`:**
49+
An image will be available on your host with the tag `airbyte/source-insightly:dev`.
4150

42-
```bash
43-
docker build -t airbyte/source-insightly:dev .
44-
```
45-
46-
#### Run
4751

52+
### Running as a docker container
4853
Then run any of the connector commands as follows:
49-
5054
```
5155
docker run --rm airbyte/source-insightly:dev spec
5256
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-insightly:dev check --config /secrets/config.json
5357
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-insightly:dev discover --config /secrets/config.json
5458
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-insightly:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
5559
```
5660

57-
## Testing
58-
59-
<<<<<<< HEAD
60-
61-
#### Acceptance Tests
62-
63-
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.
64-
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.
65-
66-
To run your integration tests with Docker, run:
67-
68-
```
69-
./acceptance-test-docker.sh
70-
```
71-
72-
### Using gradle to run tests
73-
74-
All commands should be run from airbyte project root.
75-
To run unit tests:
76-
77-
```
78-
./gradlew :airbyte-integrations:connectors:source-insightly:unitTest
79-
```
80-
81-
To run acceptance and custom integration tests:
82-
83-
```
84-
./gradlew :airbyte-integrations:connectors:source-insightly:integrationTest
85-
```
86-
87-
=======
61+
### Running our CI test suite
8862
You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):
89-
9063
```bash
9164
airbyte-ci connectors --name=source-insightly test
9265
```
9366

9467
### Customizing acceptance Tests
95-
96-
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.
9769
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.
9870

99-
> > > > > > > master
100-
101-
## Dependency Management
102-
103-
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.
104-
We split dependencies between two groups, dependencies that are:
105-
106-
- required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
107-
- 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+
```
10877

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

80+
## Publishing a new version of the connector
11181
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
112-
11382
1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-insightly test`
114-
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`
11586
3. Make sure the `metadata.yaml` content is up to date.
116-
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/insightly.md`).
87+
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/insightly.md`).
11788
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).
11889
6. Pat yourself on the back for being an awesome contributor.
11990
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.
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
data:
2+
ab_internal:
3+
ql: 100
4+
sl: 100
25
allowedHosts:
36
hosts:
4-
- TODO # Please change to the hostname of the source.
5-
remoteRegistries:
6-
pypi:
7-
enabled: true
8-
packageName: airbyte-source-insightly
9-
registries:
10-
oss:
11-
enabled: true
12-
cloud:
13-
enabled: true
7+
- TODO
8+
connectorBuildOptions:
9+
baseImage: docker.io/airbyte/python-connector-base:1.2.0@sha256:c22a9d97464b69d6ef01898edf3f8612dc11614f05a84984451dde195f337db9
1410
connectorSubtype: api
1511
connectorType: source
1612
definitionId: 38f84314-fe6a-4257-97be-a8dcd942d693
17-
dockerImageTag: 0.2.0
13+
dockerImageTag: 0.2.4
1814
dockerRepository: airbyte/source-insightly
15+
documentationUrl: https://docs.airbyte.com/integrations/sources/insightly
1916
githubIssueLabel: source-insightly
2017
icon: insightly.svg
2118
license: MIT
2219
name: Insightly
20+
registries:
21+
cloud:
22+
enabled: true
23+
oss:
24+
enabled: true
2325
releaseStage: alpha
26+
remoteRegistries:
27+
pypi:
28+
enabled: true
29+
packageName: airbyte-source-insightly
2430
supportLevel: community
25-
documentationUrl: https://docs.airbyte.com/integrations/sources/insightly
2631
tags:
2732
- language:python
2833
- cdk:low-code
29-
ab_internal:
30-
sl: 100
31-
ql: 100
3234
metadataSpecVersion: "1.0"

0 commit comments

Comments
 (0)