Skip to content

[Studio] Validate data source requests #557

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

Closed
Aias00 wants to merge 1 commit into from
Closed

[Studio] Validate data source requests #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/src/main/java/com/rocketmq/studio/settings/DataSourceTestDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.rocketmq.studio.settings;

import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -26,7 +27,9 @@
@NoArgsConstructor
@AllArgsConstructor
public class DataSourceTestDTO {
@NotBlank(message = "url is required")
private String url;
@NotBlank(message = "type is required")
private String type;
private String auth;
}
4 changes: 4 additions & 0 deletions server/src/main/java/com/rocketmq/studio/settings/DataSourceVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.rocketmq.studio.settings;

import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -27,8 +28,11 @@
@AllArgsConstructor
public class DataSourceVO {
private String key;
@NotBlank(message = "name is required")
private String name;
@NotBlank(message = "type is required")
private String type;
@NotBlank(message = "url is required")
private String url;
private String auth;
private String status;
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/com/rocketmq/studio/settings/SettingsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ public Result<List<DataSourceVO>> listDataSources() {
}

@PostMapping("/datasources/create")
public Result<DataSourceVO> createDataSource(@RequestBody DataSourceVO dataSource) {
public Result<DataSourceVO> createDataSource(@Valid @RequestBody DataSourceVO dataSource) {
return Result.ok(settingsService.createDataSource(dataSource));
}

@PostMapping("/datasources/update")
public Result<DataSourceVO> updateDataSource(@RequestBody DataSourceVO dataSource) {
public Result<DataSourceVO> updateDataSource(@Valid @RequestBody DataSourceVO dataSource) {
return Result.ok(settingsService.updateDataSource(dataSource));
}

Expand All @@ -68,7 +68,7 @@ public Result<Void> deleteDataSource(@RequestParam String key) {
}

@PostMapping("/datasources/test")
public Result<DataSourceTestResultVO> testDataSource(@RequestBody DataSourceTestDTO request) {
public Result<DataSourceTestResultVO> testDataSource(@Valid @RequestBody DataSourceTestDTO request) {
return Result.ok(settingsService.testDataSource(request));
}
}
51 changes: 51 additions & 0 deletions server/src/test/java/com/rocketmq/studio/settings/SettingsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,23 @@ void createDataSourceShouldReturnCreatedSource() throws Exception {
.andExpect(jsonPath("$.data.status", is("connected")));
}

@Test
void createDataSourceShouldRejectMissingUrl() throws Exception {
mockMvc.perform(post("/api/settings/datasources/create")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"name": "New DS",
"type": "prometheus"
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code", is(400)))
.andExpect(jsonPath("$.message", is("url is required")));

verifyNoInteractions(settingsService);
}

@Test
void updateDataSourceShouldReturnUpdatedSource() throws Exception {
DataSourceVO input = DataSourceVO.builder().key("ds-1").name("Updated DS").type("rocketmq")
Expand All @@ -218,6 +235,24 @@ void updateDataSourceShouldReturnUpdatedSource() throws Exception {
.andExpect(jsonPath("$.data.name", is("Updated DS")));
}

@Test
void updateDataSourceShouldRejectMissingName() throws Exception {
mockMvc.perform(post("/api/settings/datasources/update")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"key": "ds-1",
"type": "rocketmq",
"url": "updated:9876"
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code", is(400)))
.andExpect(jsonPath("$.message", is("name is required")));

verifyNoInteractions(settingsService);
}

@Test
void deleteDataSourceShouldReturnSuccess() throws Exception {
doNothing().when(settingsService).deleteDataSource("ds-1");
Expand Down Expand Up @@ -250,4 +285,20 @@ void testDataSourceShouldReturnTestResult() throws Exception {
.andExpect(jsonPath("$.data.success", is(true)))
.andExpect(jsonPath("$.data.message", is("Connection successful")));
}

@Test
void testDataSourceShouldRejectMissingType() throws Exception {
mockMvc.perform(post("/api/settings/datasources/test")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"url": "localhost:9876"
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code", is(400)))
.andExpect(jsonPath("$.message", is("type is required")));

verifyNoInteractions(settingsService);
}
}
Loading