Merge branch 'master' into agarctfi/source/google-search-console/keywords-missing-data

Author: agarctfi

airbyte-integrations/connectors/destination-mssql/metadata.yaml

@@ -15,8 +15,8 @@ data:
             alias: airbyte-connector-testing-secret-store
             type: GSM
   connectorType: destination
-  definitionId: 37a928c1-2d5c-431a-a97d-ae236bd1ea0c
-  dockerImageTag: 2.0.0
+  definitionId: d4353156-9217-4cad-8dd7-c108fd4f74cf
+  dockerImageTag: 2.0.2
   dockerRepository: airbyte/destination-mssql
   documentationUrl: https://docs.airbyte.com/integrations/destinations/mssql
   githubIssueLabel: destination-mssql
@@ -30,17 +30,6 @@ data:
       enabled: true
   releases:
     breakingChanges:
-      1.0.0:
-        message:
-          'This version removes the option to use "normalization" with MSSQL.
-          It also changes the schema and database of Airbyte''s "raw" tables to be
-          compatible with the new [Destinations V2](https://docs.airbyte.com/release_notes/upgrading_to_destinations_v2/#what-is-destinations-v2)
-          format. These changes will likely require updates to downstream dbt / SQL
-          models. Selecting `Upgrade` will upgrade **all** connections using this
-          destination at their next sync.
-
-          '
-        upgradeDeadline: "2024-05-25"
       2.0.0:
         message: >
           'This version introduces new configuration options (bulk insert via Azure Cloud Storage) and removes 

airbyte-integrations/connectors/source-freshdesk/README.md

@@ -1,54 +1,23 @@
 # Freshdesk source connector
 
-This is the repository for the Freshdesk source connector, written in Python. For information about
-how to use this connector within Airbyte, see
-[the documentation](https://docs.airbyte.com/integrations/sources/freshdesk).
+This directory contains the manifest-only connector for `source-freshdesk`.
+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
-
-### Prerequisites
-
-- Python (~=3.9)
-- Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
-
-### Installing the connector
-
-From this connector directory, run:
-
-```bash
-poetry install --with dev
-```
+For information about how to configure and use this connector within Airbyte, see [the connector's full documentation](https://docs.airbyte.com/integrations/sources/freshdesk).
 
-### Create credentials
-
-**If you are a community contributor**, follow the instructions in the
-[documentation](https://docs.airbyte.com/integrations/sources/freshdesk) to generate the necessary
-credentials. Then create a file `secrets/config.json` conforming to the `source_freshdesk/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-freshdesk spec
-poetry run source-freshdesk check --config secrets/config.json
-poetry run source-freshdesk discover --config secrets/config.json
-poetry run source-freshdesk read --config secrets/config.json --catalog sample_files/configured_catalog.json
-```
-
-### Running unit tests
+## Local development
 
-To run unit tests locally, from the connector directory run:
+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!
 
-```
-poetry run pytest unit_tests
-```
+If you prefer to develop locally, you can follow the instructions below.
 
 ### Building the docker image
 
-1. Install
-   [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
+You can build any manifest-only connector with `airbyte-ci`:
+
+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
@@ -57,60 +26,40 @@ airbyte-ci connectors --name=source-freshdesk build
 
 An image will be available on your host with the tag `airbyte/source-freshdesk:dev`.
 
+### Creating credentials
+
+**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/freshdesk)
+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-freshdesk:dev spec
 docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-freshdesk:dev check --config /secrets/config.json
 docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-freshdesk:dev discover --config /secrets/config.json
 docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-freshdesk:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
 ```
 
-### Running our CI test suite
+### 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):
+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-freshdesk test
 ```
 
-### 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.
-
-### Dependency Management
-
-All of your dependencies should be managed via Poetry. To add a new dependency, run:
-
-```bash
-poetry add <package-name>
-```
-
-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-freshdesk 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)):
-   - 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/freshdesk.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).
+If you want to contribute changes to `source-freshdesk`, 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-freshdesk 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/freshdesk.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.
-8. Once your PR is merged, the new version of the connector will be automatically published to
-   Docker Hub and our connector registry.
+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-freshdesk/acceptance-test-config.yml

@@ -5,7 +5,7 @@ test_strictness_level: high
 acceptance_tests:
   spec:
     tests:
-      - spec_path: "source_freshdesk/spec.json"
+      - spec_path: "manifest.yaml"
   connection:
     tests:
       - config_path: "secrets/config.json"

airbyte-integrations/connectors/source-freshdesk/source_freshdesk/components.py airbyte-integrations/connectors/source-freshdesk/components.py

@@ -5,6 +5,7 @@
 
 import requests
 
+from airbyte_cdk.entrypoint import logger
 from airbyte_cdk.sources.declarative.incremental import DatetimeBasedCursor
 from airbyte_cdk.sources.declarative.requesters.http_requester import HttpRequester
 from airbyte_cdk.sources.declarative.requesters.paginators.strategies.page_increment import PageIncrement
@@ -14,13 +15,15 @@
     RequestInput,
 )
 from airbyte_cdk.sources.declarative.types import StreamSlice, StreamState
-from source_freshdesk.utils import CallCredit
+from airbyte_cdk.sources.types import Record
 
 
 @dataclass
-class FreshdeskRequester(HttpRequester):
+class FreshdeskTicketsIncrementalRequester(HttpRequester):
     """
-    This class is created to add call throttling using the optional requests_per_minute parameter
+    This class is created for the Tickets stream to modify parameters produced by stream slicer and paginator
+    When the paginator hit the page limit it will return the latest record cursor for the next_page_token
+    next_page_token will be used in the stream slicer to get updated cursor filter
     """
 
     request_body_json: Optional[RequestInput] = None
@@ -29,9 +32,6 @@ class FreshdeskRequester(HttpRequester):
     request_body_data: Optional[RequestInput] = None
 
     def __post_init__(self, parameters: Mapping[str, Any]) -> None:
-        requests_per_minute = self.config.get("requests_per_minute")
-        self._call_credit = CallCredit(balance=requests_per_minute) if requests_per_minute else None
-
         self.request_options_provider = InterpolatedRequestOptionsProvider(
             request_body_data=self.request_body_data,
             request_body_json=self.request_body_json,
@@ -42,37 +42,13 @@ def __post_init__(self, parameters: Mapping[str, Any]) -> None:
         )
         super().__post_init__(parameters)
 
-    def _consume_credit(self, credit):
-        """Consume call credit, if there is no credit left within current window will sleep til next period"""
-        if self._call_credit:
-            self._call_credit.consume(credit)
-
-    def send_request(
-        self,
-        **kwargs,
-    ) -> Optional[requests.Response]:
-        call_credit_cost = kwargs.pop("call_credit_cost", 1)
-        self._consume_credit(call_credit_cost)
-        return super().send_request(**kwargs)
-
-
-@dataclass
-class FreshdeskTicketsIncrementalRequester(FreshdeskRequester):
-    """
-    This class is created for the Tickets stream to modify parameters produced by stream slicer and paginator
-    When the paginator hit the page limit it will return the latest record cursor for the next_page_token
-    next_page_token will be used in the stream slicer to get updated cursor filter
-    """
-
     def send_request(
         self,
         **kwargs,
     ) -> Optional[requests.Response]:
         # pagination strategy returns cursor_filter based on the latest record instead of page when the page limit is hit
         if type(kwargs["request_params"].get("page")) == str:
             kwargs["request_params"].pop("page")
-        # set correct call credit cost for Tickets stream
-        kwargs["call_credit_cost"] = 3
         return super().send_request(**kwargs)
 
 
@@ -124,17 +100,29 @@ class FreshdeskTicketsPaginationStrategy(PageIncrement):
 
     PAGE_LIMIT = 300
 
-    def next_page_token(self, response: requests.Response, last_records: List[Mapping[str, Any]]) -> Optional[Any]:
+    def next_page_token(
+        self,
+        response: requests.Response,
+        last_page_size: int,
+        last_record: Optional[Record],
+        last_page_token_value: Optional[Any],
+    ) -> Optional[Any]:
         # Stop paginating when there are fewer records than the page size or the current page has no records, or maximum page number is hit
-        if (self._page_size and len(last_records) < self._page_size) or len(last_records) == 0:
+        if (self._page_size and last_page_size < self._page_size) or last_page_size == 0:
             return None
+        elif last_page_token_value is None:
+            # If the PageIncrement strategy does not inject on the first request, the incoming last_page_token_value
+            # may be None. When this is the case, we assume we've already requested the first page specified by
+            # start_from_page and must now get the next page
+            return self.start_from_page + 1
+        elif not isinstance(last_page_token_value, int):
+            raise ValueError(f"Last page token value {last_page_token_value} for PageIncrement pagination strategy was not an integer")
         elif self._page >= self.PAGE_LIMIT:
             # reset page count as cursor parameter will be updated in the stream slicer
-            self.reset()
+            self._page = self.start_from_page
             # get last_record from latest batch, pos. -1, because of ACS order of records
-            last_record_updated_at = last_records[-1]["updated_at"]
+            last_record_updated_at = last_record["updated_at"]
             # updating slicer request parameters with last_record state
             return last_record_updated_at
         else:
-            self._page += 1
-            return self._page
+            return last_page_token_value + 1