Skip to content

Commit

Permalink
Merge branch 'master' into grubberr/11703-source-acceptance-test
Browse files Browse the repository at this point in the history
  • Loading branch information
grubberr committed Apr 6, 2022
2 parents 6da5d8f + 5739ee8 commit 9c4978b
Show file tree
Hide file tree
Showing 39 changed files with 2,526 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -892,3 +892,9 @@
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/kustomer
sourceType: api
- name: ZohoCRM
sourceDefinitionId: 4942d392-c7b5-4271-91f9-3b4f4e51eb3e
dockerRepository: airbyte/source-zoho-crm
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.com/integrations/sources/zoho-crm
sourceType: api
80 changes: 80 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 @@ -9387,3 +9387,83 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-zoho-crm:0.1.0"
spec:
documentationUrl: "https://docs.airbyte.com/integrations/sources/zoho-crm"
connectionSpecification:
$schema: "http://json-schema.org/draft-07/schema#"
title: "Zoho Crm Configuration"
type: "object"
required:
- "client_id"
- "client_secret"
- "refresh_token"
- "environment"
- "dc_region"
- "edition"
additionalProperties: false
properties:
client_id:
type: "string"
title: "Client ID"
description: "OAuth2.0 Client ID"
airbyte_secret: true
client_secret:
type: "string"
title: "Client Secret"
description: "OAuth2.0 Client Secret"
airbyte_secret: true
refresh_token:
type: "string"
title: "Refresh Token"
description: "OAuth2.0 Refresh Token"
airbyte_secret: true
dc_region:
title: "Data Center Location"
type: "string"
description: "Please choose the region of your Data Center location. More\
\ info by this <a href=\"https://www.zoho.com/crm/developer/docs/api/v2/multi-dc.html\"\
>Link</a>"
enum:
- "US"
- "AU"
- "EU"
- "IN"
- "CN"
- "JP"
environment:
title: "Environment"
type: "string"
description: "Please choose the environment"
enum:
- "Production"
- "Developer"
- "Sandbox"
start_datetime:
title: "Start Date"
type:
- "null"
- "string"
examples:
- "2000-01-01"
- "2000-01-01 13:00"
- "2000-01-01 13:00:00"
- "2000-01-01T13:00+00:00"
- "2000-01-01T13:00:00-07:00"
description: "ISO 8601, for instance: `YYYY-MM-DD`, `YYYY-MM-DD HH:MM:SS+HH:MM`"
format: "date-time"
edition:
title: "Zoho CRM Edition"
type: "string"
description: "Choose your Edition of Zoho CRM to determine API Concurrency\
\ Limits"
enum:
- "Free"
- "Standard"
- "Professional"
- "Enterprise"
- "Ultimate"
default: "Free"
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
6 changes: 6 additions & 0 deletions airbyte-integrations/connectors/source-zoho-crm/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*
!Dockerfile
!main.py
!source_zoho_crm
!setup.py
!secrets
38 changes: 38 additions & 0 deletions airbyte-integrations/connectors/source-zoho-crm/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM python:3.7.11-alpine3.14 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_zoho_crm ./source_zoho_crm

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-zoho-crm
132 changes: 132 additions & 0 deletions airbyte-integrations/connectors/source-zoho-crm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Zoho Crm Source

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

## Local development

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

#### Minimum Python version required `= 3.7.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-zoho-crm:build
```

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

You can also build the connector image via Gradle:
```
./gradlew :airbyte-integrations:connectors:source-zoho-crm: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-zoho-crm:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-zoho-crm:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-zoho-crm:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-zoho-crm: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-zoho-crm:unitTest
```
To run acceptance and custom integration tests:
```
./gradlew :airbyte-integrations:connectors:source-zoho-crm: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.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# 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-zoho-crm:dev
tests:
spec:
- spec_path: "source_zoho_crm/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"
empty_streams: []
expect_records:
path: "integration_tests/expected_records.json"
extra_fields: yes
exact_order: yes
extra_records: no
incremental:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state_path: "integration_tests/abnormal_state.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

9 changes: 9 additions & 0 deletions airbyte-integrations/connectors/source-zoho-crm/build.gradle
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_zoho_crm'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"incremental_leads_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_notes_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_contacts_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_accounts_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_activities_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_tasks_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_calls_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_deals_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_events_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_vendors_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_products_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_quotes_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_sales__orders_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_purchase__orders_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_price__books_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_solutions_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_cases_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_invoices_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_attachments_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
},
"incremental_campaigns_zoho_crm_stream": {
"Modified_Time": "2220-03-07T11:30:00+00:00"
}
}
Loading

1 comment on commit 9c4978b

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SonarQube Report

SonarQube report for Airbyte Bases Source Acceptance Test(#11704)

Measures

Name Value Name Value Name Value
Duplicated Blocks 0 Bugs 0 Lines to Cover 1021
Security Rating A Vulnerabilities 0 Code Smells 25
Coverage 60.5 Quality Gate Status OK Reliability Rating A
Lines of Code 1202 Duplicated Lines (%) 0.0 Blocker Issues 0
Critical Issues 4 Major Issues 3 Minor Issues 18

Detected Issues

Rule File Description Message
python:black_need_format (MINOR) tests/test_core.py Please run one of the commands: "black --config ./pyproject.toml <path_to_updated_folder>" or "./gradlew format" 1 code part(s) should be updated.
python:S2772 (MINOR) source_acceptance_test/conftest.py:208 "pass" should not be used needlessly Remove this unneeded "pass".
python:S3776 (CRITICAL) utils/common.py:86 Cognitive Complexity of functions should not be too high Refactor this function to reduce its Cognitive Complexity from 16 to the 15 allowed.
python:S3776 (CRITICAL) utils/connector_runner.py:114 Cognitive Complexity of functions should not be too high Refactor this function to reduce its Cognitive Complexity from 21 to the 15 allowed.
python:S5799 (MAJOR) utils/connector_runner.py:94 Implicit string and byte concatenations should not be confusing Merge these implicitly concatenated strings; or did you forget a comma?
python:mypy_return (MINOR) utils/common.py:70 Check that function always returns a value Missing return statement . Code line: def find_key_inside_schema(schema_item: Union[dict, list, str], key: s...
python:S5886 (MAJOR) utils/compare.py:96 Function return types should be consistent with their type hint Return a value of type "str" instead of "DictWithHashMixin" or update function "make_hashable" type hint.
python:S5886 (MAJOR) utils/compare.py:98 Function return types should be consistent with their type hint Return a value of type "str" instead of "ListWithHashMixin" or update function "make_hashable" type hint.
python:mypy_misc (MINOR) utils/compare.py:74 Miscellaneous other checks Definition of "hash" in base class "HashMixin" is incompatible with definition in base class "dict" . Code line: class DictWithHashMixin(HashMixin, dict):
python:mypy_misc (MINOR) utils/compare.py:78 Miscellaneous other checks Definition of "hash" in base class "HashMixin" is incompatible with definition in base class "list" . Code line: class ListWithHashMixin(HashMixin, list):
python:mypy_return_value (MINOR) utils/compare.py:96 Check that return value is compatible with signature Incompatible return value type (got "DictWithHashMixin", expected "str") . Code line: return DictWithHashMixin(obj)
python:mypy_return_value (MINOR) utils/compare.py:98 Check that return value is compatible with signature Incompatible return value type (got "ListWithHashMixin", expected "str") . Code line: return ListWithHashMixin(obj)
python:mypy_no_any_return (MINOR) utils/compare.py:99 Reject returning value with "Any" type if return type is not "Any" Returning Any from function declared to return "str" . Code line: return obj
python:S3776 (CRITICAL) utils/json_schema_helper.py:169 Cognitive Complexity of functions should not be too high Refactor this function to reduce its Cognitive Complexity from 21 to the 15 allowed.
python:mypy_attr_defined (MINOR) utils/asserts.py:27 Check that attribute exists Module has no attribute "parse" . Code line: pendulum.parse(value, strict=False)
python:mypy_return_value (MINOR) utils/asserts.py:32 Check that return value is compatible with signature Incompatible return value type (got "Union[Match[str], None, bool]", expected "bool") . Code line: return valid_format and valid_time
python:S3776 (CRITICAL) tests/test_core.py:414 Cognitive Complexity of functions should not be too high Refactor this function to reduce its Cognitive Complexity from 17 to the 15 allowed.
python:mypy_var_annotated (MINOR) utils/asserts.py:52 Require variable annotation if type can't be inferred Need type annotation for "stream_errors" . Code line: stream_errors = defaultdict(dict)
python:mypy_attr_defined (MINOR) utils/json_schema_helper.py:42 Check that attribute exists Module has no attribute "parse" . Code line: return pendulum.parse(value)
python:mypy_no_any_return (MINOR) utils/json_schema_helper.py:48 Reject returning value with "Any" type if return type is not "Any" Returning Any from function declared to return "Mapping[str, Any]" . Code line: value = reduce(lambda data, key: data[key], path, record)
python:mypy_import (MINOR) utils/common.py:11 Require that imported module can be found or has stubs Library stubs not installed for "yaml" (or incompatible with Python 3.7) . Code line: from yaml import load
python:mypy_assignment (MINOR) utils/common.py:24 Check that assigned value is compatible with target Incompatible types in assignment (expression has type "Path", variable has type "str") . Code line: path = Path(path) / "acceptance-test-config.yml"
python:mypy_attr_defined (MINOR) utils/common.py:25 Check that attribute exists "str" has no attribute "exists" . Code line: if not path.exists():
python:mypy_attr_defined (MINOR) utils/common.py:26 Check that attribute exists "str" has no attribute "absolute" . Code line: pytest.fail(f"config file {path.absolute()} does not exist")
python:mypy_no_any_return (MINOR) utils/json_schema_helper.py:98 Reject returning value with "Any" type if return type is not "Any" Returning Any from function declared to return "Mapping[str, Any]" . Code line: return node

Coverage (60.5%)

File Coverage File Coverage
source_acceptance_test/init.py 100.0 source_acceptance_test/base.py 50.0
source_acceptance_test/config.py 91.7 source_acceptance_test/conftest.py 0.0
source_acceptance_test/plugin.py 0.0 source_acceptance_test/tests/init.py 100.0
source_acceptance_test/tests/test_core.py 62.5 source_acceptance_test/tests/test_full_refresh.py 96.2
source_acceptance_test/tests/test_incremental.py 44.9 source_acceptance_test/utils/init.py 100.0
source_acceptance_test/utils/asserts.py 94.6 source_acceptance_test/utils/common.py 75.7
source_acceptance_test/utils/compare.py 61.7 source_acceptance_test/utils/connector_runner.py 56.0
source_acceptance_test/utils/json_schema_helper.py 87.6

Please sign in to comment.