airbyte-ci: tweaks for cross-repo compatibility #41541

postamar · 2024-07-10T14:40:35Z

What

This PR is a series of harmless changes which make it possible to re-use most of the tooling in this git repository in another git repository.

Review guide

Go through the PR one commit at a time.

User Impact

None whatsoever.

Can this PR be safely reverted and rolled back?

YES 💚
NO ❌

vercel · 2024-07-10T14:40:39Z

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

1 Skipped Deployment

Name	Status	Preview	Comments	Updated (UTC)
airbyte-docs	⬜️ Ignored (Inspect)	Visit Preview		Jul 11, 2024 3:15pm

coderabbitai · 2024-07-10T14:40:41Z

Important

Review skipped

Auto reviews are limited to specific labels.

Labels to auto review (1)

coderabbit-ai-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

postamar · 2024-07-10T18:29:13Z

airbyte-integrations/connectors/build.gradle

@@ -60,9 +60,6 @@ tasks.named('clean').configure {
 }

 allprojects {
-    // Evaluate CDK project before evaluating the connector.
-    evaluationDependsOn(':airbyte-cdk:java:airbyte-cdk')
-


this isn't actually required at all in any case

postamar · 2024-07-10T18:29:50Z

airbyte-ci/connectors/connector_ops/connector_ops/utils.py

-        found += project_dependencies
-        if with_test_dependencies:
-            found += test_dependencies
-    return list(set(found))


this function has been broken for a while

postamar · 2024-07-10T18:30:20Z

airbyte-ci/connectors/connector_ops/connector_ops/utils.py

-    # Since first party project folders are transitive (compileOnly) in the
-    # CDK, we always need to add them as the project dependencies.
-    project_dependencies += get_local_cdk_gradle_dependencies(False)
-    test_dependencies += get_local_cdk_gradle_dependencies(with_test_dependencies=True)


CDK projects haven't been compileOnly for a while

postamar · 2024-07-10T18:31:21Z

airbyte-ci/connectors/connector_ops/connector_ops/utils.py

@@ -648,6 +622,7 @@ def __repr__(self) -> str:
    def get_local_dependency_paths(self, with_test_dependencies: bool = True) -> Set[Path]:
        dependencies_paths = []
        if self.language == ConnectorLanguage.JAVA:
+            dependencies_paths += [Path("./airbyte-cdk/java/airbyte-cdk")]


This imports all of the CDK source, which isn't that big in the first place, so this should be OK. This is required when connectors are built with useLocalCdk.= true.

alafanechere · 2024-07-11T11:25:42Z

Let's run a test workflow on a Java an python connectors to make sure it does not break anything:
https://github.com/airbytehq/airbyte/actions/runs/9890550942

postamar · 2024-07-11T11:26:20Z

Good call. I forgot to mention that I tested this on my machine. Testing on a github runner is better. Thanks for taking the initiative!

This reverts commit 8f7f466.

Co-authored-by: alafanechere <augustin.lafanechere@gmail.com>

octavia-squidington-iii added the area/connectors Connector related issues label Jul 10, 2024

postamar force-pushed the postamar/airbyte-enterprise-compatibility branch from 421cb9d to f4d562a Compare July 10, 2024 17:22

gradle: don't always presume that :airbyte-cdk:java:airbyte-cdk exists

283ec11

postamar force-pushed the postamar/airbyte-enterprise-compatibility branch from f4d562a to 9e92d81 Compare July 10, 2024 17:55

postamar added 4 commits July 10, 2024 14:28

connector_ops: simplify gradle dependency discovery

24537b7

connector_ops: bump version and update changelog

6738cab

airbyte-ci: support submodule use-case

eee9589

airbyte-ci: bump version and update readme

5a0ec81

postamar force-pushed the postamar/airbyte-enterprise-compatibility branch from 9e92d81 to 5a0ec81 Compare July 10, 2024 18:28

postamar commented Jul 10, 2024

View reviewed changes

postamar marked this pull request as ready for review July 10, 2024 18:31

postamar requested review from alafanechere, natikgadzhi and aaronsteers July 10, 2024 18:31

Merge branch 'master' into postamar/airbyte-enterprise-compatibility

76dc8f8

alafanechere changed the title *: tweaks for cross-repo compatibility airbyte-ci: tweaks for cross-repo compatibility Jul 11, 2024

alafanechere approved these changes Jul 11, 2024

View reviewed changes

vercel bot deployed to Preview July 11, 2024 13:38 View deployment

postamar enabled auto-merge (squash) July 11, 2024 13:46

postamar disabled auto-merge July 11, 2024 13:47

alafanechere and others added 3 commits July 11, 2024 16:02

fix PyGithub

98b3ef0

connector_ops: disable failing test

8f7f466

Merge branch 'master' into airbyte-enterprise-compatibility

fad12cb

postamar force-pushed the postamar/airbyte-enterprise-compatibility branch from 0f41196 to fad12cb Compare July 11, 2024 14:20

vercel bot deployed to Preview July 11, 2024 14:24 View deployment

postamar added 3 commits July 11, 2024 10:35

Merge branch 'master' into airbyte-enterprise-compatibility

6c56b3e

connector_ops: undo pygithub version change

7f3efe7

Revert "connector_ops: disable failing test"

c87a57f

This reverts commit 8f7f466.

postamar enabled auto-merge (squash) July 11, 2024 15:21

postamar merged commit 68903b4 into master Jul 11, 2024
33 checks passed

postamar deleted the postamar/airbyte-enterprise-compatibility branch July 11, 2024 15:35

xiaohansong pushed a commit that referenced this pull request Jul 12, 2024

airbyte-ci: tweaks for cross-repo compatibility (#41541)

6ddc954

Co-authored-by: alafanechere <augustin.lafanechere@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

airbyte-ci: tweaks for cross-repo compatibility #41541

airbyte-ci: tweaks for cross-repo compatibility #41541

postamar commented Jul 10, 2024 •

edited

Loading

vercel bot commented Jul 10, 2024 •

edited

Loading

coderabbitai bot commented Jul 10, 2024

Review skipped

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

Documentation and Community

postamar Jul 10, 2024

postamar Jul 10, 2024

postamar Jul 10, 2024

postamar Jul 10, 2024

alafanechere commented Jul 11, 2024

postamar commented Jul 11, 2024

airbyte-ci: tweaks for cross-repo compatibility #41541

airbyte-ci: tweaks for cross-repo compatibility #41541

Conversation

postamar commented Jul 10, 2024 • edited Loading

What

Review guide

User Impact

Can this PR be safely reverted and rolled back?

vercel bot commented Jul 10, 2024 • edited Loading

coderabbitai bot commented Jul 10, 2024

Review skipped

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

postamar Jul 10, 2024

Choose a reason for hiding this comment

postamar Jul 10, 2024

Choose a reason for hiding this comment

postamar Jul 10, 2024

Choose a reason for hiding this comment

postamar Jul 10, 2024

Choose a reason for hiding this comment

alafanechere commented Jul 11, 2024

postamar commented Jul 11, 2024

postamar commented Jul 10, 2024 •

edited

Loading

vercel bot commented Jul 10, 2024 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)