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

πŸŽ‰ New Connector: Clockify [python cdk] #17767

Merged
merged 26 commits into from
Oct 26, 2022
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
ec5f150
new connector source-clockify
RobLucchi Oct 9, 2022
9822550
feat: enable caching for streams (users, projects)
RobLucchi Oct 16, 2022
0246fc7
chore: pep8 changes at unit_tests
RobLucchi Oct 16, 2022
0607e91
chore: pep8 changes at integration_tests
RobLucchi Oct 16, 2022
e6743d4
chore: update schema
RobLucchi Oct 16, 2022
4d7e35c
Adds python formatting, removes unused import.
Oct 18, 2022
792a910
Makes the task duration field nullable to pass integration test.
Oct 18, 2022
f246378
fix: add second type to null values to the schema files
RobLucchi Oct 19, 2022
90a99f3
Adds a null fallback value to task duration.
Oct 19, 2022
9ed4b10
Merge branch 'master' into dev
marcosmarxm Oct 19, 2022
5b05368
Updates airbyte-cdk dependency.
Oct 20, 2022
8baf71e
Merge branch 'master' into dev
natalyjazzviolin Oct 20, 2022
ff93e52
Merge branch 'master' into dev
natalyjazzviolin Oct 21, 2022
b4086dc
Adds UUID in source definitions.
Oct 21, 2022
e7af7ba
auto-bump connector version
octavia-squidington-iii Oct 21, 2022
3a2b034
Requested changes.
Oct 21, 2022
f3c2119
Merge branch 'master' into dev
natalyjazzviolin Oct 25, 2022
3cd4385
add clockify to source def seed
marcosmarxm Oct 25, 2022
68c6b2a
correct spec.json add titles
marcosmarxm Oct 25, 2022
44305a6
add icon
marcosmarxm Oct 25, 2022
6eee07e
run format
marcosmarxm Oct 25, 2022
fd0785c
remove source spec
marcosmarxm Oct 25, 2022
34c1f33
correct spec
marcosmarxm Oct 25, 2022
d9dd568
add eof gitignore
marcosmarxm Oct 25, 2022
b625515
Merge branch 'master' into dev
marcosmarxm Oct 26, 2022
9b00157
auto-bump connector version
octavia-squidington-iii Oct 26, 2022
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
5 changes: 5 additions & 0 deletions airbyte-config/init/src/main/resources/icons/clockify.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@
documentationUrl: https://docs.airbyte.com/integrations/sources/courier
sourceType: api
releaseStage: alpha
- name: Clockify
sourceDefinitionId: e71aae8a-5143-11ed-bdc3-0242ac120002
dockerRepository: airbyte/source-clockify
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.com/integrations/sources/clockify
icon: clockify.svg
sourceType: api
releaseStage: alpha
- name: Customer.io
sourceDefinitionId: c47d6804-8b98-449f-970a-5ddb5cb5d7aa
dockerRepository: farosai/airbyte-customer-io-source
Expand Down
25 changes: 25 additions & 0 deletions airbyte-config/init/src/main/resources/seed/source_specs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2187,6 +2187,31 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-clockify:0.1.0"
spec:
documentationUrl: "https://docs.airbyte.com/integrations/sources/clockify"
connectionSpecification:
$schema: "http://json-schema.org/draft-07/schema#"
title: "Clockify Spec"
type: "object"
required:
- "workspace_id"
- "api_key"
additionalProperties: true
properties:
workspace_id:
title: "Workspace Id"
description: "WorkSpace Id"
type: "string"
api_key:
title: "API Key"
description: "You can get your api access_key <a href=\"https://app.clockify.me/user/settings\"\
>here</a> This API is Case Sensitive."
type: "string"
airbyte_secret: true
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "farosai/airbyte-customer-io-source:0.1.23"
spec:
documentationUrl: "https://docs.faros.ai"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#
from unittest.mock import patch, PropertyMock

from unittest.mock import PropertyMock, patch

from airbyte_cdk.logger import AirbyteLogger
from source_asana.source import SourceAsana
Expand All @@ -27,7 +28,7 @@ def test_check_connection_empty_config(config):


def test_check_connection_exception(config):
with patch('source_asana.streams.Workspaces.use_cache', new_callable=PropertyMock, return_value=False):
with patch("source_asana.streams.Workspaces.use_cache", new_callable=PropertyMock, return_value=False):
ok, error_msg = SourceAsana().check_connection(logger, config=config)

assert not ok
Expand Down
6 changes: 6 additions & 0 deletions airbyte-integrations/connectors/source-clockify/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*
!Dockerfile
!main.py
!source_clockify
!setup.py
!secrets
3 changes: 3 additions & 0 deletions airbyte-integrations/connectors/source-clockify/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
users.yml
projects.yml
schemas
38 changes: 38 additions & 0 deletions airbyte-integrations/connectors/source-clockify/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM python:3.9.13-alpine3.15 as base

# build and load all requirements
FROM base as builder
WORKDIR /airbyte/integration_code

# upgrade pip to the latest version
RUN apk --no-cache upgrade \
&& pip install --upgrade pip \
&& apk --no-cache add tzdata build-base


COPY setup.py ./
# install necessary packages to a temporary folder
RUN pip install --prefix=/install .

# build a clean environment
FROM base
WORKDIR /airbyte/integration_code

# copy all loaded and built libraries to a pure basic image
COPY --from=builder /install /usr/local
# add default timezone settings
COPY --from=builder /usr/share/zoneinfo/Etc/UTC /etc/localtime
RUN echo "Etc/UTC" > /etc/timezone

# bash is installed for more convenient debugging.
RUN apk --no-cache add bash

# copy payload code only
COPY main.py ./
COPY source_clockify ./source_clockify

ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.0
LABEL io.airbyte.name=airbyte/source-clockify
132 changes: 132 additions & 0 deletions airbyte-integrations/connectors/source-clockify/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Clockify Source

This is the repository for the Clockify source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/clockify).

## Local development

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

#### Minimum Python version required `= 3.9.0`

#### 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]'
```
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.

#### Building via Gradle
You can also build the connector in Gradle. This is typically used in CI and not needed for your development workflow.

To build using Gradle, from the Airbyte repository root, run:
```
./gradlew :airbyte-integrations:connectors:source-clockify:build
```

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/clockify)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_clockify/spec.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.

**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source clockify 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
```

### Locally running the connector docker image

#### Build
First, make sure you build the latest Docker image:
```
docker build . -t airbyte/source-clockify:dev
```

You can also build the connector image via Gradle:
```
./gradlew :airbyte-integrations:connectors:source-clockify:airbyteDocker
```
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
the Dockerfile.

#### Run
Then run any of the connector commands as follows:
```
docker run --rm airbyte/source-clockify:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-clockify:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-clockify:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-clockify:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```
## Testing
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.
First install test dependencies into your virtual environment:
```
pip install .[tests]
```
### Unit Tests
To run unit tests locally, from the connector directory run:
```
python -m pytest unit_tests
```

### Integration Tests
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).
#### Custom Integration tests
Place custom tests inside `integration_tests/` folder, then, from the connector root, run
```
python -m pytest integration_tests
```
#### Acceptance Tests
Customize `acceptance-test-config.yml` file to configure tests. See [Source Acceptance Tests](https://docs.airbyte.io/connector-development/testing-connectors/source-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.
To run your integration tests with acceptance tests, from the connector root, run
```
python -m pytest integration_tests -p integration_tests.acceptance
```
To run your integration tests with docker

### Using gradle to run tests
All commands should be run from airbyte project root.
To run unit tests:
```
./gradlew :airbyte-integrations:connectors:source-clockify:unitTest
```
To run acceptance and custom integration tests:
```
./gradlew :airbyte-integrations:connectors:source-clockify:integrationTest
```

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

### 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 unit and integration tests.
1. Bump the connector version in `Dockerfile` -- just increment the value of the `LABEL io.airbyte.version` appropriately (we use [SemVer](https://semver.org/)).
1. Create a Pull Request.
1. Pat yourself on the back for being an awesome contributor.
1. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# See [Source Acceptance Tests](https://docs.airbyte.io/connector-development/testing-connectors/source-acceptance-tests-reference)
# for more information about how to configure these tests
connector_image: airbyte/source-clockify:dev
tests:
spec:
- spec_path: "source_clockify/spec.json"
connection:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "integration_tests/invalid_config.json"
status: "failed"
discovery:
- config_path: "secrets/config.json"
basic_read:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
full_refresh:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh

# Build latest connector image
docker build . -t $(cat acceptance-test-config.yml | grep "connector_image" | head -n 1 | cut -d: -f2-)

# Pull latest acctest image
docker pull airbyte/source-acceptance-test:latest

# Run
docker run --rm -it \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /tmp:/tmp \
-v $(pwd):/test_input \
airbyte/source-acceptance-test \
--acceptance-test-config /test_input

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
id 'airbyte-python'
id 'airbyte-docker'
id 'airbyte-source-acceptance-test'
}

airbytePython {
moduleDirectory 'source_clockify'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#


import pytest

pytest_plugins = ("source_acceptance_test.plugin",)


@pytest.fixture(scope="session", autouse=True)
def connector_setup():
"""This fixture is a placeholder for external resources that acceptance test might require."""
yield
Loading