Uninstall

src/install/install.go

@@ -2,98 +2,62 @@ package install
 
 import (
     "fmt"
-    "errors"
     "sync"
-    // "time"
+    "os"
 
     log "oc-deploy/log_wrapper"
     "oc-deploy/utils"
     "oc-deploy/tool"
-    "oc-deploy/helm"
     "oc-deploy/chart"
+    "oc-deploy/helm"
     "oc-deploy/kubectl"
+    "oc-deploy/versionOc"
 )
 
 type InstallClass struct {
     Version string
     Workspace string
 
-    versionFile string
+    // versionFile string
     tools []tool.ToolData
     toolsBin map[string]string
     charts []chart.ChartRepoData
 }
 
-func (this *InstallClass) New() (string, error) {
+func (this *InstallClass) NewInstall() (string, error) {
 
     // Extraction du fichier de version
-    log.Log().Debug().Msg("Téléchargement du fichier de version")
-    src := fmt.Sprintf("../offline/oc_%s.yml", this.Version)
     dst := fmt.Sprintf("%s/oc.yml", this.Workspace)
-
-    err := utils.CopyFile(src, dst)
-    if err != nil {
-        return "", err
+    log.Log().Debug().Msg(fmt.Sprintf("Check du fichier de version : %s", dst))
+    if _, err := os.Stat(dst); err == nil {
+        log.Log().Debug().Msg("Existe déjà")
+        version, err := versionOc.GetFromFile(dst)
+        if err != nil {
+            return "", err
+        }
+        this.Version = version
+    } else {
+        log.Log().Debug().Msg("Téléchargement du fichier de version")
+        version, err := versionOc.Get(this.Version)
+        if err != nil {
+            return "", err
+        }
+        src := fmt.Sprintf("../offline/oc_%s.yml", version)
+        err = utils.CopyFile(src, dst)
+        if err != nil {
+            return "", err
+        }
     }
 
     // Lecture du fichier de conf
-    this.versionFile = dst
+    // this.versionFile = dst
 
-    this.tools = tool.FromConfigFile(this.versionFile)
-
-    this.charts = chart.FromConfigFile(this.versionFile)
+    this.tools = tool.FromConfigFile(dst)
+    this.charts = chart.FromConfigFile(dst)
 
     return dst, nil
 }
 
-func (this *InstallClass) Tools() (error) {
-
-    var mem []tool.ToolClass
-
-    for _, v := range this.tools {
-
-        tool2 := tool.ToolClass{}
-        v.Bin = this.Workspace
-        err := tool2.New(v)
-        if err != nil {
-            return err
-        }
-        mem = append(mem,tool2)
-    }
-
-    this.toolsBin = make(map[string]string)
-
-    for _, p := range mem {
-        data := p.Obj.Get()
-        log.Log().Info().Msg(fmt.Sprintf("  >> Outils    : %s", data.Name))
-        err := p.Locate()
-        if err != nil {
-            log.Log().Info().Msg(fmt.Sprintf("  <<            %s ", err))
-            return err
-        }
-        log.Log().Info().Msg(fmt.Sprintf("  <<             %s ", p.Path))
-        version, err1 := p.Version()
-        if err1 != nil {
-            log.Log().Info().Msg(fmt.Sprintf("  <<             %s ", err1))
-            return err1
-        }
-        log.Log().Info().Msg(fmt.Sprintf("  <<             %s ", version))
-
-        this.toolsBin[data.Name] = p.Path
-    }
-
-    return nil
-}
-
-func (this *InstallClass) getToolBin(name string) (string, error) {
-    for key, value := range this.toolsBin {
-        if key == name {
-            return value, nil
-        }
-    }
-
-    return  "", errors.New("Error")
-}
 
 func (this *InstallClass) ChartRepo() (error) {
 
@@ -116,38 +80,8 @@ func (this *InstallClass) ChartRepo() (error) {
     return nil
 }
 
-func (this *InstallClass) K8s(context string) (error) {
-    bin_path, _ := this.getToolBin("kubectl")
 
-    kube := kubectl.KubeContext{Bin: bin_path}
-
-    err := kube.UseContext(context)
-    if err != nil {
-        log.Log().Info().Msg(fmt.Sprintf("  << Kube      : %s ", err))
-        return err
-    }
-
-    currentcontext, namespace, server, err := kube.GetContext()
-    if err != nil {
-        log.Log().Info().Msg(fmt.Sprintf("  << Kube      : %s ", err))
-        return err
-    }
-    log.Log().Info().Msg(fmt.Sprintf("  << Kube      : %s ", currentcontext))
-
-    log.Log().Info().Msg(fmt.Sprintf("  <<           : %s ", namespace))
-    log.Log().Info().Msg(fmt.Sprintf("  <<           : %s ", server))
-
-    err = kube.Check()
-    if err != nil {
-        log.Log().Info().Msg(fmt.Sprintf("  <<           : %s ", err))
-        return err
-    }
-    log.Log().Info().Msg(fmt.Sprintf("  <<           : %s ", "OK"))
-
-    return nil
-}
-
-func (this *InstallClass) Charts() (error) {
+func (this *InstallClass) InstallCharts() (error) {
     helm_bin, _ := this.getToolBin("helm")
     kubectl_bin, _ := this.getToolBin("kubectl")
 
@@ -159,7 +93,7 @@ func (this *InstallClass) Charts() (error) {
 
             go func() {
                 defer wg.Done()
-                this.worker(helm_bin, kubectl_bin, v1)
+                this.installChart(helm_bin, kubectl_bin, v1)
             } ()
             
         }
@@ -168,7 +102,7 @@ func (this *InstallClass) Charts() (error) {
     return nil
 }
 
-func (this *InstallClass) worker(helm_bin string, kubectl_bin string, chart chart.ChartData) {
+func (this *InstallClass) installChart(helm_bin string, kubectl_bin string, chart chart.ChartData) {
 
     log.Log().Info().Msg(fmt.Sprintf("  << Chart     : %s ", chart.Name))
 
@@ -177,7 +111,7 @@ func (this *InstallClass) worker(helm_bin string, kubectl_bin string, chart char
                                 Chart: chart.Chart,
                                 Version: chart.Version,
                                 Workspace: this.Workspace,
-                            	Opts: chart.Opts,
+                                Opts: chart.Opts,
                                 Values: chart.Values,
                                 FileValues: chart.FileValues}