Source The Guardian API: Migrate to Manifest Only (#45195)

airbyte-integrations/connectors/source-the-guardian-api/README.md

@@ -1,126 +1,65 @@
-# The Guardian Api Source
+# The Guardian API source connector
 
-This is the repository for the The Guardian Api configuration based source connector.
-For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/the-guardian-api).
+This directory contains the manifest-only connector for `source-the-guardian-api`.
+This _manifest-only_ connector is not a Python package on its own, as it runs inside of the base `source-declarative-manifest` image.
 
-## Local development
-
-#### Create credentials
+For information about how to configure and use this connector within Airbyte, see [the connector's full documentation](https://docs.airbyte.com/integrations/sources/the-guardian-api).
 
-**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/the-guardian-api)
-to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_the_guardian_api/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.
+## Local development
 
-**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source the-guardian-api test creds`
-and place them into `secrets/config.json`.
+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!
 
-### Locally running the connector docker image
+If you prefer to develop locally, you can follow the instructions below.
 
+### Building the docker image
 
+You can build any manifest-only connector with `airbyte-ci`:
 
-#### Use `airbyte-ci` to build your connector
-The Airbyte way of building this connector is to use our `airbyte-ci` tool.
-You can follow install instructions [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md#L1).
-Then running the following command will build your connector:
+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-the-guardian-api build
-```
-Once the command is done, you will find your connector image in your local docker registry: `airbyte/source-the-guardian-api:dev`.
-
-##### Customizing our build process
-When contributing on our connector you might need to customize the build process to add a system dependency or set an env var.
-You can customize our build process by adding a `build_customization.py` module to your connector.
-This module should contain a `pre_connector_install` and `post_connector_install` async function that will mutate the base image and the connector container respectively.
-It will be imported at runtime by our build process and the functions will be called if they exist.
-
-Here is an example of a `build_customization.py` module:
-```python
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    # Feel free to check the dagger documentation for more information on the Container object and its methods.
-    # https://dagger-io.readthedocs.io/en/sdk-python-v0.6.4/
-    from dagger import Container
-
-
-async def pre_connector_install(base_image_container: Container) -> Container:
-    return await base_image_container.with_env_variable("MY_PRE_BUILD_ENV_VAR", "my_pre_build_env_var_value")
-
-async def post_connector_install(connector_container: Container) -> Container:
-    return await connector_container.with_env_variable("MY_POST_BUILD_ENV_VAR", "my_post_build_env_var_value")
+airbyte-ci connectors --name=source-the-guardian-api build
 ```
 
-#### Build your own connector image
-This connector is built using our dynamic built process in `airbyte-ci`.
-The base image used to build it is defined within the metadata.yaml file under the `connectorBuildOptions`.
-The build logic is defined using [Dagger](https://dagger.io/) [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/pipelines/builds/python_connectors.py).
-It does not rely on a Dockerfile.
+An image will be available on your host with the tag `airbyte/source-the-guardian-api:dev`.
 
-If you would like to patch our connector and build your own a simple approach would be to:
+### Creating credentials
 
-1. Create your own Dockerfile based on the latest version of the connector image.
-```Dockerfile
-FROM airbyte/source-the-guardian-api:latest
+**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/the-guardian-api)
+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.
 
-COPY . ./airbyte/integration_code
-RUN pip install ./airbyte/integration_code
+### Running as a docker container
 
-# The entrypoint and default env vars are already set in the base image
-# ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
-# ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
-```
-Please use this as an example. This is not optimized.
+Then run any of the standard source connector commands:
 
-2. Build your image:
 ```bash
-docker build -t airbyte/source-the-guardian-api:dev .
-# Running the spec command against your patched connector
-docker run airbyte/source-the-guardian-api:dev spec
-```
-#### Run
-
-Then run any of the connector commands as follows:
-
-```
 docker run --rm airbyte/source-the-guardian-api:dev spec
 docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-the-guardian-api:dev check --config /secrets/config.json
 docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-the-guardian-api:dev discover --config /secrets/config.json
 docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-the-guardian-api:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
 ```
 
-## Testing
+### Running the 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-the-guardian-api test
 ```
 
-### Customizing acceptance Tests
-
-Customize `acceptance-test-config.yml` file to configure 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.
-
-## 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?
+## Publishing a new version of the connector
 
-1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-the-guardian-api test`
-2. Bump the connector version in `metadata.yaml`: increment the `dockerImageTag` value. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
-3. Make sure the `metadata.yaml` content is up to date.
-4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/the-guardian-api.md`).
+If you want to contribute changes to `source-the-guardian-api`, 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-the-guardian-api 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`
+4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/the-guardian-api.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.
-7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
+7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
+8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.

airbyte-integrations/connectors/source-the-guardian-api/acceptance-test-config.yml

@@ -4,7 +4,7 @@ connector_image: airbyte/source-the-guardian-api:dev
 acceptance_tests:
   spec:
     tests:
-      - spec_path: "source_the_guardian_api/spec.yaml"
+      - spec_path: "manifest.yaml"
   connection:
     tests:
       - config_path: "secrets/config.json"

airbyte-integrations/connectors/source-the-guardian-api/source_the_guardian_api/custom_page_strategy.py → airbyte-integrations/connectors/source-the-guardian-api/components.py

@@ -15,7 +15,7 @@ class CustomPageIncrement(PageIncrement):
     Starts page from 1 instead of the default value that is 0. Stops Pagination when currentPage is equal to totalPages.
     """
 
-    def next_page_token(self, response: requests.Response, last_records: List[Mapping[str, Any]]) -> Optional[Any]:
+    def next_page_token(self, response: requests.Response, *args) -> Optional[Any]:
         res = response.json().get("response")
         currPage = res.get("currentPage")
         totalPages = res.get("pages")
@@ -26,6 +26,7 @@ def next_page_token(self, response: requests.Response, last_records: List[Mappin
             return None
 
     def __post_init__(self, parameters: Mapping[str, Any]):
+        super().__post_init__(parameters)
         self._page = 1
 
     def reset(self):