Skip to content

Cherry pick main #3125

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
littleniannian merged 2 commits into from
Sep 2, 2025
Merged

Cherry pick main #3125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb6b61
fix: no ssh key error
littleniannian Sep 1, 2025
6bfda89
fix: get system variables error code
littleniannian Sep 2, 2025
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
4 changes: 2 additions & 2 deletions sqle/api/controller/v1/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ func getGitAuthMethod(url, username, password string) (transport.AuthMethod, err
if err != nil {
return nil, err
}
if systemVariable.Code != 0 {
if systemVariable.Data.SystemVariableSSHPrimaryKey != "" {
return nil, errors.New(errors.DataNotExist, fmt.Errorf("git ssh private key not found"))
}
publicKeys, err := sshTransport.NewPublicKeys("git", []byte(systemVariable.Data.SystemVariableSSHPrimaryKey), "")
Expand Down Expand Up @@ -550,7 +550,7 @@ func GetSSHPublicKey(c echo.Context) error {
if err != nil {
return controller.JSONBaseErrorReq(c, err)
}
if systemVariable.Code != 0 {
if systemVariable.Data.SystemVariableSSHPrimaryKey == "" {
return c.JSON(http.StatusOK, SSHPublicKeyInfoV1Rsp{
BaseRes: controller.NewBaseReq(nil),
Data: SSHPublicKeyInfo{
Expand Down
2 changes: 1 addition & 1 deletion sqle/server/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func getOperationRecordExpiredHours(entry *logrus.Entry) (operationRecordExpired

operationRecordExpiredHours = dms.DefaultOperationRecordExpiredHours
systemVariables, err := dmsobject.GetSystemVariables(context.TODO(), dms.GetDMSServerAddress())
if err != nil || systemVariables.Code != 0 {
if err != nil {
entry.Warnf("get system variables failed, err: %s", err.Error())
return operationRecordExpiredHours
}
Expand Down
Loading