mderasse/gouick
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(lint): Start to apply linter recommandation
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Matthieu 'JP' DERASSE
2022-08-02 20:33:47 +00:00
parent 5434cc15ce
commit 1d7730c078
19 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
helpers/dependencies/golang.go
View File

@ -147,7 +147,7 @@ func (g Golang) DescribeInstall(path string) string {
commands := []string{
"The following commands will be executed",
fmt.Sprintf("rm -rf %s/* ", path),
fmt.Sprintf("curl %s | tar --strip-components=1 -C %s -zxf -", g.getDownloadUrl(), path),
fmt.Sprintf("curl %s | tar --strip-components=1 -C %s -zxf -", g.getDownloadURL(), path),
}
return strings.Join(commands, "\n")
@ -161,10 +161,10 @@ func (g Golang) Install(path string) error {
log.Warnf("fail to delete content of directory %s", path)
}
downloadUrl := g.getDownloadUrl()
content, err := downloadFile(downloadUrl)
downloadURL := g.getDownloadURL()
content, err := downloadFile(downloadURL)
if err != nil {
log.Warnf("fail to download file from %s", downloadUrl)
log.Warnf("fail to download file from %s", downloadURL)
return errors.Trace(err)
}
@ -175,7 +175,7 @@ func (g Golang) Install(path string) error {
err = unZip(content, "go/", path)
if err != nil {
log.Warnf("fail to un-zip downloaded file from %s", downloadUrl)
log.Warnf("fail to un-zip downloaded file from %s", downloadURL)
return errors.Trace(err)
}
@ -185,13 +185,13 @@ func (g Golang) Install(path string) error {
gzipReader, err := unGzip(content)
if err != nil {
log.Warnf("fail to un-gzip downloaded file from %s, error:", downloadUrl)
log.Warnf("fail to un-gzip downloaded file from %s, error:", downloadURL)
return errors.Trace(err)
}
err = unTar(gzipReader, "go/", path)
if err != nil {
log.Warnf("fail to un-tar downloaded file from %s", downloadUrl)
log.Warnf("fail to un-tar downloaded file from %s", downloadURL)
return errors.Trace(err)
}
}
@ -335,7 +335,7 @@ func (g Golang) GetInstallDirectory() (string, error) {
return cleanOut, nil
}
func (g Golang) getDownloadUrl() string {
func (g Golang) getDownloadURL() string {
if runtime.GOOS == "windows" {
return fmt.Sprintf("https://dl.google.com/go/go%s.%s-%s.zip", minimumGolangVersion, runtime.GOOS, runtime.GOARCH)

10
helpers/dependencies/swagger.go
View File

@ -146,7 +146,7 @@ func (s Swagger) DescribeInstall(path string) string {
commands := []string{
"The following commands will be executed",
fmt.Sprintf("rm -rf %s/swagger ", path),
fmt.Sprintf("wget %s -O %s/swagger", s.getDownloadUrl(), path),
fmt.Sprintf("wget %s -O %s/swagger", s.getDownloadURL(), path),
fmt.Sprintf("chmod 644 %s/swagger", path),
}
@ -156,10 +156,10 @@ func (s Swagger) DescribeInstall(path string) string {
// Install
func (s Swagger) Install(path string) error {
downloadUrl := s.getDownloadUrl()
content, err := downloadFile(downloadUrl)
downloadURL := s.getDownloadURL()
content, err := downloadFile(downloadURL)
if err != nil {
log.Warnf("fail to download file from %s", downloadUrl)
log.Warnf("fail to download file from %s", downloadURL)
return errors.Trace(err)
}
@ -276,7 +276,7 @@ func (s Swagger) GetInstallDirectory() (string, error) {
return strings.TrimSuffix(binaryPath, "/swagger"), nil
}
func (s Swagger) getDownloadUrl() string {
func (s Swagger) getDownloadURL() string {
return fmt.Sprintf("https://github.com/go-swagger/go-swagger/releases/download/v%s/swagger_%s_%s", minimumSwaggerVersion, runtime.GOOS, runtime.GOARCH)
}