Source SalesForce: handle refresh token error #29500

artem1205 · 2023-08-16T23:17:45Z

What

Resolve https://github.com/airbytehq/oncall/issues/2744

How

handle refresh token error with config error

🚨 User Impact 🚨

no breaking changes

Pre-merge Actions

Updating a connector

Community member or Airbyter

Grant edit access to maintainers (instructions)
Unit & integration tests added

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.

github-actions · 2023-08-16T23:18:07Z

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,

Check for hidden checklists in your PR description
Toggle the github label checklist-action-run on/off to re-run the checklist CI.

airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py

octavia-squidington-iii · 2023-08-16T23:29:43Z

source-salesforce test report (commit `66da443f42`) - ❌

⏲️ Total pipeline duration: 03mn01s

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

🔗 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-salesforce test

octavia-squidington-iii · 2023-08-16T23:43:15Z

source-salesforce test report (commit `400c72e316`) - ❌

⏲️ Total pipeline duration: 04mn02s

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

🔗 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-salesforce test

girarda

looks good, just small nits. thanks for the fast turnaround!

girarda · 2023-08-16T23:59:59Z

docs/integrations/sources/salesforce.md

@@ -150,6 +150,7 @@ Now that you have set up the Salesforce source connector, check out the followin

 | Version | Date       | Pull Request                                             | Subject                                                                                                                              |
 |:--------|:-----------|:---------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------|
+| 2.1.3   | 2023-08-17 | [29500](https://github.com/airbytehq/airbyte/pull/29500) | handle authentication refresh token error                                                                                            |


Suggested change

| 2.1.3 | 2023-08-17 | [29500](https://github.com/airbytehq/airbyte/pull/29500) | handle authentication refresh token error |

| 2.1.3 | 2023-08-17 | [29500](https://github.com/airbytehq/airbyte/pull/29500) | handle expired refresh token error |

girarda · 2023-08-17T00:01:17Z

airbyte-integrations/connectors/source-salesforce/unit_tests/api_test.py

@@ -29,6 +30,20 @@
 )


+@pytest.mark.parametrize(
+    "login_status_code, login_json_resp, expected_error_msg",
+    [(400, {"error": "invalid_grant", "error_description": "expired access/refresh token"}, AUTHENTICATION_ERROR_MESSAGE_MAPPING.get("expired access/refresh token"))]


can you add two test cases?

400 error with a different error message -> we shouldn't raise a config error

different error code -> we shouldn't raise a config error

octavia-squidington-iii · 2023-08-17T01:19:57Z

source-salesforce test report (commit `223ed6355a`) - ✅

⏲️ Total pipeline duration: 94mn04s

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

🔗 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-salesforce test

octavia-squidington-iii · 2023-08-17T10:54:18Z

source-salesforce test report (commit `886fbe13fe`) - ✅

⏲️ Total pipeline duration: 56mn38s

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

🔗 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-salesforce test

Source SalesForce: handle refresh token error

cf7af37

octavia-squidington-iii added area/connectors Connector related issues connectors/source/salesforce labels Aug 16, 2023

Source SalesForce: update docs

66da443

octavia-squidington-iii added the area/documentation Improvements or additions to documentation label Aug 16, 2023

artem1205 self-assigned this Aug 16, 2023

artem1205 requested review from davydov-d, lazebnyi and girarda August 16, 2023 23:24

artem1205 marked this pull request as ready for review August 16, 2023 23:25

girarda reviewed Aug 16, 2023

View reviewed changes

airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py Show resolved Hide resolved

Source SalesForce: update handler

400c72e

Source SalesForce: update handler

223ed63

girarda approved these changes Aug 17, 2023

View reviewed changes

artem1205 added 2 commits August 17, 2023 11:30

Source SalesForce: update docs

5bb2f0f

Source SalesForce: add tests

886fbe1

artem1205 merged commit f05c032 into master Aug 17, 2023
23 of 24 checks passed

artem1205 deleted the artem1205/source-salesforce-handle-oauth-error-OC-2744 branch August 17, 2023 11:03

harrytou pushed a commit to KYVENetwork/airbyte that referenced this pull request Sep 1, 2023

Source SalesForce: handle refresh token error (airbytehq#29500)

8ace107

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Source SalesForce: handle refresh token error #29500

Source SalesForce: handle refresh token error #29500

artem1205 commented Aug 16, 2023

github-actions bot commented Aug 16, 2023 •

edited by artem1205

octavia-squidington-iii commented Aug 16, 2023

octavia-squidington-iii commented Aug 16, 2023

girarda left a comment

girarda Aug 16, 2023

artem1205 Aug 17, 2023

girarda Aug 17, 2023

artem1205 Aug 17, 2023

octavia-squidington-iii commented Aug 17, 2023

octavia-squidington-iii commented Aug 17, 2023

	\| 2.1.3 \| 2023-08-17 \| [29500](https://github.com/airbytehq/airbyte/pull/29500) \| handle authentication refresh token error \|
	\| 2.1.3 \| 2023-08-17 \| [29500](https://github.com/airbytehq/airbyte/pull/29500) \| handle expired refresh token error \|

Source SalesForce: handle refresh token error #29500

Source SalesForce: handle refresh token error #29500

Conversation

artem1205 commented Aug 16, 2023

What

How

Recommended reading order

🚨 User Impact 🚨

Pre-merge Actions

Community member or Airbyter

Airbyter

github-actions bot commented Aug 16, 2023 • edited by artem1205

Before Merging a Connector Pull Request

octavia-squidington-iii commented Aug 16, 2023

source-salesforce test report (commit 66da443f42) - ❌

octavia-squidington-iii commented Aug 16, 2023

source-salesforce test report (commit 400c72e316) - ❌

girarda left a comment

Choose a reason for hiding this comment

girarda Aug 16, 2023

Choose a reason for hiding this comment

artem1205 Aug 17, 2023

Choose a reason for hiding this comment

girarda Aug 17, 2023

Choose a reason for hiding this comment

artem1205 Aug 17, 2023

Choose a reason for hiding this comment

octavia-squidington-iii commented Aug 17, 2023

source-salesforce test report (commit 223ed6355a) - ✅

octavia-squidington-iii commented Aug 17, 2023

source-salesforce test report (commit 886fbe13fe) - ✅

github-actions bot commented Aug 16, 2023 •

edited by artem1205

source-salesforce test report (commit `66da443f42`) - ❌

source-salesforce test report (commit `400c72e316`) - ❌

source-salesforce test report (commit `223ed6355a`) - ✅

source-salesforce test report (commit `886fbe13fe`) - ✅