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

chore: Upgrading spring to 3.3.3 to resolve vulnerable dependencies #36266

Merged
merged 15 commits into from
Oct 1, 2024

Conversation

mohanarpit
Copy link
Member

@mohanarpit mohanarpit commented Sep 12, 2024

Description

This PR updates Spring and it's associated dependencies to resolve vulnerable dependencies as flagged by Dependabot and Docker Scout.

Automation

/ok-to-test tags="@tag.Git"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/11011995792
Commit: 725c1a7
Cypress dashboard.
Tags: @tag.Git
Spec:


Tue, 24 Sep 2024 11:03:23 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

  • New Features

    • Updated the Spring Boot parent dependency to version 3.3.3, enhancing application performance and stability.
    • Modified the default text source in configuration to pull from the entire data object, potentially improving data display.
  • Bug Fixes

    • Corrected the URL format in the datasource configuration for proper API connectivity.
    • Removed specific version declarations for spring-boot-starter-webflux across multiple plugins, streamlining dependency management and reducing potential inconsistencies.
  • Chores

    • Enhanced error handling in MongoDB plugin tests for more accurate simulation of error scenarios.

Copy link
Contributor

coderabbitai bot commented Sep 12, 2024

Walkthrough

The pull request introduces significant updates across various modules in the Appsmith project. Key modifications include the removal of explicit version specifications for the spring-boot-starter-webflux dependency in multiple plugins, facilitating more flexible dependency management. Additionally, the main server's pom.xml has been updated to utilize a newer version of Spring Boot and testcontainers, while certain version properties and dependencies have been removed. Furthermore, enhancements to error handling in the MongoDB plugin's tests improve the robustness of the testing framework.

Changes

File Path Change Summary
app/server/appsmith-plugins/*/pom.xml Removed <version>${spring-boot.version}</version> for spring-boot-starter-webflux in all plugins.
app/server/pom.xml Updated Spring Boot parent version from 3.0.9 to 3.3.3, updated testcontainers from 1.19.3 to 1.20.1, and removed <spring-boot.version> and <logback.version>.
app/server/appsmith-plugins/anthropicPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/appsmithAiPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/googleAiPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/googleSheetsPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/graphqlPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/openAiPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/restApiPlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/snowflakePlugin/pom.xml Removed version specification for spring-boot-starter-webflux.
app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java Enhanced error handling in testGetStructureReadPermissionError.

Possibly related PRs

Suggested labels

Task

Suggested reviewers

  • mohanarpit
  • sharat87
  • abhvsn

Poem

In the realm of code where plugins unite,
Versions were tangled, now they shine bright.
Spring Boot's new version, a fresh start,
Dependencies dance, each playing their part.
With codecs added and mocks laid to rest,
In Appsmith's domain, we strive for the best! 🌟


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>, please review it.
    -- 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    -- @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 using 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.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

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.

@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Sep 12, 2024
@mohanarpit mohanarpit added the ok-to-test Required label for CI label Sep 12, 2024
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

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

Interesting that we're asking for a test dependency here, we should be able to shade this from interfaces directly. Did you get any clues as to why the version was explicitly mentioned here before?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point. I don't remember why we did this.

Copy link

Failed server tests

  • com.appsmith.testcaching.test.TestCachingMethods#

@nidhi-nair nidhi-nair added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Sep 17, 2024
@nidhi-nair nidhi-nair added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Sep 18, 2024
@nidhi-nair nidhi-nair self-requested a review September 18, 2024 06:07
@nidhi-nair nidhi-nair added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Sep 19, 2024
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 330cbdc and bccfd0c.

Files selected for processing (1)
  • app/client/cypress/fixtures/gitImport.json (1 hunks)
Additional context used
Path-based instructions (1)
app/client/cypress/fixtures/gitImport.json (1)

Pattern app/client/cypress/**/**.*: Review the following e2e test code written using the Cypress test library. Ensure that:

  • Follow best practices for Cypress code and e2e automation.
  • Avoid using cy.wait in code.
  • Avoid using cy.pause in code.
  • Avoid using agHelper.sleep().
  • Use locator variables for locators and do not use plain strings.
  • Use data-* attributes for selectors.
  • Avoid Xpaths, Attributes and CSS path.
  • Avoid selectors like .btn.submit or button[type=submit].
  • Perform logins via API with LoginFromAPI.
  • Perform logout via API with LogOutviaAPI.
  • Perform signup via API with SignupFromAPI.
  • Avoid using it.only.
  • Avoid using after and aftereach in test cases.
  • Use multiple assertions for expect statements.
  • Avoid using strings for assertions.
  • Do not use duplicate filenames even with different paths.
  • Avoid using agHelper.Sleep, this.Sleep in any file in code.

app/client/cypress/fixtures/gitImport.json Outdated Show resolved Hide resolved
@nidhi-nair
Copy link
Contributor

/build-deploy-preview skip-tests=true

Copy link

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/10992132941.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 36266.
recreate: .

Copy link

Deploy-Preview-URL: https://ce-36266.dp.appsmith.com

@nidhi-nair nidhi-nair added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Sep 23, 2024
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

Outside diff range and nitpick comments (1)
app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java (1)

149-149: Include descriptive messages in exceptions for better clarity

Including a message when throwing exceptions like IllegalStateException and MongoSocketWriteException can greatly aid in debugging by providing context about the simulated error.

You can modify the code as follows:

- subscriber.onError(new IllegalStateException());
+ subscriber.onError(new IllegalStateException("Simulating IllegalStateException for stale connection test"));
- subscriber.onError(new MongoSocketWriteException("", null, null));
+ subscriber.onError(new MongoSocketWriteException("Simulating MongoSocketWriteException for stale connection test", null, null));

Also applies to: 183-183

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 8b01d1d and 725c1a7.

Files selected for processing (2)
  • app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java (3 hunks)
  • app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginStaleConnTest.java (4 hunks)
Files skipped from review as they are similar to previous changes (1)
  • app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginErrorsTest.java

@nidhi-nair
Copy link
Contributor

Do not merge, waiting on EE checks to pass. SSO is failing.

Copy link

github-actions bot commented Oct 1, 2024

This PR has not seen activitiy for a while. It will be closed in 7 days unless further activity is detected.

@github-actions github-actions bot added the Stale label Oct 1, 2024
@nidhi-nair nidhi-nair merged commit 17d5d6e into release Oct 1, 2024
42 checks passed
@nidhi-nair nidhi-nair deleted the chore/spring-upgrade branch October 1, 2024 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Required label for CI skip-changelog Adding this label to a PR prevents it from being listed in the changelog Stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants