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.

Sign up for GitHub

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

Jump to bottom

source-mysql: merge strict encrypt variant into standard main mysql source #31062

Merged
merged 35 commits into from
Nov 29, 2023
Merged

source-mysql: merge strict encrypt variant into standard main mysql source #31062

merged 35 commits into from
Nov 29, 2023

Conversation

nguyenaiden
Copy link
Contributor

@nguyenaiden nguyenaiden commented Oct 4, 2023 •
edited by alafanechere
Loading

Closes #32788

Description: To eliminate the need to maintain and publish 2 versions (standard and strict-encrypt) of source-mysql, the source now acknowledge the DEPLOYMENT_MODE environment variable and generate the correct spec and run the appropriate check when the DEPLOYMENT_MODE is cloud vs oss.

@vercel
Copy link

vercel bot commented Oct 4, 2023 •
edited
Loading

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 Nov 29, 2023 2:34pm

@octavia-squidington-iii octavia-squidington-iii added area/connectors Connector related issues CDK Connector Development Kit labels Oct 4, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2023 •
edited by alafanechere
Loading

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.

erohmensing
erohmensing reviewed Oct 6, 2023
View reviewed changes
airbyte-integrations/connectors/source-mysql/src/main/resources/cloud-spec.json Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

@nguyenaiden this should be a test resource right? I don't think it should/is used in production code and is confusing that way. this is also no different from expected_cloud_spec.json - we should use that instead. I'll update it

@erohmensing erohmensing force-pushed the nuke-mysql-strict-encrypt branch from 47e2366 to d6670d0 Compare October 26, 2023 20:43
@erohmensing erohmensing marked this pull request as ready for review October 26, 2023 20:45
@erohmensing erohmensing requested a review from a team as a code owner October 26, 2023 20:45
@octavia-squidington-iv octavia-squidington-iv requested a review from a team October 26, 2023 20:46
@octavia-squidington-iii octavia-squidington-iii added the area/documentation Improvements or additions to documentation label Nov 17, 2023
@octavia-squidington-iv octavia-squidington-iv requested a review from a team November 24, 2023 14:51
@alafanechere alafanechere removed the request for review from a team November 24, 2023 16:04
postamar
postamar reviewed Nov 24, 2023
View reviewed changes
Copy link
Contributor

@postamar postamar left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Just a few nits from me, and a minor change request, looks good otherwise.

.../connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSource.java Outdated Show resolved Hide resolved
...ntegrations/io/airbyte/integration_tests/sources/MySqlStrictEncryptSourceAcceptanceTest.java Outdated Show resolved Hide resolved
...irbyte/integration_tests/sources/MySqlStrictEncryptSslCaCertificateSourceAcceptanceTest.java Outdated Show resolved Hide resolved
...st/java/io/airbyte/integrations/source/mysql/MySqlStrictEncryptJdbcSourceAcceptanceTest.java Outdated Show resolved Hide resolved
@octavia-squidington-iv octavia-squidington-iv requested a review from a team November 24, 2023 17:48
@alafanechere
Copy link
Contributor

Thanks for the suggestions @postamar . I implemented all of them.

@postamar
Copy link
Contributor

Sorry for the merge conflicts that I caused today. Fixed.

@postamar postamar enabled auto-merge (squash) November 28, 2023 03:26
@postamar postamar disabled auto-merge November 28, 2023 03:27
@postamar postamar enabled auto-merge (squash) November 28, 2023 03:28
@postamar
Copy link
Contributor

Why won't this merge? All checks have passed and reviews are there.

@alafanechere
Copy link
Contributor

Why won't this merge? All checks have passed and reviews are there.

Code freeze probably: The base branch does not allow updates.

@postamar postamar mentioned this pull request Nov 28, 2023
Merged
@postamar postamar merged commit 665e4f7 into master Nov 29, 2023
24 checks passed
@postamar postamar deleted the nuke-mysql-strict-encrypt branch November 29, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@katmarkham katmarkham katmarkham approved these changes

@postamar postamar postamar approved these changes

@erohmensing erohmensing Awaiting requested review from erohmensing

Assignees
No one assigned
Labels
area/connectors Connector related issues area/documentation Improvements or additions to documentation connectors/source/github connectors/source/mysql connectors/source/mysql-strict-encrypt connectors/source/s3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

remove source-mysql-strict-encrypt
6 participants
@nguyenaiden @alafanechere @postamar @erohmensing @katmarkham @octavia-squidington-iii