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 Notion: Add Availability Strategy #30750

Merged
merged 18 commits into from Oct 9, 2023

Conversation

ChristoGrab
Copy link
Contributor

@ChristoGrab ChristoGrab commented Sep 26, 2023

What

Resolve open tickets for implementing availability strategy and oncall 2712.

How

  • Inherit the base HttpAvailabilityStrategy to handle skipping streams when encountering a 403 error.
  • Added a slightly more Notion-specific message to output in the logs.
  • Small change to handle cases where no next_cursor exists when checking for a next_page_token, avoiding a KeyError. Added to this PR as it was also affecting the unit test for the 403 handling.

User Impact

Not a breaking change

Note

@vercel
Copy link

vercel bot commented Sep 26, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
airbyte-docs ⬜️ Ignored (Inspect) Visit Preview Oct 9, 2023 1:09pm

@github-actions
Copy link
Contributor

github-actions bot commented Sep 26, 2023

Before Merging a Connector Pull Request

Wow! What a great pull request you have here! 🎉

To merge this PR, ensure the following has been done/considered for each connector added or updated:

  • PR name follows PR naming conventions
  • Breaking changes are considered. If a Breaking Change is being introduced, ensure an Airbyte engineer has created a Breaking Change Plan.
  • Connector version has been incremented in the Dockerfile and metadata.yaml according to our Semantic Versioning for Connectors guidelines
  • You've updated the connector's metadata.yaml file any other relevant changes, including a breakingChanges entry for major version bumps. See metadata.yaml docs
  • Secrets in the connector's spec are annotated with airbyte_secret
  • All documentation files are up to date. (README.md, bootstrap.md, docs.md, etc...)
  • Changelog updated in docs/integrations/<source or destination>/<name>.md with an entry for the new version. See changelog example
  • Migration guide updated in docs/integrations/<source or destination>/<name>-migrations.md with an entry for the new version, if the version is a breaking change. See migration guide example
  • If set, you've ensured the icon is present in the platform-internal repo. (Docs)

If the checklist is complete, but the CI check is failing,

  1. Check for hidden checklists in your PR description

  2. Toggle the github label checklist-action-run on/off to re-run the checklist CI.

Copy link
Collaborator

@davydov-d davydov-d left a comment

Choose a reason for hiding this comment

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

Minor comments regarding unit tests, otherwise looks good

and returns custom Notion integration message.
"""

with patch(f'source_notion.streams.{stream.__name__}._send_request') as mock_send_request:
Copy link
Collaborator

Choose a reason for hiding this comment

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

I suggest you use requests_mock for cases like this. It is more readable and does not require patching magic methods. See example here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gotcha, thanks for sharing the example. I've refactored the test as suggested 👍

Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks! Let's ship it

mock_resp.status_code = status_code

if status_code == 403:
mock_resp._content = b'{"object": "error", "status": 403, "code": "restricted_resource"}'
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think it's worth moving the response content to the parameters of the test along with the status code and others

@airbyte-oss-build-runner
Copy link
Collaborator

source-notion test report (commit 5336f8bdc7) - ❌

⏲️ Total pipeline duration: 04mn47s

Step Result
Connector package install
Build source-notion docker image for platform linux/x86_64
Unit tests
Acceptance tests
Code format checks
Validate airbyte-integrations/connectors/source-notion/metadata.yaml
Connector version semver check
Connector version increment check
QA checks

🔗 View the logs here

☁️ View runs for commit in Dagger Cloud

Please note that tests are only run on PR ready for review. Please set your PR to draft mode to not flood the CI engine and upstream service on following commits.
You can run the same pipeline locally on this branch with the airbyte-ci tool with the following command

airbyte-ci connectors --name=source-notion test

@airbyte-oss-build-runner
Copy link
Collaborator

source-notion test report (commit 62ecaee3de) - ❌

⏲️ Total pipeline duration: 04mn19s

Step Result
Connector package install
Build source-notion docker image for platform(s) linux/x86_64
Unit tests
Acceptance tests
Code format checks
Validate metadata for source-notion
Connector version semver check
Connector version increment check
QA checks

🔗 View the logs here

☁️ View runs for commit in Dagger Cloud

Please note that tests are only run on PR ready for review. Please set your PR to draft mode to not flood the CI engine and upstream service on following commits.
You can run the same pipeline locally on this branch with the airbyte-ci tool with the following command

airbyte-ci connectors --name=source-notion test

@airbyte-oss-build-runner
Copy link
Collaborator

source-notion test report (commit 2f310a96db) - ✅

⏲️ Total pipeline duration: 04mn15s

Step Result
Connector package install
Build source-notion docker image for platform(s) linux/x86_64
Unit tests
Acceptance tests
Code format checks
Validate metadata for source-notion
Connector version semver check
Connector version increment check
QA checks

🔗 View the logs here

☁️ View runs for commit in Dagger Cloud

Please note that tests are only run on PR ready for review. Please set your PR to draft mode to not flood the CI engine and upstream service on following commits.
You can run the same pipeline locally on this branch with the airbyte-ci tool with the following command

airbyte-ci connectors --name=source-notion test

@ChristoGrab ChristoGrab merged commit 537b304 into master Oct 9, 2023
24 checks passed
@ChristoGrab ChristoGrab deleted the christo/notion-availability-strategy branch October 9, 2023 13:31
edgao pushed a commit that referenced this pull request Oct 11, 2023
Co-authored-by: ChristoGrab <ChristoGrab@users.noreply.github.com>
ariesgun pushed a commit to ariesgun/airbyte that referenced this pull request Oct 20, 2023
Co-authored-by: ChristoGrab <ChristoGrab@users.noreply.github.com>
ariesgun pushed a commit to ariesgun/airbyte that referenced this pull request Oct 23, 2023
Co-authored-by: ChristoGrab <ChristoGrab@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/notion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants