From 1eba63658d0d06faf4e813277cb80cf9336878bc Mon Sep 17 00:00:00 2001 From: ssongliu Date: Tue, 10 Mar 2026 15:12:25 +0800 Subject: [PATCH] chore(agent): optimize lint and cleanup warnings --- agent/app/service/alert_helper.go | 47 +++++++------------ agent/app/service/app_utils.go | 11 ++--- agent/app/service/dashboard.go | 2 +- agent/app/service/file.go | 2 +- agent/app/service/iptables.go | 6 +-- agent/app/service/nginx.go | 3 +- agent/cmd/server/nginx_conf/nginx_conf.go | 1 - .../client/helper/webdav/auth.go | 4 -- agent/utils/controller/controller.go | 2 +- agent/utils/files/file_op.go | 2 +- agent/utils/psutil/cpu.go | 1 - agent/utils/ssl/acme.go | 5 -- 12 files changed, 29 insertions(+), 57 deletions(-) diff --git a/agent/app/service/alert_helper.go b/agent/app/service/alert_helper.go index c9674f1d6b4f..556f6d5454ef 100644 --- a/agent/app/service/alert_helper.go +++ b/agent/app/service/alert_helper.go @@ -3,6 +3,12 @@ package service import ( "encoding/json" "fmt" + "math" + "sort" + "strconv" + "strings" + "time" + "github.com/1Panel-dev/1Panel/agent/app/dto" "github.com/1Panel-dev/1Panel/agent/app/model" "github.com/1Panel-dev/1Panel/agent/app/repo" @@ -18,11 +24,6 @@ import ( "github.com/shirou/gopsutil/v4/load" "github.com/shirou/gopsutil/v4/mem" "github.com/shirou/gopsutil/v4/net" - "math" - "sort" - "strconv" - "strings" - "time" ) const ( @@ -423,25 +424,19 @@ func loadDiskUsage(alert dto.AlertDTO) { } if isAlertDue(newDate) { if strings.Contains(alert.Project, "all") { - err = processAllDisks(alert) + _ = processAllDisks(alert) } else { - err = processSingleDisk(alert) + _ = processSingleDisk(alert) } } } func loadPanelLogin(alert dto.AlertDTO) { count, isAlert, err := alertUtil.CountRecentFailedLoginLogs(alert.Cycle, alert.Count) - alertType := alert.Type - quota := strconv.Itoa(count) - quotaType := strconv.Itoa(int(alert.Cycle)) if err != nil { global.LOG.Errorf("Failed to count recent failed login logs: %v", err) } if isAlert { - alertType = "panelLogin" - quota = strconv.Itoa(count) - quotaType = "panelLogin" params := []dto.Param{ { Index: "1", @@ -454,7 +449,7 @@ func loadPanelLogin(alert dto.AlertDTO) { Value: "", }, } - sendAlerts(alert, alertType, quota, quotaType, params) + sendAlerts(alert, "panelLogin", strconv.Itoa(count), "panelLogin", params) } whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n") @@ -463,15 +458,13 @@ func loadPanelLogin(alert dto.AlertDTO) { global.LOG.Errorf("Failed to check recent failed ip login logs: %v", err) } if len(records) > 0 { - quota = strings.Join(func() []string { + quota := strings.Join(func() []string { var ips []string for _, r := range records { ips = append(ips, r.IP) } return ips }(), "\n") - alertType = "panelIpLogin" - quotaType = "panelIpLogin" params := []dto.Param{ { Index: "1", @@ -484,22 +477,16 @@ func loadPanelLogin(alert dto.AlertDTO) { Value: " IP ", }, } - sendAlerts(alert, alertType, quota, quotaType, params) + sendAlerts(alert, "panelIpLogin", quota, "panelIpLogin", params) } } func loadSSHLogin(alert dto.AlertDTO) { count, isAlert, err := alertUtil.CountRecentFailedSSHLog(alert.Cycle, alert.Count) - alertType := alert.Type - quota := strconv.Itoa(count) - quotaType := strconv.Itoa(int(alert.Cycle)) if err != nil { global.LOG.Errorf("Failed to count recent failed ssh login logs: %v", err) } if isAlert { - alertType = "sshLogin" - quota = strconv.Itoa(count) - quotaType = "sshLogin" params := []dto.Param{ { Index: "1", @@ -512,7 +499,7 @@ func loadSSHLogin(alert dto.AlertDTO) { Value: "", }, } - sendAlerts(alert, alertType, quota, quotaType, params) + sendAlerts(alert, "sshLogin", strconv.Itoa(count), "sshLogin", params) } whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n") records, err := alertUtil.FindRecentSuccessLoginNotInWhitelist(30, whitelist) @@ -520,9 +507,7 @@ func loadSSHLogin(alert dto.AlertDTO) { global.LOG.Errorf("Failed to check recent failed ip ssh login logs: %v", err) } if len(records) > 0 { - quota = strings.Join(records, "\n") - alertType = "sshIpLogin" - quotaType = "sshIpLogin" + quota := strings.Join(records, "\n") params := []dto.Param{ { Index: "1", @@ -535,7 +520,7 @@ func loadSSHLogin(alert dto.AlertDTO) { Value: " IP ", }, } - sendAlerts(alert, alertType, quota, quotaType, params) + sendAlerts(alert, "sshIpLogin", quota, "sshIpLogin", params) } } @@ -894,7 +879,7 @@ func processAllDisks(alert dto.AlertDTO) error { if err != nil { errMsg := fmt.Sprintf("disk path %s process failed: %v", item.Path, err) errMsgs = append(errMsgs, errMsg) - global.LOG.Errorf(errMsg) + global.LOG.Errorf("%s", errMsg) continue } } @@ -907,7 +892,7 @@ func processAllDisks(alert dto.AlertDTO) error { func processSingleDisk(alert dto.AlertDTO) error { err := checkAndCreateDiskAlert(alert, alert.Project) if err != nil { - global.LOG.Errorf(err.Error()) + global.LOG.Errorf("%s", err.Error()) return err } return nil diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go index df8420c947f0..e6f4b2f4e31e 100644 --- a/agent/app/service/app_utils.go +++ b/agent/app/service/app_utils.go @@ -33,7 +33,6 @@ import ( "github.com/1Panel-dev/1Panel/agent/utils/common" "github.com/1Panel-dev/1Panel/agent/utils/compose" "github.com/1Panel-dev/1Panel/agent/utils/docker" - composeV2 "github.com/1Panel-dev/1Panel/agent/utils/docker" "github.com/1Panel-dev/1Panel/agent/utils/env" "github.com/1Panel-dev/1Panel/agent/utils/files" "github.com/1Panel-dev/1Panel/agent/utils/nginx" @@ -363,7 +362,7 @@ func deleteAppInstall(deleteReq request.AppInstallDelete) error { if err != nil { return err } - images, err := composeV2.GetImagesFromDockerCompose(content, []byte(install.DockerCompose)) + images, err := docker.GetImagesFromDockerCompose(content, []byte(install.DockerCompose)) if err != nil { return err } @@ -752,7 +751,7 @@ func upgradeInstall(req request.AppInstallUpgrade) error { if req.DockerCompose != "" { composeContent = []byte(req.DockerCompose) } - images, err := composeV2.GetImagesFromDockerCompose(content, composeContent) + images, err := docker.GetImagesFromDockerCompose(content, composeContent) if err != nil { return err } @@ -911,7 +910,7 @@ func getContainerNames(install model.AppInstall) ([]string, error) { if err != nil { return nil, err } - project, err := composeV2.GetComposeProject(install.Name, install.GetPath(), []byte(install.DockerCompose), []byte(envStr), true) + project, err := docker.GetComposeProject(install.Name, install.GetPath(), []byte(install.DockerCompose), []byte(envStr), true) if err != nil { return nil, err } @@ -1133,7 +1132,7 @@ func runScript(task *task.Task, appInstall *model.AppInstall, operate string) er } func checkContainerNameIsExist(containerName, appDir string) (bool, error) { - client, err := composeV2.NewDockerClient() + client, err := docker.NewDockerClient() if err != nil { return false, err } @@ -1169,7 +1168,7 @@ func upApp(task *task.Task, appInstall *model.AppInstall, pullImages bool) error if err != nil { return err } - images, err := composeV2.GetImagesFromDockerCompose(envByte, []byte(appInstall.DockerCompose)) + images, err := docker.GetImagesFromDockerCompose(envByte, []byte(appInstall.DockerCompose)) if err != nil { return err } diff --git a/agent/app/service/dashboard.go b/agent/app/service/dashboard.go index 4b793727c16b..aa379ce7e8ae 100644 --- a/agent/app/service/dashboard.go +++ b/agent/app/service/dashboard.go @@ -284,7 +284,7 @@ func (u *DashboardService) LoadAppLauncher(ctx *gin.Context) ([]dto.AppLauncher, return data, err } - showList, err := launcherRepo.ListName() + showList, _ := launcherRepo.ListName() defaultList, err := appRepo.GetTopRecommend() if err != nil { return data, nil diff --git a/agent/app/service/file.go b/agent/app/service/file.go index 1c48e72e8cf8..a8c065b3b8e1 100644 --- a/agent/app/service/file.go +++ b/agent/app/service/file.go @@ -691,7 +691,7 @@ func (f *FileService) ReadLogByLine(req request.FileReadByLineReq) (*response.Fi logFileRes *dto.LogFileRes ) if stat.Size() > files.MaxReadFileSize { - lines, err = files.TailFromEnd(logFilePath, req.PageSize) + lines, _ = files.TailFromEnd(logFilePath, req.PageSize) isEndOfFile = true scope = "tail" } else { diff --git a/agent/app/service/iptables.go b/agent/app/service/iptables.go index 77b91c1d7366..b2306c5392ec 100644 --- a/agent/app/service/iptables.go +++ b/agent/app/service/iptables.go @@ -289,11 +289,11 @@ func (s *IptablesService) LoadChainStatus(req dto.OperationWithName) dto.Iptable } switch req.Name { case iptables.Chain1PanelBasic: - data.IsBind, err = iptables.CheckChainBind(iptables.FilterTab, iptables.ChainInput, req.Name) + data.IsBind, _ = iptables.CheckChainBind(iptables.FilterTab, iptables.ChainInput, req.Name) case iptables.Chain1PanelInput: - data.IsBind, err = iptables.CheckChainBind(iptables.FilterTab, iptables.ChainInput, req.Name) + data.IsBind, _ = iptables.CheckChainBind(iptables.FilterTab, iptables.ChainInput, req.Name) case iptables.Chain1PanelOutput: - data.IsBind, err = iptables.CheckChainBind(iptables.FilterTab, iptables.ChainOutput, req.Name) + data.IsBind, _ = iptables.CheckChainBind(iptables.FilterTab, iptables.ChainOutput, req.Name) } return data } diff --git a/agent/app/service/nginx.go b/agent/app/service/nginx.go index eb425bd55705..6fec62b9f4de 100644 --- a/agent/app/service/nginx.go +++ b/agent/app/service/nginx.go @@ -18,7 +18,6 @@ import ( "github.com/1Panel-dev/1Panel/agent/buserr" "github.com/1Panel-dev/1Panel/agent/global" "github.com/1Panel-dev/1Panel/agent/utils/cmd" - cmd2 "github.com/1Panel-dev/1Panel/agent/utils/cmd" "github.com/subosito/gotenv" "github.com/1Panel-dev/1Panel/agent/utils/compose" @@ -241,7 +240,7 @@ func (n NginxService) Build(req request.NginxBuildReq) error { return err } buildTask.AddSubTaskWithOps("", func(t *task.Task) error { - cmdMgr := cmd2.NewCommandMgr(cmd.WithTask(*buildTask), cmd.WithTimeout(120*time.Minute)) + cmdMgr := cmd.NewCommandMgr(cmd.WithTask(*buildTask), cmd.WithTimeout(120*time.Minute)) if err = cmdMgr.RunBashCf("docker compose -f %s build", nginxInstall.GetComposePath()); err != nil { return err } diff --git a/agent/cmd/server/nginx_conf/nginx_conf.go b/agent/cmd/server/nginx_conf/nginx_conf.go index 6b93c7b6a3d2..cf2176146a6d 100644 --- a/agent/cmd/server/nginx_conf/nginx_conf.go +++ b/agent/cmd/server/nginx_conf/nginx_conf.go @@ -2,7 +2,6 @@ package nginx_conf import ( "embed" - _ "embed" "io" ) diff --git a/agent/utils/cloud_storage/client/helper/webdav/auth.go b/agent/utils/cloud_storage/client/helper/webdav/auth.go index d20218d1e8da..84c17a0e8be2 100644 --- a/agent/utils/cloud_storage/client/helper/webdav/auth.go +++ b/agent/utils/cloud_storage/client/helper/webdav/auth.go @@ -34,10 +34,6 @@ type authorizer struct { defAuth Authenticator } -type preemptiveAuthorizer struct { - auth Authenticator -} - type authShim struct { factory AuthFactory body io.Reader diff --git a/agent/utils/controller/controller.go b/agent/utils/controller/controller.go index 32321385963a..25e09ca1c444 100644 --- a/agent/utils/controller/controller.go +++ b/agent/utils/controller/controller.go @@ -150,7 +150,7 @@ func LoadServiceName(keyword string) (string, error) { } processedName := loadProcessedName(client.Name(), keyword) - exist, err := client.IsExist(processedName) + exist, _ := client.IsExist(processedName) if exist { return processedName, nil } diff --git a/agent/utils/files/file_op.go b/agent/utils/files/file_op.go index 34b93c5fdbbb..0ca45754fa03 100644 --- a/agent/utils/files/file_op.go +++ b/agent/utils/files/file_op.go @@ -464,7 +464,7 @@ func (f FileOp) Cut(oldPaths []string, dst, name string, cover bool) error { quotedPaths = append(quotedPaths, fmt.Sprintf("'%s'", p)) } mvCommand := fmt.Sprintf("mv %s %s '%s'", coverFlag, strings.Join(quotedPaths, " "), dstPath) - if err := cmd.RunDefaultBashCf(mvCommand); err != nil { + if err := cmd.RunDefaultBashC(mvCommand); err != nil { return err } return nil diff --git a/agent/utils/psutil/cpu.go b/agent/utils/psutil/cpu.go index 3f6a26aeb639..682ea76474a0 100644 --- a/agent/utils/psutil/cpu.go +++ b/agent/utils/psutil/cpu.go @@ -127,7 +127,6 @@ func (c *CPUUsageState) GetCPUUsage() (float64, []float64, []float64) { } c.cachedTotalUsage = totalUsage - c.cachedPerCore = c.cachedPerCore c.cachedDetailedPercent = detailedPercent c.lastTotalStat = &curTotal c.lastDetailStat = &curDetail diff --git a/agent/utils/ssl/acme.go b/agent/utils/ssl/acme.go index 856558baed94..3e7efc268e08 100644 --- a/agent/utils/ssl/acme.go +++ b/agent/utils/ssl/acme.go @@ -30,11 +30,6 @@ import ( var Orders = make(map[uint]*acme.Order) -type domainError struct { - Domain string - Error error -} - type zeroSSLRes struct { Success bool `json:"success"` EabKid string `json:"eab_kid"`