Skip to content

Pass explicit no-SSH datasource config #11

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

Merged
PaleHazy merged 1 commit into from
Jul 26, 2026
Merged

Pass explicit no-SSH datasource config #11

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
2 changes: 2 additions & 0 deletions ...c/main/java/ai/chat2db/community/domain/core/impl/db/ManagedDataSourceReconcilerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ai.chat2db.community.domain.api.model.PageResponse;
import ai.chat2db.community.domain.api.model.datasource.ManagedDataSourceReconcileResult;
import ai.chat2db.community.domain.api.model.datasource.ManagedDataSourceSpec;
import ai.chat2db.community.domain.api.model.datasource.SSHInfo;
import ai.chat2db.community.domain.api.model.request.datasource.DbDataSourcePageQueryRequest;
import ai.chat2db.community.domain.api.model.request.datasource.DbDataSourcePreConnectRequest;
import ai.chat2db.community.domain.api.model.storage.WorkspaceDataSource;
Expand Down Expand Up @@ -131,6 +132,7 @@ private DbDataSourcePreConnectRequest preConnect(WorkspaceDataSource dataSource)
request.setAuthenticationType(dataSource.getAuthenticationType());
request.setHost(dataSource.getHost());
request.setPort(dataSource.getPort());
request.setSsh(new SSHInfo());
return request;
}

Expand Down
5 changes: 5 additions & 0 deletions ...st/java/ai/chat2db/community/domain/core/impl/db/ManagedDataSourceReconcilerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import ai.chat2db.community.domain.api.model.datasource.ManagedDataSourceReconcileResult;
import ai.chat2db.community.domain.api.model.datasource.ManagedDataSourceSpec;
import ai.chat2db.community.domain.api.model.storage.WorkspaceDataSource;
import ai.chat2db.community.domain.api.model.request.datasource.DbDataSourcePreConnectRequest;
import ai.chat2db.community.domain.api.service.db.IDbWorkspaceDataSourceService;
import ai.chat2db.community.domain.api.service.storage.IWorkspaceStorageFacade;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -23,6 +24,7 @@ class ManagedDataSourceReconcilerImplTest {
private final List<WorkspaceDataSource> stored = new ArrayList<>();
private final List<String> calls = new ArrayList<>();
private WorkspaceDataSource updateRequest;
private DbDataSourcePreConnectRequest preConnectRequest;
private boolean failPreConnect;
private ManagedDataSourceReconcilerImpl reconciler;

Expand All @@ -31,6 +33,7 @@ void setUp() {
stored.clear();
calls.clear();
updateRequest = null;
preConnectRequest = null;
failPreConnect = false;
reconciler = new ManagedDataSourceReconcilerImpl(storageFacade(), workspaceService());
}
Expand All @@ -42,6 +45,7 @@ void createsManagedDatasourceAfterConnectionTest() {
assertEquals(ManagedDataSourceReconcileResult.Action.CREATED, result.getAction());
assertEquals(101L, result.getDataSourceId());
assertEquals(List.of("preConnect", "create"), calls);
assertEquals(false, preConnectRequest.getSsh().isUse());
assertEquals(ManagedDataSourceReconcilerImpl.MANAGED_BY, stored.get(0).getManagedBy());
assertEquals("prod-readonly", stored.get(0).getManagedKey());
}
Expand Down Expand Up @@ -151,6 +155,7 @@ private IDbWorkspaceDataSourceService workspaceService() {
yield stored.stream().filter(item -> item.getId().equals(args[0])).findFirst().orElse(null);
}
case "preConnect" -> {
preConnectRequest = (DbDataSourcePreConnectRequest) args[0];
calls.add("preConnect");
if (failPreConnect) {
throw new IllegalStateException("connection failed");
Expand Down
Loading