Skip to content

Commit 680e237

Browse files
authored
fix: fix the issue of import cycle (#7757)
1 parent fcc3f8e commit 680e237

File tree

4 files changed

+2
-22
lines changed

4 files changed

+2
-22
lines changed

agent/app/service/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ func getAppFromRepo(downloadPath string) error {
821821
global.LOG.Infof("[AppStore] download file from %s", downloadUrl)
822822
fileOp := files.NewFileOp()
823823
packagePath := filepath.Join(constant.ResourceDir, filepath.Base(downloadUrl))
824-
if err := fileOp.DownloadFileWithProxy(downloadUrl, packagePath); err != nil {
824+
if err := fileOp.DownloadFile(downloadUrl, packagePath); err != nil {
825825
return err
826826
}
827827
if err := fileOp.Decompress(packagePath, constant.ResourceDir, files.SdkZip, ""); err != nil {

agent/app/service/app_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ func downloadApp(app model.App, appDetail model.AppDetail, appInstall *model.App
897897
}
898898
}()
899899

900-
if err = fileOp.DownloadFileWithProxy(appDetail.DownloadUrl, filePath); err != nil {
900+
if err = fileOp.DownloadFile(appDetail.DownloadUrl, filePath); err != nil {
901901
if logger == nil {
902902
global.LOG.Errorf("download app[%s] error %v", app.Name, err)
903903
} else {

agent/utils/files/file_op.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package files
33
import (
44
"archive/zip"
55
"bufio"
6-
"bytes"
76
"context"
87
"crypto/tls"
98
"encoding/json"
@@ -333,25 +332,6 @@ func (f FileOp) DownloadFile(url, dst string) error {
333332
return nil
334333
}
335334

336-
func (f FileOp) DownloadFileWithProxy(url, dst string) error {
337-
_, resp, err := req_helper.HandleRequest(url, http.MethodGet, constant.TimeOut5m)
338-
if err != nil {
339-
return err
340-
}
341-
342-
out, err := os.Create(dst)
343-
if err != nil {
344-
return fmt.Errorf("create download file [%s] error, err %s", dst, err.Error())
345-
}
346-
defer out.Close()
347-
348-
reader := bytes.NewReader(resp)
349-
if _, err = io.Copy(out, reader); err != nil {
350-
return fmt.Errorf("save download file [%s] error, err %s", dst, err.Error())
351-
}
352-
return nil
353-
}
354-
355335
func (f FileOp) Cut(oldPaths []string, dst, name string, cover bool) error {
356336
for _, p := range oldPaths {
357337
var dstPath string

0 commit comments

Comments
 (0)