Skip to content

Commit

Permalink
Source-gnews: Migrate to manifest-only (#46959)
Browse files Browse the repository at this point in the history
Co-authored-by: Octavia Squidington III <[email protected]>
  • Loading branch information
ChristoGrab and octavia-squidington-iii authored Oct 18, 2024
1 parent 1cc7f2c commit d1d6e23
Show file tree
Hide file tree
Showing 18 changed files with 908 additions and 2,083 deletions.
80 changes: 27 additions & 53 deletions airbyte-integrations/connectors/source-gnews/README.md
Original file line number Diff line number Diff line change
@@ -1,89 +1,63 @@
# Gnews source connector

This directory contains the manifest-only connector for `source-gnews`.
This _manifest-only_ connector is not a Python package on its own, as it runs inside of the base `source-declarative-manifest` image.

This is the repository for the Gnews source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/gnews).
For information about how to configure and use this connector within Airbyte, see [the connector's full documentation](https://docs.airbyte.com/integrations/sources/gnews).

## Local development

### Prerequisites
* Python (~=3.9)
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
We recommend using the Connector Builder to edit this connector.
Using either Airbyte Cloud or your local Airbyte OSS instance, navigate to the **Builder** tab and select **Import a YAML**.
Then select the connector's `manifest.yaml` file to load the connector into the Builder. You're now ready to make changes to the connector!

If you prefer to develop locally, you can follow the instructions below.

### Installing the connector
From this connector directory, run:
```bash
poetry install --with dev
```


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


### Locally running the connector
```
poetry run source-gnews spec
poetry run source-gnews check --config secrets/config.json
poetry run source-gnews discover --config secrets/config.json
poetry run source-gnews read --config secrets/config.json --catalog sample_files/configured_catalog.json
```
### Building the docker image

### Running unit tests
To run unit tests locally, from the connector directory run:
```
poetry run pytest unit_tests
```
You can build any manifest-only connector with `airbyte-ci`:

### Building the docker image
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
airbyte-ci connectors --name=source-gnews build
```

An image will be available on your host with the tag `airbyte/source-gnews:dev`.

### Creating credentials

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

### Running as a docker container
Then run any of the connector commands as follows:
```

Then run any of the standard source connector commands:

```bash
docker run --rm airbyte/source-gnews:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-gnews:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-gnews:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-gnews:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```

### 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-gnews test
```
### Running the CI test suite

### Customizing acceptance Tests
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.
You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):

### Dependency Management
All of your dependencies should be managed via Poetry.
To add a new dependency, run:
```bash
poetry add <package-name>
airbyte-ci connectors --name=source-gnews test
```

Please commit the changes to `pyproject.toml` and `poetry.lock` files.

## 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-gnews test`
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)):

If you want to contribute changes to `source-gnews`, here's how you can do that:
1. Make your changes locally, or load the connector's manifest into Connector Builder and make changes there.
2. Make sure your changes are passing our test suite with `airbyte-ci connectors --name=source-gnews test`
3. 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 sure the connector documentation and its changelog is up to date (`docs/integrations/sources/gnews.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.
Expand Down
3 changes: 0 additions & 3 deletions airbyte-integrations/connectors/source-gnews/__init__.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
connector_image: airbyte/source-gnews:dev
tests:
spec:
- spec_path: "source_gnews/spec.yaml"
- spec_path: "manifest.yaml"
connection:
- config_path: "secrets/config.json"
status: "succeed"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from dataclasses import InitVar, dataclass
from datetime import datetime, timedelta
from typing import Any, Mapping, Optional
from typing import Any, Mapping, Optional, Union

import requests
from airbyte_cdk.sources.declarative.requesters.error_handlers import BackoffStrategy
Expand All @@ -20,8 +20,10 @@ class WaitUntilMidnightBackoffStrategy(BackoffStrategy):
parameters: InitVar[Mapping[str, Any]]
config: Config

def backoff(self, response: requests.Response, attempt_count: int) -> Optional[float]:
now_utc = datetime.utcnow()
def backoff_time(
self, response_or_exception: Optional[Union[requests.Response, requests.RequestException]], attempt_count: int
) -> Optional[float]:
now_utc = datetime.now(datetime.timezone.utc)
midnight_utc = (now_utc + timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0)
delta = midnight_utc - now_utc
return delta.total_seconds() if type(delta) is timedelta else delta.seconds
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
{
"search": {
"publishedAt": "2999-12-31T23:59:59Z"
[
{
"type": "STREAM",
"stream": {
"stream_state": {
"publishedAt": "2099-12-31T23:59:59Z"
},
"stream_descriptor": {
"name": "search"
}
}
},
"top_headlines": {
"publishedAt": "2999-12-31T23:59:59Z"
{
"type": "STREAM",
"stream": {
"stream_state": {
"publishedAt": "2099-12-31T23:59:59Z"
},
"stream_descriptor": {
"name": "top_headlines"
}
}
}
}
]
8 changes: 0 additions & 8 deletions airbyte-integrations/connectors/source-gnews/main.py

This file was deleted.

Loading

0 comments on commit d1d6e23

Please sign in to comment.