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 Amazon Ads: Implement OAuth2.0 #11430

Merged
merged 17 commits into from
Apr 16, 2022

Conversation

grubberr
Copy link
Contributor

@grubberr grubberr commented Mar 25, 2022

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

What

Screenshot 2022-04-08 at 22 10 22

Screenshot 2022-04-08 at 22 10 57

How

Describe the solution

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
  • 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 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

Tests

Unit

Put your unit tests output here.

Integration

Put your integration tests output here.

Acceptance

Put your acceptance tests output here.

Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr self-assigned this Mar 25, 2022
@github-actions github-actions bot added area/connectors Connector related issues area/documentation Improvements or additions to documentation labels Mar 25, 2022
@grubberr grubberr linked an issue Mar 25, 2022 that may be closed by this pull request
@grubberr grubberr temporarily deployed to more-secrets March 25, 2022 12:24 Inactive
@grubberr grubberr temporarily deployed to more-secrets March 25, 2022 12:24 Inactive
@codecov
Copy link

codecov bot commented Mar 25, 2022

Codecov Report

❗ No coverage uploaded for pull request base (master@245e617). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #11430   +/-   ##
=========================================
  Coverage          ?   98.78%           
=========================================
  Files             ?       22           
  Lines             ?      660           
  Branches          ?        0           
=========================================
  Hits              ?      652           
  Misses            ?        8           
  Partials          ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 245e617...0c1ed16. Read the comment docs.

Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets March 25, 2022 14:51 Inactive
@grubberr grubberr temporarily deployed to more-secrets March 25, 2022 14:52 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Mar 27, 2022

/test connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2046802299
❌ connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2046802299
🐛 https://gradle.com/s/epux2vgk4s7ko
Python short test summary info:

=========================== short test summary info ============================
FAILED test_core.py::TestSpec::test_match_expected[inputs0] - AssertionError:...
FAILED test_core.py::TestBasicRead::test_read[inputs1] - docker.errors.Contai...
FAILED test_core.py::TestBasicRead::test_read[inputs2] - docker.errors.Contai...
FAILED test_core.py::TestBasicRead::test_read[inputs3] - Failed: Stream profi...
FAILED test_full_refresh.py::TestFullRefresh::test_sequential_reads[inputs0]
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
=================== 5 failed, 18 passed, 1 skipped in 15.64s ===================

@grubberr grubberr temporarily deployed to more-secrets March 27, 2022 05:25 Inactive
@grubberr grubberr temporarily deployed to more-secrets March 27, 2022 05:25 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr
Copy link
Contributor Author

grubberr commented Mar 27, 2022

/test connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2047900121
❌ connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2047900121
🐛 https://gradle.com/s/hydo5qik6nz74
Python short test summary info:

=========================== short test summary info ============================
FAILED test_core.py::TestBasicRead::test_read[inputs1] - docker.errors.Contai...
FAILED test_core.py::TestBasicRead::test_read[inputs2] - docker.errors.Contai...
FAILED test_core.py::TestBasicRead::test_read[inputs3] - Failed: Stream profi...
FAILED test_full_refresh.py::TestFullRefresh::test_sequential_reads[inputs0]
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
=================== 4 failed, 19 passed, 1 skipped in 13.99s ===================

@grubberr grubberr temporarily deployed to more-secrets March 27, 2022 13:30 Inactive
@grubberr grubberr temporarily deployed to more-secrets March 27, 2022 13:30 Inactive
@grubberr grubberr temporarily deployed to more-secrets March 28, 2022 21:13 Inactive
@grubberr grubberr temporarily deployed to more-secrets March 28, 2022 21:13 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 8, 2022 16:41 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 8, 2022 16:41 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets April 8, 2022 19:01 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 8, 2022 19:01 Inactive
@@ -28,19 +31,6 @@ class Config:
airbyte_secret=True,
)

# Amazon docs don't describe which of the below scopes to use under what circumstances so
Copy link
Contributor

Choose a reason for hiding this comment

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

make sure additionalproperties=true so existing configs don't break

import java.util.function.Supplier;
import org.apache.http.client.utils.URIBuilder;

public class AmazonAdsOAuthFlow extends BaseOAuth2Flow {
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add a unit test for this please?

@grubberr grubberr temporarily deployed to more-secrets April 13, 2022 07:29 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 13, 2022 07:29 Inactive
Signed-off-by: Sergey Chvalyuk <grubberr@gmail.com>
@grubberr grubberr temporarily deployed to more-secrets April 13, 2022 08:44 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 13, 2022 08:44 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Apr 15, 2022

/test connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2173832352
❌ connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2173832352
🐛 https://gradle.com/s/okgdovl6eqtxs
Python short test summary info:

=========================== short test summary info ============================
FAILED test_core.py::TestBasicRead::test_read[inputs1] - docker.errors.Contai...
FAILED test_full_refresh.py::TestFullRefresh::test_sequential_reads[inputs1]
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
============= 2 failed, 21 passed, 1 skipped in 1457.84s (0:24:17) =============

@grubberr grubberr temporarily deployed to more-secrets April 15, 2022 18:21 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 15, 2022 18:21 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Apr 15, 2022

/test connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2174010372
❌ connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2174010372
🐛 https://gradle.com/s/qcxzj4yypblvs
Python short test summary info:

=========================== short test summary info ============================
FAILED test_core.py::TestBasicRead::test_read[inputs1] - docker.errors.Contai...
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
============= 1 failed, 22 passed, 1 skipped in 1441.76s (0:24:01) =============

@grubberr
Copy link
Contributor Author

grubberr commented Apr 16, 2022

/test connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2175746766
✅ connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2175746766
Python tests coverage:

Name                                                 Stmts   Miss  Cover
------------------------------------------------------------------------
source_acceptance_test/utils/__init__.py                 6      0   100%
source_acceptance_test/tests/__init__.py                 4      0   100%
source_acceptance_test/__init__.py                       2      0   100%
source_acceptance_test/tests/test_full_refresh.py       52      2    96%
source_acceptance_test/utils/asserts.py                 37      2    95%
source_acceptance_test/config.py                        74      6    92%
source_acceptance_test/utils/json_schema_helper.py     105     13    88%
source_acceptance_test/utils/common.py                  70     17    76%
source_acceptance_test/utils/compare.py                 62     23    63%
source_acceptance_test/tests/test_core.py              285    106    63%
source_acceptance_test/base.py                          10      4    60%
source_acceptance_test/utils/connector_runner.py       110     48    56%
source_acceptance_test/tests/test_incremental.py        69     38    45%
------------------------------------------------------------------------
TOTAL                                                  886    259    71%
Name                                                              Stmts   Miss  Cover
-------------------------------------------------------------------------------------
source_amazon_ads/streams/sponsored_products.py                      32      0   100%
source_amazon_ads/streams/sponsored_display.py                       22      0   100%
source_amazon_ads/streams/sponsored_brands.py                        17      0   100%
source_amazon_ads/streams/report_streams/products_report.py          17      0   100%
source_amazon_ads/streams/report_streams/display_report.py           16      0   100%
source_amazon_ads/streams/report_streams/brands_video_report.py      10      0   100%
source_amazon_ads/streams/report_streams/brands_report.py            10      0   100%
source_amazon_ads/streams/report_streams/__init__.py                  5      0   100%
source_amazon_ads/streams/profiles.py                                21      0   100%
source_amazon_ads/streams/__init__.py                                 6      0   100%
source_amazon_ads/spec.py                                            27      0   100%
source_amazon_ads/schemas/sponsored_products.py                      37      0   100%
source_amazon_ads/schemas/sponsored_display.py                       31      0   100%
source_amazon_ads/schemas/sponsored_brands.py                        22      0   100%
source_amazon_ads/schemas/profile.py                                 16      0   100%
source_amazon_ads/schemas/common.py                                  45      0   100%
source_amazon_ads/schemas/__init__.py                                 6      0   100%
source_amazon_ads/constants.py                                        7      0   100%
source_amazon_ads/__init__.py                                         2      0   100%
source_amazon_ads/streams/common.py                                  77      1    99%
source_amazon_ads/source.py                                          34      1    97%
source_amazon_ads/streams/report_streams/report_streams.py          200      6    97%
-------------------------------------------------------------------------------------
TOTAL                                                               660      8    99%

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
================== 23 passed, 1 skipped in 465.27s (0:07:45) ===================

@grubberr
Copy link
Contributor Author

grubberr commented Apr 16, 2022

/publish connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2175827417
❌ Failed to publish connectors/source-amazon-ads
❌ Couldn't auto-bump version for connectors/source-amazon-ads

@grubberr grubberr temporarily deployed to more-secrets April 16, 2022 06:37 Inactive
@grubberr grubberr temporarily deployed to more-secrets April 16, 2022 06:37 Inactive
@grubberr
Copy link
Contributor Author

grubberr commented Apr 16, 2022

/publish connector=connectors/source-amazon-ads

🕑 connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2175896901
🚀 Successfully published connectors/source-amazon-ads
🚀 Auto-bumped version for connectors/source-amazon-ads
✅ connectors/source-amazon-ads https://github.com/airbytehq/airbyte/actions/runs/2175896901

@octavia-squidington-iii octavia-squidington-iii temporarily deployed to more-secrets April 16, 2022 07:26 Inactive
@octavia-squidington-iii octavia-squidington-iii temporarily deployed to more-secrets April 16, 2022 07:27 Inactive
@grubberr grubberr merged commit 189ce99 into master Apr 16, 2022
@grubberr grubberr deleted the grubberr/11417-source-amazon-ads branch April 16, 2022 07:35
suhomud pushed a commit that referenced this pull request May 23, 2022
* Added support OAuth2.0

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 Amazon Ads: Implement OAuth2.0
5 participants