Skip to content

chore: Strict schema for datasource and action APIs#34366

Merged
sharat87 merged 8 commits intoreleasefrom
chore/datasource-create-dto
Jun 24, 2024
Merged

chore: Strict schema for datasource and action APIs#34366
sharat87 merged 8 commits intoreleasefrom
chore/datasource-create-dto

Conversation

@sharat87
Copy link
Member

@sharat87 sharat87 commented Jun 20, 2024

Part of #33724. This is an effort to harden the server in terms of what request payloads are acceptable.

/test all

Summary by CodeRabbit

  • New Features

    • Enhanced API request payload handling for creating actions to include additional properties, improving data integrity and server-side validation.
  • Improvements

    • Refined data manipulation and payload structures in datasource-related API requests for better compatibility with server requirements.

Caution

🔴 🔴 🔴 Some tests have failed.
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/9626214547
Commit: fe5db45
Cypress dashboard.
Tags: ``
The following are new failures, please fix them before merging the PR:

  1. cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts
  2. cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
  3. cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
List of identified flaky tests.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jun 20, 2024

Warning

Review failed

The head commit changed during the review from bd6d527 to fe5db45.

Walkthrough

The recent updates mainly involve refining the payloads for API requests in two key files: ActionAPI.tsx and DatasourcesApi.ts. The ActionAPI class's createAction method now includes additional properties set to undefined to ensure cleaner data handling. Similar adjustments are made in various methods of the DatasourcesApi class, improving the consistency and accuracy of API interactions.

Changes

File Change Summary
app/client/src/api/ActionAPI.tsx Modified the createAction method to include additional properties such as isValid, entityReferenceType, and new set to undefined.
app/client/src/api/DatasourcesApi.ts Restructured data manipulation by removing specific fields, adjusting payload structures, and refining field assignments in several methods.

Poem

In fields of code, APIs play,
Refined with care, in a clever way.
Properties set to undefined,
Cleaner payloads now you'll find.
With each commit, our system grows,
Efficient, clear, like a well-read prose. 🌱


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.

@sharat87 sharat87 changed the title chore: Strict schema for datasource creation API chore: Strict schema for datasource and action APIs Jun 20, 2024
@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Jun 20, 2024
@sharat87 sharat87 added the ok-to-test Required label for CI label Jun 20, 2024
@sharat87 sharat87 added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Jun 20, 2024
@sharat87 sharat87 removed the ok-to-test Required label for CI label Jun 20, 2024
@sharat87 sharat87 added the ok-to-test Required label for CI label Jun 20, 2024
@sharat87 sharat87 marked this pull request as ready for review June 20, 2024 19:51
@sharat87 sharat87 requested a review from ayushpahwa as a code owner June 20, 2024 19:51
@sharat87 sharat87 requested a review from riodeuno June 20, 2024 19:51
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 UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 3f7b535 and e8265dd.

Files selected for processing (2)
  • app/client/src/api/ActionAPI.tsx (2 hunks)
  • app/client/src/api/DatasourcesApi.ts (4 hunks)
Additional comments not posted (4)
app/client/src/api/DatasourcesApi.ts (2)

37-66: Consider simplifying the payload manipulation in createDatasource.
[REFACTOR_SUGGESTion]
The payload manipulation in the createDatasource method seems overly complex and repetitive, especially with the nested object and undefined assignments. Consider using a helper function to clean this up, which can be reused across different methods where similar manipulations are needed.

+ function cleanPayload(payload) {
+   const cleanedPayload = {...payload};
+   Object.entries(payload).forEach(([key, value]) => {
+     if (typeof value === 'object' && value !== null) {
+       cleanedPayload[key] = cleanPayload(value);
+     } else {
+       cleanedPayload[key] = undefined;
+     }
+   });
+   return cleanedPayload;
+ }
- // existing code block
+ const cleanedConfig = cleanPayload(datasourceConfig);
+ return API.post(DatasourcesApi.url, cleanedConfig);

76-95: Ensure that the testDatasource method handles potential null values safely.

The method manipulates the datasourceConfiguration and its nested connection and ssl objects without null checks. This could lead to runtime errors if these are not defined. Verify that the upstream code ensures these objects are always defined or add necessary null checks.

#!/bin/bash
# Description: Verify upstream null checks for datasourceConfiguration.

# Test: Search for the method usage. Expect: Proper null checks or guarantees that the object is defined.
rg --type typescript $'DatasourcesApi.testDatasource'
app/client/src/api/ActionAPI.tsx (2)

135-146: Validate the addition of undefined properties in createAction.

The method now includes additional properties (isValid, entityReferenceType, new) set to undefined. It's crucial to confirm that these additions align with the intended schema changes and are handled appropriately by the server.

#!/bin/bash
# Description: Verify server schema handling for new undefined properties.

# Test: Search for server-side handling of new properties. Expect: Proper handling or ignoring of undefined properties.
rg --type typescript $'createAction'

183-184: Check the consistency of changes in updateAction.

The updateAction method also manipulates the datasource object like the createAction method, but it appears to handle fewer properties. Verify that all necessary properties are being handled consistently between these methods.

#!/bin/bash
# Description: Verify consistency between createAction and updateAction in handling datasource properties.

# Test: Compare the handling of properties in both methods. Expect: Consistent handling of properties.
rg --type typescript $'ActionAPI.createAction|ActionAPI.updateAction'

@sharat87 sharat87 requested a review from mohanarpit June 21, 2024 04:44
@sharat87 sharat87 added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Jun 22, 2024
@sharat87 sharat87 merged commit d86c855 into release Jun 24, 2024
@sharat87 sharat87 deleted the chore/datasource-create-dto branch June 24, 2024 11:47
sharat87 added a commit that referenced this pull request Jun 27, 2024
Currently, if the incoming request body contains fields that aren't
recognized by the backend, we just ignore them, and deserialize what we
_can_. This has lead to subtle bugs and wasted a lot of developer time
in the past, and added little value in return.

Most recently, with application creation, now fixed in
#33722.

Another one, for action creation, client sends this in `eventData` field
of the request body:

![shot-2024-05-26-04-50-46](https://github.com/appsmithorg/appsmith/assets/120119/b876b27f-47ec-4a00-8598-33cb92120c49)
But the class defined for `eventData` is this:

![shot-2024-05-26-04-51-03](https://github.com/appsmithorg/appsmith/assets/120119/18bf46b7-597a-4b2f-8355-1b8fad30e4ce)
Clearly isn't working.

This PR enabled the `FAIL_ON_UNKNOWN_PROPERTIES` setting only for the
deserialization of HTTP request payloads. It shouldn't have impact on
other deserializations like those for Git, and those that load resource
files. Primarily to limit the scope.

This should also bring in some much-needed type strictness to the client
as well. So far, server has been lax in accepting just any fields in the
incoming request body, so client was able to afford being lax about the
object that was sent up.

We're enabling this restriction only for CE currently. Will be opening a
similar PR on EE and once all tests pass there, we enable for EE as
well.

Depends on #33728 #33730 #33731 #34366 #34405 #34446 #34473 #34506


Run No. 1
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/9685619413>
> Commit: 04e225f
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9685619413&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: ``

**/test all**
























<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/9690185000>
> Commit: 29da8b4
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9690185000&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: ``

<!-- end of auto-generated comment: Cypress test results  -->



<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Added `certificateType` property to datasources for enhanced SSL
configuration options.

- **Enhancements**
- Improved JSON deserialization behavior for better data handling and
flexibility.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Shivam-z pushed a commit to Shivam-z/appsmith that referenced this pull request Jul 10, 2024
Part of appsmithorg#33724. This is an
effort to harden the server in terms of what request payloads are
acceptable.

**/test all**





<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Enhanced API request payload handling for creating actions to include
additional properties, improving data integrity and server-side
validation.

- **Improvements**
- Refined data manipulation and payload structures in datasource-related
API requests for better compatibility with server requirements.

<!-- end of auto-generated comment: release notes by coderabbit.ai
--><!-- This is an auto-generated comment: Cypress test results -->
> [!CAUTION]
> 🔴 🔴 🔴 Some tests have failed.
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/9626214547>
> Commit: fe5db45
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9626214547&attempt=2&selectiontype=test&testsstatus=failed&specsstatus=fail"
target="_blank">Cypress dashboard</a>.
> Tags: ``
> The following are new failures, please fix them before merging the PR:
<ol>
>
<li>cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts
>
<li>cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js
>
<li>cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
</ol>
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master"
target="_blank">List of identified flaky tests</a>.

<!-- end of auto-generated comment: Cypress test results  -->
Shivam-z pushed a commit to Shivam-z/appsmith that referenced this pull request Jul 10, 2024
Currently, if the incoming request body contains fields that aren't
recognized by the backend, we just ignore them, and deserialize what we
_can_. This has lead to subtle bugs and wasted a lot of developer time
in the past, and added little value in return.

Most recently, with application creation, now fixed in
appsmithorg#33722.

Another one, for action creation, client sends this in `eventData` field
of the request body:

![shot-2024-05-26-04-50-46](https://github.com/appsmithorg/appsmith/assets/120119/b876b27f-47ec-4a00-8598-33cb92120c49)
But the class defined for `eventData` is this:

![shot-2024-05-26-04-51-03](https://github.com/appsmithorg/appsmith/assets/120119/18bf46b7-597a-4b2f-8355-1b8fad30e4ce)
Clearly isn't working.

This PR enabled the `FAIL_ON_UNKNOWN_PROPERTIES` setting only for the
deserialization of HTTP request payloads. It shouldn't have impact on
other deserializations like those for Git, and those that load resource
files. Primarily to limit the scope.

This should also bring in some much-needed type strictness to the client
as well. So far, server has been lax in accepting just any fields in the
incoming request body, so client was able to afford being lax about the
object that was sent up.

We're enabling this restriction only for CE currently. Will be opening a
similar PR on EE and once all tests pass there, we enable for EE as
well.

Depends on appsmithorg#33728 appsmithorg#33730 appsmithorg#33731 appsmithorg#34366 appsmithorg#34405 appsmithorg#34446 appsmithorg#34473 appsmithorg#34506


Run No. 1
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/9685619413>
> Commit: 04e225f
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9685619413&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: ``

**/test all**
























<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/9690185000>
> Commit: 29da8b4
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9690185000&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: ``

<!-- end of auto-generated comment: Cypress test results  -->



<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Added `certificateType` property to datasources for enhanced SSL
configuration options.

- **Enhancements**
- Improved JSON deserialization behavior for better data handling and
flexibility.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants