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 My Hours: Migrate Python CDK to Low-code CDK #36947

Merged
merged 26 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6d77099
Source My Hours: Migrate Python CDK to Low Code CDK
btkcodedev Mar 14, 2024
5498a70
chore: Update version, docs: update documentation
btkcodedev Mar 14, 2024
ea3bf7b
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 14, 2024
5fe5247
fix: export manifest file directly from builder, change spec, update …
btkcodedev Mar 14, 2024
74a17a9
Merge branch 'feat/myhoursLowcode' of https://github.com/btkcodedev/a…
btkcodedev Mar 14, 2024
2f08b7d
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 14, 2024
0adef90
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 15, 2024
92b4e4a
fix: Add pyproject.toml, fix: schemas, format: manifest.yaml, retest:…
btkcodedev Mar 15, 2024
c5d76f3
Merge branch 'feat/myhoursLowcode' of https://github.com/btkcodedev/a…
btkcodedev Mar 15, 2024
61d023b
fix: pyproject.toml file path
btkcodedev Mar 15, 2024
9972c9e
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 15, 2024
ff5373b
chore: update metadata version, update docs
btkcodedev Mar 15, 2024
b970f0b
Merge branch 'feat/myhoursLowcode' of https://github.com/btkcodedev/a…
btkcodedev Mar 15, 2024
17b9938
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 17, 2024
09a390a
Update airbyte-integrations/connectors/source-my-hours/source_my_hour…
btkcodedev Mar 26, 2024
83c0c44
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 27, 2024
96702e1
feat: Suppport email:password auth type
btkcodedev Mar 27, 2024
4679eda
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Mar 27, 2024
3893a34
revert date
btkcodedev Mar 27, 2024
e3067bc
fix: include backward compatability tests
btkcodedev Mar 27, 2024
e2a1f10
Add migrations.md and poetry.lock
btkcodedev Apr 5, 2024
6ceec68
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Apr 5, 2024
c391b34
update docs, move schemas inline, update poetry lock, metadata
btkcodedev Apr 7, 2024
f1be2bf
Merge branch 'master' into feat/myhoursLowcode
btkcodedev Apr 7, 2024
26e8757
Merge remote-tracking branch 'fork/feat/myhoursLowcode' into btkcoded…
btkcodedev Apr 10, 2024
6b38132
chore: format
btkcodedev Apr 10, 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
6 changes: 0 additions & 6 deletions airbyte-integrations/connectors/source-my-hours/.dockerignore

This file was deleted.

38 changes: 0 additions & 38 deletions airbyte-integrations/connectors/source-my-hours/Dockerfile

This file was deleted.

103 changes: 53 additions & 50 deletions airbyte-integrations/connectors/source-my-hours/README.md
Original file line number Diff line number Diff line change
@@ -1,69 +1,63 @@
# My Hours Source

This is the repository for the My Hours source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/my-hours).
This is the repository for the My Hours configuration based source connector.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/my-hours).

## Local development

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

#### Minimum Python version required `= 3.7.0`
* Python (`^3.9`)
* Poetry (`^1.7`) - installation instructions [here](https://python-poetry.org/docs/#installation)

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

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
pip install '.[tests]'

### 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.

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/my-hours)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_my_hours/spec.json` file.
### Create credentials

**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/my-hours)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `spec` inside `manifest/yaml` file.
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
See `integration_tests/sample_config.json` for a sample config file.
See `sample_files/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 my-hours 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
poetry run source-my-hours spec
poetry run source-my-hours check --config secrets/config.json
poetry run source-my-hours discover --config secrets/config.json
poetry run source-my-hours read --config secrets/config.json --catalog sample_files/configured_catalog.json
```

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

To run 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-my-hours build
```
poetry run pytest tests
```

An image will be built with the tag `airbyte/source-my-hours:dev`.
### Building the docker image

**Via `docker build`:**
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:
```bash
docker build -t airbyte/source-my-hours:dev .
airbyte-ci connectors --name=source-my-hours build
```

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


### Running as a docker container

Then run any of the connector commands as follows:
```
docker run --rm airbyte/source-my-hours:dev spec
Expand All @@ -72,29 +66,38 @@ docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-my-hours:dev discover
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-my-hours: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-my-hours 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.

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.
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
### 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 `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-my-hours 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 (please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors)):
- bump the `dockerImageTag` value in in `metadata.yaml`
- bump the `version` value in `pyproject.toml`
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/my-hours.md`).
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/my-hours.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.
3 changes: 3 additions & 0 deletions airbyte-integrations/connectors/source-my-hours/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# 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-my-hours:dev
test_strictness_level: low
acceptance_tests:
spec:
tests:
- spec_path: "source_my_hours/spec.json"
- spec_path: "source_my_hours/spec.yaml"
connection:
tests:
- config_path: "secrets/config.json"
Expand All @@ -18,10 +19,19 @@ acceptance_tests:
tests:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
# time_logs stream contains a number of empty fields that are not
# documented in the API. Until we can verify the types on these fields,
# we need to disable this check.
fail_on_extra_columns: false
empty_streams: []
# TODO uncomment this block to specify that the tests should assert the connector outputs the records provided in the input file a file
# expect_records:
# path: "integration_tests/expected_records.jsonl"
# exact_order: no
incremental:
bypass_reason: "This connector does not implement incremental sync"
# TODO uncomment this block this block if your connector implements incremental sync:
# tests:
# - config_path: "secrets/config.json"
# configured_catalog_path: "integration_tests/configured_catalog.json"
# future_state:
# future_state_path: "integration_tests/abnormal_state.json"
full_refresh:
tests:
- config_path: "secrets/config.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#
# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"todo-stream-name": {
"todo-field-name": "todo-abnormal-value"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@
@pytest.fixture(scope="session", autouse=True)
def connector_setup():
"""This fixture is a placeholder for external resources that acceptance test might require."""
# TODO: setup test dependencies if needed. otherwise remove the TODO comments
yield
# TODO: clean up test dependencies
Loading
Loading