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

Source Recharge: use default availability strategy #22473

Merged

Conversation

arsenlosenko
Copy link
Contributor

What

Resolving:
#21784

How

Enable default availability strategy, specify AllowedHosts

Recommended reading order

  1. x.java
  2. y.python

🚨 User Impact 🚨

Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the connector is published, connector added to connector index as described here
  • Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here
Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub and connector version bumped by running the /publish command described here
Connector Generator
  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed

@arsenlosenko arsenlosenko self-assigned this Feb 7, 2023
@octavia-squidington-iii octavia-squidington-iii added area/connectors Connector related issues area/documentation Improvements or additions to documentation connectors/source/recharge labels Feb 7, 2023
@arsenlosenko arsenlosenko linked an issue Feb 7, 2023 that may be closed by this pull request
@arsenlosenko
Copy link
Contributor Author

arsenlosenko commented Feb 7, 2023

/test connector=connectors/source-recharge

🕑 connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4112985294
❌ connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4112985294
🐛 https://gradle.com/s/w6uizd4px5b4e

Build Failed

Test summary info:

=========================== short test summary info ============================
FAILED test_core.py::TestBasicRead::test_read[inputs0] - Failed: Stream addre...
FAILED test_full_refresh.py::TestFullRefresh::test_sequential_reads[inputs1]
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:98: The previous and actual specifications are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:507: The previous and actual discovered catalogs are identical.
============== 2 failed, 34 passed, 2 skipped in 94.14s (0:01:34) ==============

@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 10:37 — with GitHub Actions Inactive
@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 10:37 — with GitHub Actions Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Feb 7, 2023

Airbyte Code Coverage

There is no coverage information present for the Files changed

Total Project Coverage 24.66%

@arsenlosenko
Copy link
Contributor Author

arsenlosenko commented Feb 7, 2023

/test connector=connectors/source-recharge

🕑 connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4113314935

@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 11:18 — with GitHub Actions Inactive
@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 11:18 — with GitHub Actions Inactive
@arsenlosenko
Copy link
Contributor Author

arsenlosenko commented Feb 7, 2023

/test connector=connectors/source-recharge

🕑 connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4114377757
❌ connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4114377757
🐛 https://gradle.com/s/ftt3gvlmwtj2o

Build Failed

Test summary info:

=========================== short test summary info ============================
FAILED test_core.py::TestBasicRead::test_read[inputs0] - Failed: Stream addre...
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:98: The previous and actual specifications are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:507: The previous and actual discovered catalogs are identical.
============== 1 failed, 34 passed, 2 skipped in 94.46s (0:01:34) ==============

@arsenlosenko arsenlosenko marked this pull request as ready for review February 7, 2023 14:04
@arsenlosenko
Copy link
Contributor Author

/test connector=connectors/source-recharge

@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 14:53 — with GitHub Actions Inactive
@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 14:53 — with GitHub Actions Inactive
Copy link
Contributor

@erohmensing erohmensing left a comment

Choose a reason for hiding this comment

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

Please also remove the custom error handling here, as it shouldn't be necessary anymore! :)

@arsenlosenko
Copy link
Contributor Author

arsenlosenko commented Feb 7, 2023

/test connector=connectors/source-recharge

🕑 connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4116203066
✅ connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4116203066
Python tests coverage:

Name                          Stmts   Miss  Cover
-------------------------------------------------
source_recharge/source.py        23      0   100%
source_recharge/__init__.py       2      0   100%
source_recharge/api.py           85      5    94%
-------------------------------------------------
TOTAL                           110      5    95%
	 Name                                                    Stmts   Miss  Cover   Missing
	 -------------------------------------------------------------------------------------
	 connector_acceptance_test/base.py                          12      4    67%   16-19
	 connector_acceptance_test/config.py                       141      5    96%   87, 93, 239, 243-244
	 connector_acceptance_test/conftest.py                     217    101    53%   37, 43-45, 50, 55, 78, 84, 90-92, 111, 116-118, 124-126, 132-133, 138-139, 144, 150, 159-168, 174-179, 194, 218, 249, 255, 263-271, 279-292, 300-313, 318-324, 331-342, 349-365
	 connector_acceptance_test/plugin.py                        69     25    64%   22-23, 31, 36, 120-140, 144-148
	 connector_acceptance_test/tests/test_core.py              476    117    75%   53, 58, 97-108, 113-120, 124-125, 129-130, 380, 400, 438, 476-493, 506-517, 521-526, 532, 565-570, 608-615, 658-660, 663, 728-736, 748-751, 756, 812-813, 819, 822, 858-868, 881-906
	 connector_acceptance_test/tests/test_incremental.py       160     14    91%   58-65, 70-83, 246
	 connector_acceptance_test/utils/asserts.py                 39      2    95%   62-63
	 connector_acceptance_test/utils/common.py                  94     10    89%   16-17, 32-38, 72, 75
	 connector_acceptance_test/utils/compare.py                 62     23    63%   21-51, 68, 97-99
	 connector_acceptance_test/utils/connector_runner.py       133     33    75%   24-27, 46-47, 50-54, 57-58, 73-75, 78-80, 83-85, 88-90, 93-95, 124-125, 159-161, 208
	 connector_acceptance_test/utils/json_schema_helper.py     114     13    89%   31-32, 39, 42, 66-69, 97, 121, 203-205
	 -------------------------------------------------------------------------------------
	 TOTAL                                                    1696    347    80%

Build Passed

Test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:98: The previous and actual specifications are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:507: The previous and actual discovered catalogs are identical.
=================== 35 passed, 2 skipped in 97.80s (0:01:37) ===================

@arsenlosenko
Copy link
Contributor Author

Please also remove the custom error handling here, as it shouldn't be necessary anymore! :)

@erohmensing can you please specify again what piece of code you are mentioning, because the link that you provided points to recharge.md diff (updated it to include PR number in the changelog though)
Thanks!

@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 18:30 — with GitHub Actions Inactive
@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 7, 2023 18:30 — with GitHub Actions Inactive
@erohmensing
Copy link
Contributor

erohmensing commented Feb 7, 2023

@arsenlosenko Sorry about that! It'd be this part of airbyte-integrations/connectors/source-recharge/source_recharge/api.py:

    def should_retry(self, response: requests.Response) -> bool:
        content_length = int(response.headers.get("Content-Length", 0))
        incomplete_data_response = response.status_code == 200 and content_length > len(response.content)
        if incomplete_data_response:
            return True
        elif response.status_code == requests.codes.FORBIDDEN:
            setattr(self, "raise_on_http_errors", False)
            self.logger.error(f"Skiping stream {self.name} because of a 403 error.")
            return False
        return super().should_retry(response

we can remove that elif section

@arsenlosenko
Copy link
Contributor Author

arsenlosenko commented Feb 8, 2023

/test connector=connectors/source-recharge

🕑 connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4122014323
❌ connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4122014323
🐛

Build Passed

Test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:98: The previous and actual specifications are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:507: The previous and actual discovered catalogs are identical.
=================== 35 passed, 2 skipped in 95.87s (0:01:35) ===================

@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 8, 2023 08:06 — with GitHub Actions Inactive
@arsenlosenko arsenlosenko temporarily deployed to more-secrets February 8, 2023 08:07 — with GitHub Actions Inactive
@lazebnyi
Copy link
Collaborator

lazebnyi commented Feb 8, 2023

/test connector=connectors/source-recharge

🕑 connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4123299865
✅ connectors/source-recharge https://github.com/airbytehq/airbyte/actions/runs/4123299865
Python tests coverage:

Name                          Stmts   Miss  Cover
-------------------------------------------------
source_recharge/source.py        23      0   100%
source_recharge/__init__.py       2      0   100%
source_recharge/api.py           81      5    94%
-------------------------------------------------
TOTAL                           106      5    95%
	 Name                                                    Stmts   Miss  Cover   Missing
	 -------------------------------------------------------------------------------------
	 connector_acceptance_test/base.py                          12      4    67%   16-19
	 connector_acceptance_test/config.py                       141      5    96%   87, 93, 239, 243-244
	 connector_acceptance_test/conftest.py                     217    101    53%   37, 43-45, 50, 55, 78, 84, 90-92, 111, 116-118, 124-126, 132-133, 138-139, 144, 150, 159-168, 174-179, 194, 218, 249, 255, 263-271, 279-292, 300-313, 318-324, 331-342, 349-365
	 connector_acceptance_test/plugin.py                        69     25    64%   22-23, 31, 36, 120-140, 144-148
	 connector_acceptance_test/tests/test_core.py              476    117    75%   53, 58, 97-108, 113-120, 124-125, 129-130, 380, 400, 438, 476-493, 506-517, 521-526, 532, 565-570, 608-615, 658-660, 663, 728-736, 748-751, 756, 812-813, 819, 822, 858-868, 881-906
	 connector_acceptance_test/tests/test_incremental.py       160     14    91%   58-65, 70-83, 246
	 connector_acceptance_test/utils/asserts.py                 39      2    95%   62-63
	 connector_acceptance_test/utils/common.py                  94     10    89%   16-17, 32-38, 72, 75
	 connector_acceptance_test/utils/compare.py                 62     23    63%   21-51, 68, 97-99
	 connector_acceptance_test/utils/connector_runner.py       133     33    75%   24-27, 46-47, 50-54, 57-58, 73-75, 78-80, 83-85, 88-90, 93-95, 124-125, 159-161, 208
	 connector_acceptance_test/utils/json_schema_helper.py     114     13    89%   31-32, 39, 42, 66-69, 97, 121, 203-205
	 -------------------------------------------------------------------------------------
	 TOTAL                                                    1696    347    80%

Build Passed

Test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:98: The previous and actual specifications are identical.
SKIPPED [1] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:507: The previous and actual discovered catalogs are identical.
=================== 35 passed, 2 skipped in 95.15s (0:01:35) ===================

@lazebnyi lazebnyi temporarily deployed to more-secrets February 8, 2023 10:48 — with GitHub Actions Inactive
@lazebnyi lazebnyi temporarily deployed to more-secrets February 8, 2023 10:48 — with GitHub Actions Inactive
@arsenlosenko arsenlosenko merged commit a6990bc into master Feb 8, 2023
@arsenlosenko arsenlosenko deleted the arsenlosenko/source-recharge-availability-strategy branch February 8, 2023 17:35
danidelvalle pushed a commit to danidelvalle/airbyte that referenced this pull request Feb 9, 2023
* Source Recharge: use default availability strategy

* Remove invalid_config from full_refresh tests

* Update changelog

* Remove error handling that is covered by HttpAvailabilityStrategy

* Keep should_retry, change error handling

---------

Co-authored-by: Serhii Lazebnyi <53845333+lazebnyi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/connectors Connector related issues area/documentation Improvements or additions to documentation connectors/source/recharge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Source Recharge: Enable AvailabilityStrategy
4 participants