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

add OAuth 2.0 for microsoft_teams source connector #7807

Merged
merged 36 commits into from
Dec 13, 2021

Conversation

grubberr
Copy link
Contributor

@grubberr grubberr commented Nov 10, 2021

Signed-off-by: Sergey Chvalyuk grubberr@gmail.com

How

Screenshot 2021-12-12 at 18 13 42

Recommended reading order

  1. x.java
  2. y.python

Pre-merge Checklist

Expand the relevant checklist and delete the others.

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
  • Credentials added to Github CI. Instructions.
  • /test connector=connectors/<name> command is passing.
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the new connector version is published, connector version bumped in the seed directory 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

Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@github-actions github-actions bot added the area/connectors Connector related issues label Nov 10, 2021
@grubberr grubberr linked an issue Nov 10, 2021 that may be closed by this pull request
@grubberr grubberr temporarily deployed to more-secrets November 10, 2021 06:46 Inactive
@grubberr grubberr self-assigned this Nov 10, 2021
@github-actions github-actions bot added the area/documentation Improvements or additions to documentation label Nov 10, 2021
@grubberr grubberr temporarily deployed to more-secrets November 10, 2021 07:53 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets November 10, 2021 09:33 Inactive
@grubberr grubberr temporarily deployed to more-secrets November 10, 2021 11:56 Inactive
@grubberr grubberr temporarily deployed to more-secrets November 10, 2021 18:45 Inactive
@grubberr grubberr temporarily deployed to more-secrets November 13, 2021 17:09 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets November 18, 2021 10:51 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets November 25, 2021 16:13 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets December 7, 2021 20:42 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets December 12, 2021 16:06 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Dec 12, 2021

/test connector=connectors/source-microsoft-teams

🕑 connectors/source-microsoft-teams https://github.com/airbytehq/airbyte/actions/runs/1569879289
✅ connectors/source-microsoft-teams https://github.com/airbytehq/airbyte/actions/runs/1569879289
Python tests coverage:

	 ---------- coverage: platform linux, python 3.8.10-final-0 -----------
	 Name                                                 Stmts   Miss  Cover
	 ------------------------------------------------------------------------
	 source_acceptance_test/__init__.py                       2      0   100%
	 source_acceptance_test/base.py                          10      4    60%
	 source_acceptance_test/config.py                        76      8    89%
	 source_acceptance_test/conftest.py                     109    109     0%
	 source_acceptance_test/plugin.py                        47     47     0%
	 source_acceptance_test/tests/__init__.py                 4      0   100%
	 source_acceptance_test/tests/test_core.py              235     95    60%
	 source_acceptance_test/tests/test_full_refresh.py       38     27    29%
	 source_acceptance_test/tests/test_incremental.py        69     38    45%
	 source_acceptance_test/utils/__init__.py                 6      0   100%
	 source_acceptance_test/utils/asserts.py                 37      2    95%
	 source_acceptance_test/utils/common.py                  54     24    56%
	 source_acceptance_test/utils/compare.py                 62     25    60%
	 source_acceptance_test/utils/connector_runner.py        82     49    40%
	 source_acceptance_test/utils/json_schema_helper.py     115     14    88%
	 ------------------------------------------------------------------------
	 TOTAL                                                  946    442    53%
	 ---------- coverage: platform linux, python 3.8.10-final-0 -----------
	   self._warn("No data was collected.", slug="no-data-collected")
	 Name                                 Stmts   Miss  Cover
	 --------------------------------------------------------
	 source_microsoft_teams/__init__.py       2      2     0%
	 source_microsoft_teams/client.py       176    176     0%
	 source_microsoft_teams/source.py        33     33     0%
	 --------------------------------------------------------
	 TOTAL                                  211    211     0%

Python short test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.7/site-packages/source_acceptance_test/plugin.py:56: Skipping TestIncremental.test_two_sequential_reads because not found in the config
================== 15 passed, 1 skipped in 125.19s (0:02:05) ===================

@jrhizor jrhizor temporarily deployed to more-secrets December 12, 2021 16:17 Inactive
Copy link
Contributor

@ChristopheDuong ChristopheDuong left a comment

Choose a reason for hiding this comment

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

Sorry, this might be the first connector with input config values from the connector, so the signatures of the base methods might also need to be adapted adequately.

Comment on lines 167 to 168
@Override
protected String getAccessTokenUrl() {
Copy link
Contributor

@ChristopheDuong ChristopheDuong Dec 13, 2021

Choose a reason for hiding this comment

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

Suggested change
@Override
protected String getAccessTokenUrl() {
@Override
protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {

This method should be modified in airbyte-oauth/src/main/java/io/airbyte/oauth/BaseOAuth2Flow.java to also include the config object to the call.

  • All Oauth flow implementation that are not depending on a value from connector config should ignore that extra argument
  • All Oauth flow implementation that are depending on a value from connector config can access the necessary value from that input config argument

Comment on lines 24 to 25
private static final String fieldName = "tenant_id";
private static String tenantId;
Copy link
Contributor

@ChristopheDuong ChristopheDuong Dec 13, 2021

Choose a reason for hiding this comment

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

These should not be present as static variables in the class.

Please adapt the signature of the parent base methods accordingly to pass the input configuration from the connector around in the parent classes.

You might need to change the signature of BaseOAuth2Flow.completeOAuthFlow to also include the inputConfiguration.

@grubberr grubberr temporarily deployed to more-secrets December 13, 2021 16:00 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets December 13, 2021 16:15 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets December 13, 2021 16:23 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Dec 13, 2021

/test connector=connectors/source-microsoft-teams

🕑 connectors/source-microsoft-teams https://github.com/airbytehq/airbyte/actions/runs/1573860703
✅ connectors/source-microsoft-teams https://github.com/airbytehq/airbyte/actions/runs/1573860703
Python tests coverage:

	 ---------- coverage: platform linux, python 3.8.10-final-0 -----------
	 Name                                                 Stmts   Miss  Cover
	 ------------------------------------------------------------------------
	 source_acceptance_test/__init__.py                       2      0   100%
	 source_acceptance_test/base.py                          10      4    60%
	 source_acceptance_test/config.py                        76      8    89%
	 source_acceptance_test/conftest.py                     109    109     0%
	 source_acceptance_test/plugin.py                        47     47     0%
	 source_acceptance_test/tests/__init__.py                 4      0   100%
	 source_acceptance_test/tests/test_core.py              235     95    60%
	 source_acceptance_test/tests/test_full_refresh.py       38     27    29%
	 source_acceptance_test/tests/test_incremental.py        69     38    45%
	 source_acceptance_test/utils/__init__.py                 6      0   100%
	 source_acceptance_test/utils/asserts.py                 37      2    95%
	 source_acceptance_test/utils/common.py                  54     24    56%
	 source_acceptance_test/utils/compare.py                 62     25    60%
	 source_acceptance_test/utils/connector_runner.py        82     49    40%
	 source_acceptance_test/utils/json_schema_helper.py     115     14    88%
	 ------------------------------------------------------------------------
	 TOTAL                                                  946    442    53%
	 ---------- coverage: platform linux, python 3.8.10-final-0 -----------
	 Name                                 Stmts   Miss  Cover
	 --------------------------------------------------------
	 ---------- coverage: platform linux, python 3.8.10-final-0 -----------/actions-runner/_work/airbyte/airbyte/airbyte-integrations/connectors/source-microsoft-teams/.venv/lib/python3.8/site-packages/coverage/control.py:768: CoverageWarning: No data was collected. (no-data-collected)
	 source_microsoft_teams/__init__.py       2      2     0%
	 source_microsoft_teams/client.py       176    176     0%
	 source_microsoft_teams/source.py        33     33     0%
	 --------------------------------------------------------
	   self._warn("No data was collected.", slug="no-data-collected")
	 TOTAL                                  211    211     0%

Python short test summary info:

=========================== short test summary info ============================
SKIPPED [1] ../usr/local/lib/python3.7/site-packages/source_acceptance_test/plugin.py:56: Skipping TestIncremental.test_two_sequential_reads because not found in the config
================== 15 passed, 1 skipped in 109.33s (0:01:49) ===================

@jrhizor jrhizor temporarily deployed to more-secrets December 13, 2021 16:31 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Dec 13, 2021

/publish connector=connectors/source-microsoft-teams

🕑 connectors/source-microsoft-teams https://github.com/airbytehq/airbyte/actions/runs/1573912358
✅ connectors/source-microsoft-teams https://github.com/airbytehq/airbyte/actions/runs/1573912358

@jrhizor jrhizor temporarily deployed to more-secrets December 13, 2021 16:43 Inactive
@grubberr grubberr merged commit 346b411 into master Dec 13, 2021
@grubberr grubberr deleted the grubberr/7704-source-microsoft-teams branch December 13, 2021 16:59
@grubberr grubberr temporarily deployed to more-secrets December 13, 2021 17:01 Inactive
schlattk pushed a commit to schlattk/airbyte that referenced this pull request Jan 4, 2022
* add OAuth 2.0 for microsoft_teams source connector

Signed-off-by: Sergey Chvalyuk <grubberr@gmail.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Source Microsoft Teams: support oauth
3 participants