Skip to content

🎉 New Source: Google Search Console #5350

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

Merged
merged 36 commits into from
Sep 10, 2021
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b58d80e
Generate Google Search Console connector
gaart Aug 9, 2021
73f717e
Add schema
gaart Aug 9, 2021
87a3447
Upd schema
gaart Aug 10, 2021
1802891
Upd authenticator
gaart Aug 11, 2021
01c8fac
Add creds retrieving script
gaart Aug 11, 2021
256464d
Merge branch 'master' into gaart/5235-source-google-search-console
gaart Aug 11, 2021
326c8be
Remove legacy dep
gaart Aug 11, 2021
e7a9c56
Upd dockerfile base image
gaart Aug 16, 2021
e8a8965
Add sample config
gaart Aug 16, 2021
70253a5
Upd source definitions, add ci_credentials injection
gaart Aug 16, 2021
d19a5c4
Upd schema
gaart Aug 16, 2021
61f6403
Upd GSC creds injection
gaart Aug 17, 2021
9d490ed
Cleanup
gaart Aug 17, 2021
eaedff9
Add tzdata
gaart Aug 18, 2021
f8ca7ff
Upd tzdata installing
gaart Aug 18, 2021
0ade7af
Merge branch 'master' of github.com:airbytehq/airbyte into gaart/5235…
gaart Aug 18, 2021
dc2b52b
Change base docker image
gaart Aug 18, 2021
5df1aef
Merge branch 'master' of github.com:airbytehq/airbyte into gaart/5235…
gaart Aug 19, 2021
ca03dee
Upd streams
gaart Aug 20, 2021
7ef51f6
Fix typo
gaart Aug 20, 2021
ff053f0
Upd supported_sync_modes list
gaart Aug 25, 2021
4a93e74
Add multiple site, service account, search type support
gaart Aug 31, 2021
d404efe
Fix typo
gaart Aug 31, 2021
62510ee
Upd streams, pagination, multi site support
gaart Sep 2, 2021
f35ef66
Add service account secrets
gaart Sep 2, 2021
d6453c0
Remove source-google-search-console-singer from source definitions
gaart Sep 7, 2021
bb6e70c
Upd creds retrieving base image
gaart Sep 7, 2021
af0cfd0
Upd schema
gaart Sep 7, 2021
5a7b4d4
Upd docs
gaart Sep 7, 2021
ae6f5da
Add badge
gaart Sep 7, 2021
820500f
Merge branch 'master' into gaart/5235-source-google-search-console
gaart Sep 7, 2021
7f0d726
Upd schema
gaart Sep 7, 2021
1c66136
Upd docs
gaart Sep 7, 2021
c6b4ec3
Merge branch 'gaart/5235-source-google-search-console' of github.com:…
gaart Sep 7, 2021
c5fe6f8
Move the cursor field to the top
gaart Sep 8, 2021
2336322
Upd docs
gaart Sep 10, 2021
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
2 changes: 2 additions & 0 deletions .github/workflows/publish-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ jobs:
GOOGLE_CLOUD_STORAGE_TEST_CREDS: ${{ secrets.GOOGLE_CLOUD_STORAGE_TEST_CREDS }}
GOOGLE_DIRECTORY_TEST_CREDS: ${{ secrets.GOOGLE_DIRECTORY_TEST_CREDS }}
GOOGLE_SEARCH_CONSOLE_TEST_CREDS: ${{ secrets.GOOGLE_SEARCH_CONSOLE_TEST_CREDS }}
GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS: ${{ secrets.GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS }}
GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS_SRV_ACC: ${{ secrets.GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS_SRV_ACC }}
GOOGLE_SHEETS_TESTS_CREDS: ${{ secrets.GOOGLE_SHEETS_TESTS_CREDS }}
GOOGLE_WORKSPACE_ADMIN_REPORTS_TEST_CREDS: ${{ secrets.GOOGLE_WORKSPACE_ADMIN_REPORTS_TEST_CREDS }}
GREENHOUSE_TEST_CREDS: ${{ secrets.GREENHOUSE_TEST_CREDS }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ jobs:
GOOGLE_CLOUD_STORAGE_TEST_CREDS: ${{ secrets.GOOGLE_CLOUD_STORAGE_TEST_CREDS }}
GOOGLE_DIRECTORY_TEST_CREDS: ${{ secrets.GOOGLE_DIRECTORY_TEST_CREDS }}
GOOGLE_SEARCH_CONSOLE_TEST_CREDS: ${{ secrets.GOOGLE_SEARCH_CONSOLE_TEST_CREDS }}
GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS: ${{ secrets.GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS }}
GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS_SRV_ACC: ${{ secrets.GOOGLE_SEARCH_CONSOLE_CDK_TEST_CREDS_SRV_ACC }}
GOOGLE_SHEETS_TESTS_CREDS: ${{ secrets.GOOGLE_SHEETS_TESTS_CREDS }}
GOOGLE_WORKSPACE_ADMIN_REPORTS_TEST_CREDS: ${{ secrets.GOOGLE_WORKSPACE_ADMIN_REPORTS_TEST_CREDS }}
GREENHOUSE_TEST_CREDS: ${{ secrets.GREENHOUSE_TEST_CREDS }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sourceDefinitionId": "eb4c9e00-db83-4d63-a386-39cfa91012a8",
"name": "Google Search Console (native)",
"dockerRepository": "airbyte/source-google-search-console",
"dockerImageTag": "0.1.0",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/google-search-console"
}
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,11 @@
dockerRepository: airbyte/source-pokeapi
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/pokeapi
- sourceDefinitionId: eb4c9e00-db83-4d63-a386-39cfa91012a8
name: Google Search Console (native)
Copy link
Contributor

Choose a reason for hiding this comment

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

lets completely replace the singer version with the new one, no reason to have two versions of google search console in the product

Copy link
Contributor

Choose a reason for hiding this comment

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

@gaart reminder about this comment

dockerRepository: airbyte/source-google-search-console
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.io/integrations/sources/google-search-console
- sourceDefinitionId: 5a1d14c2-d829-49cd-8437-1e87dc9f5368
name: Google Search Console
dockerRepository: airbyte/source-google-search-console-singer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*
!Dockerfile
!Dockerfile.test
!main.py
!source_google_search_console
!setup.py
!secrets
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM python:3.7-slim
Copy link
Contributor

Choose a reason for hiding this comment

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

we should use alpine, see source-zendesk-support for an example

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tried an image from the zendesk connector, got timezone detection error during testing, rolled back to python:3.7-slim

Copy link
Contributor

Choose a reason for hiding this comment

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

TZ issue should be fixed, see latest templates


# Bash is installed for more convenient debugging.
RUN apt-get update && apt-get install -y bash && rm -rf /var/lib/apt/lists/*

WORKDIR /airbyte/integration_code
COPY source_google_search_console ./source_google_search_console
COPY main.py ./
COPY setup.py ./
RUN pip install .

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-google-search-console
129 changes: 129 additions & 0 deletions airbyte-integrations/connectors/source-google-search-console/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
# Google Search Console Source

This is the repository for the Google Search Console source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/google-search-console).

## 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
```
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
From the Airbyte repository root, run:
```
./gradlew :airbyte-integrations:connectors:source-google-search-console:build
```

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/google-search-console)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_google_search_console/spec.json` file.
Note that the `secrets` directory is gitignored by default, 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 google-search-console 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-google-search-console:dev
```

You can also build the connector image via Gradle:
```
./gradlew :airbyte-integrations:connectors:source-google-search-console: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-google-search-console:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-google-search-console:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-google-search-console:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-google-search-console: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](source-acceptance-tests.md) 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-google-search-console:unitTest
```
To run acceptance and custom integration tests:
```
./gradlew :airbyte-integrations:connectors:source-google-search-console: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,26 @@
# See [Source Acceptance Tests](https://docs.airbyte.io/contributing-to-airbyte/building-new-connector/source-acceptance-tests.md)
# for more information about how to configure these tests
connector_image: airbyte/source-google-search-console:dev
tests:
spec:
- spec_path: "source_google_search_console/spec.json"
connection:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "secrets/service_account_config.json"
status: "failed"
- 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/catalog.json"
incremental:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
future_state_path: "integration_tests/abnormal_state.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,13 @@
plugins {
id 'airbyte-python'
id 'airbyte-docker'
id 'airbyte-source-acceptance-test'
}

airbytePython {
moduleDirectory 'source_google_search_console'
}

dependencies {
implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM python:3.7

# Bash is installed for more convenient debugging.
RUN apt-get update && apt-get install -y bash && rm -rf /var/lib/apt/lists/*
COPY . ./
RUN pip install . --use-feature=in-tree-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#
Copy link
Contributor

Choose a reason for hiding this comment

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

Google search console singer source use service account for authorization. Why do you use web server application scenario instead?

# MIT License
#
# Copyright (c) 2020 Airbyte
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#

import json

# Check https://developers.google.com/webmaster-tools/search-console-api-original/v3/ for all available scopes
OAUTH_SCOPE = "https://www.googleapis.com/auth/webmasters.readonly"

with open("credentials.json", "r") as f:
credentials = json.load(f)

CLIENT_ID = credentials.get("client_id")
CLIENT_SECRET = credentials.get("client_secret")
REDIRECT_URI = credentials.get("redirect_uri")

authorize_url = (
f"https://accounts.google.com/o/oauth2/v2/auth"
f"?response_type=code"
f"&access_type=offline"
f"&prompt=consent&client_id={CLIENT_ID}"
f"&redirect_uri={REDIRECT_URI}"
f"&scope={OAUTH_SCOPE}"
)
print(f"Go to the following link in your browser: {authorize_url} and copy code from URL")
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

docker build . -t airbyte-get-gsc-credentials
docker run --name airbyte-get-gsc-credentials -t -d airbyte-get-gsc-credentials
docker exec -it airbyte-get-gsc-credentials python get_authentication_url.py
echo "Input your code:"
read code
docker exec -it airbyte-get-gsc-credentials python get_refresh_token.py $code
docker rm airbyte-get-gsc-credentials --force
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# MIT License
#
# Copyright (c) 2020 Airbyte
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#

import json
import sys
from urllib.parse import unquote

import requests

GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token"

with open("credentials.json", "r") as f:
credentials = json.load(f)

CLIENT_ID = credentials.get("client_id")
CLIENT_SECRET = credentials.get("client_secret")
REDIRECT_URI = credentials.get("redirect_uri")

code = str(sys.argv[1]).strip()
code = unquote(code)
headers = {
"Accept": "application/json",
"Content-Type": "application/x-www-form-urlencoded",
}

params = {
"grant_type": "authorization_code",
"code": code,
"client_id": CLIENT_ID,
"client_secret": CLIENT_SECRET,
"redirect_uri": REDIRECT_URI,
}

response = requests.post(url=GOOGLE_TOKEN_URL, params=params, headers=headers)
print(f'refresh token - {response.json().get("refresh_token")}')
Loading