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 Source: AppFollow Service #14418

Merged
merged 28 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f942d2f
Generated template
Jun 30, 2022
dfbb279
Added spec.yaml
Jun 30, 2022
6201649
Schema and working discover for ratings API
Jun 30, 2022
91076d2
Add catalog
Jun 30, 2022
e997c30
Add cid as required parameter
Jun 30, 2022
e0f972c
Working ratings call
Jun 30, 2022
0cce080
Use basic auth in check connection
Jun 30, 2022
b2414cf
Updated comment for request params
Jul 1, 2022
587cb03
Update README for local run
Jul 1, 2022
07b34a3
Moved with common params to stream superclass
Jul 3, 2022
68b9d66
Add support for country parameter
Jul 3, 2022
4bfa73d
WIP: acceptance
Jul 3, 2022
e105d50
Passing acceptance tests for ratings in docker
Jul 3, 2022
9deb5be
Remove incremental unit tests
Jul 3, 2022
69d7999
Match number of streams to test
Jul 3, 2022
4ccf301
Passing streams unit tests
Jul 3, 2022
3a62294
Connection check test
Jul 4, 2022
63b8a35
Update unit test type check
Jul 4, 2022
a8760e2
Remove TODO
Jul 4, 2022
38a32fe
Merge branch 'master' into master
harshithmullapudi Aug 11, 2022
3f32fa4
fix: tests are failing
harshithmullapudi Aug 11, 2022
0dcc292
docs: added documentation for appfollow and logo
harshithmullapudi Aug 11, 2022
a8a3aaf
docs: added documentation for appfollow and logo
harshithmullapudi Aug 11, 2022
8523847
Bump io.airbyte.version
Aug 12, 2022
9983bd0
Merge branch 'master' into master
harshithmullapudi Aug 13, 2022
f5f982e
Merge branch 'master' into master
harshithmullapudi Aug 15, 2022
f726335
fix: tests are failing
harshithmullapudi Aug 15, 2022
7909029
auto-bump connector version [ci skip]
octavia-squidington-iii Aug 15, 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
18 changes: 18 additions & 0 deletions airbyte-config/init/src/main/resources/icons/appfollow.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 @@ -53,6 +53,14 @@
icon: apify.svg
sourceType: api
releaseStage: alpha
- name: Appfollow
sourceDefinitionId: b4375641-e270-41d3-9c20-4f9cecad87a8
dockerRepository: airbyte/source-appfollow
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/appfollow
icon: appfollow.svg
sourceType: api
releaseStage: alpha
- name: Appstore
sourceDefinitionId: 2af123bf-0aaf-4e0d-9784-cb497f23741a
dockerRepository: airbyte/source-appstore-singer
Expand Down
35 changes: 35 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 @@ -605,6 +605,41 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-appfollow:0.1.1"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/appfollow"
connectionSpecification:
$schema: "http://json-schema.org/draft-07/schema#"
title: "Appfollow Spec"
type: "object"
required:
- "ext_id"
- "country"
- "cid"
- "api_secret"
additionalProperties: true
properties:
ext_id:
type: "string"
title: "app external id"
description: "for App Store β€” this is 9-10 digits identification number;\
\ for Google Play β€” this is bundle name;"
cid:
type: "string"
title: "client id"
description: "client id provided by Appfollow"
api_secret:
type: "string"
title: "api secret"
description: "api secret provided by Appfollow"
airbyte_secret: true
country:
type: "string"
title: "country"
description: "getting data by Country"
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-appstore-singer:0.2.6"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/appstore"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*
!Dockerfile
!main.py
!source_appfollow
!setup.py
!secrets
38 changes: 38 additions & 0 deletions airbyte-integrations/connectors/source-appfollow/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM python:3.9.11-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_appfollow ./source_appfollow

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

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

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

## 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-appfollow:build
```

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

### Locally running the connector docker image

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

You can also build the connector image via Gradle:
```
./gradlew :airbyte-integrations:connectors:source-appfollow: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-appfollow:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-appfollow:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-appfollow:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-appfollow: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-appfollow:unitTest
```
To run acceptance and custom integration tests:
```
./gradlew :airbyte-integrations:connectors:source-appfollow: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,22 @@
# # 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-appfollow:dev
tests:
spec:
- spec_path: "source_appfollow/spec.yaml"
# Enable these once we get appfollow credentials
# 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: []
# 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_appfollow'
}
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"streams": [
{
"stream": {
"name": "ratings",
"json_schema": {
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"ext_id": {
"type": "string"
},
"cid": {
"type": "string"
},
"country": {
"type": "string"
}
}
},
"supported_sync_modes": [
"full_refresh"
]
},
"sync_mode": "full_refresh",
"destination_sync_mode": "overwrite"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ext_id": "FIXME",
"cid": "FIXME",
"api_secret": "FIXME",
"country": "FIXME"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ext_id": "FIXME",
"cid": "FIXME",
"api_secret": "FIXME",
"country": "FIXME"
}
13 changes: 13 additions & 0 deletions airbyte-integrations/connectors/source-appfollow/main.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
#


import sys

from airbyte_cdk.entrypoint import launch
from source_appfollow import SourceAppfollow

if __name__ == "__main__":
source = SourceAppfollow()
launch(source, sys.argv[1:])
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-e ../../bases/source-acceptance-test
-e .
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ext_id": "FIXME",
"cid": "FIXME",
"api_secret": "FIXME",
"country": "FIXME"
}

Loading