lint
This commit is contained in:
@@ -4,50 +4,49 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
// log "oc-deploy/log_wrapper"
|
||||
"oc-deploy/utils"
|
||||
"oc-deploy/helm"
|
||||
)
|
||||
|
||||
type HelmInstallData struct {
|
||||
obj ToolData
|
||||
tmp string
|
||||
obj ToolData
|
||||
tmp string
|
||||
}
|
||||
|
||||
func (this HelmInstallData) Get() (ToolData) {
|
||||
return this.obj
|
||||
return this.obj
|
||||
}
|
||||
|
||||
func (this HelmInstallData) Download() (error) {
|
||||
|
||||
bin_dir := this.obj.Bin
|
||||
err2 := os.MkdirAll(bin_dir, os.ModePerm)
|
||||
if err2 != nil {
|
||||
fmt.Println(err2)
|
||||
return err2
|
||||
}
|
||||
bin_dir := this.obj.Bin
|
||||
err2 := os.MkdirAll(bin_dir, os.ModePerm)
|
||||
if err2 != nil {
|
||||
fmt.Println(err2)
|
||||
return err2
|
||||
}
|
||||
|
||||
tmp_file := fmt.Sprintf("%s/oc-deploy-%s", this.tmp, this.obj.Name)
|
||||
url := fmt.Sprintf(this.obj.Url, this.obj.Version)
|
||||
url := fmt.Sprintf(this.obj.Url, this.obj.Version)
|
||||
|
||||
err := utils.DownloadFromUrl(tmp_file, url, 0777)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err := utils.DownloadFromUrl(tmp_file, url, 0777)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
r, _ := os.Open(tmp_file)
|
||||
err1 := utils.ExtractTarGz(bin_dir, r)
|
||||
r, _ := os.Open(tmp_file)
|
||||
err1 := utils.ExtractTarGz(bin_dir, r)
|
||||
|
||||
os.Remove(tmp_file)
|
||||
os.Remove(tmp_file)
|
||||
|
||||
bin_file := fmt.Sprintf("%s/%s", bin_dir, this.obj.Name)
|
||||
bin_file := fmt.Sprintf("%s/%s", bin_dir, this.obj.Name)
|
||||
|
||||
os.Chmod(bin_file, 0755)
|
||||
os.Chmod(bin_file, 0755)
|
||||
|
||||
return err1
|
||||
return err1
|
||||
}
|
||||
|
||||
///////////////
|
||||
func (this HelmInstallData) Version(path string) (string, error) {
|
||||
return helm.Version(path)
|
||||
return helm.Version(path)
|
||||
}
|
||||
@@ -11,31 +11,31 @@ import (
|
||||
)
|
||||
|
||||
type KubecltInstallData struct {
|
||||
obj ToolData
|
||||
obj ToolData
|
||||
}
|
||||
|
||||
func (this KubecltInstallData) Get() (ToolData) {
|
||||
return this.obj
|
||||
return this.obj
|
||||
}
|
||||
|
||||
func (this KubecltInstallData) Download() (error) {
|
||||
|
||||
bin_dir := this.obj.Bin
|
||||
bin := filepath.Join(bin_dir, this.obj.Name)
|
||||
url := fmt.Sprintf(this.obj.Url, this.obj.Version)
|
||||
bin_dir := this.obj.Bin
|
||||
bin := filepath.Join(bin_dir, this.obj.Name)
|
||||
url := fmt.Sprintf(this.obj.Url, this.obj.Version)
|
||||
|
||||
log.Log().Debug().Msg(fmt.Sprintf("Téléchargement : %s, %s", bin, url))
|
||||
os.MkdirAll(bin_dir, os.ModePerm)
|
||||
log.Log().Debug().Msg(fmt.Sprintf("Téléchargement : %s, %s", bin, url))
|
||||
os.MkdirAll(bin_dir, os.ModePerm)
|
||||
|
||||
err := utils.DownloadFromUrl(bin, url, 0777)
|
||||
if err != nil {return err}
|
||||
err := utils.DownloadFromUrl(bin, url, 0777)
|
||||
if err != nil {return err}
|
||||
|
||||
os.Chmod(bin, 0755)
|
||||
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
||||
///////////////
|
||||
func (this KubecltInstallData) Version(path string) (string, error) {
|
||||
return kubectl.Version(path)
|
||||
return kubectl.Version(path)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user