From b3d96d20818817ae3bfdc8c6307b1735d4056dc4 Mon Sep 17 00:00:00 2001
From: Ivan Pedrazas <ipedrazas@gmail.com>
Date: Tue, 20 Dec 2016 11:32:46 +0000
Subject: [PATCH] debug function fixed

---
 main.go   | 30 ------------------------------
 plugin.go | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/main.go b/main.go
index 61d5ea2..748a744 100644
--- a/main.go
+++ b/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/Sirupsen/logrus"
@@ -105,36 +104,7 @@ func run(c *cli.Context) error {
 			Prefix:        c.String("prefix"),
 		},
 	}
-	if plugin.Config.Debug {
-		debug(&plugin)
-	}
-
 	resolveSecrets(&plugin)
 
-	if plugin.Config.Debug {
-		debug(&plugin)
-	}
-
 	return plugin.Exec()
 }
-
-func debug(plugin *Plugin) {
-	// debug env vars
-	for _, e := range os.Environ() {
-		fmt.Println(e)
-	}
-	// debug plugin obj
-	fmt.Printf("Api server: %s \n", plugin.Config.APIServer)
-	fmt.Printf("Values: %s \n", plugin.Config.Values)
-	fmt.Printf("Values: %s \n", plugin.Config.Secrets)
-
-	kubeconfig, err := ioutil.ReadFile(KUBECONFIG)
-	if err != nil {
-		fmt.Println(string(kubeconfig))
-	}
-	config, err := ioutil.ReadFile(CONFIG)
-	if err != nil {
-		fmt.Println(string(config))
-	}
-
-}
diff --git a/plugin.go b/plugin.go
index eaaa562..cd82511 100644
--- a/plugin.go
+++ b/plugin.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -66,6 +67,11 @@ func (p *Plugin) Exec() error {
 		return fmt.Errorf("Error: Token is needed to deploy.")
 	}
 	initialiseKubeconfig(&p.Config, KUBECONFIG, CONFIG)
+
+	if p.Config.Debug {
+		p.debug()
+	}
+
 	fmt.Println(p)
 	init := make([]string, 1)
 	init[0] = "init"
@@ -125,3 +131,24 @@ func resolveEnvVar(key string, envvar string, envval string) string {
 	}
 	return key
 }
+
+func (p *Plugin) debug() {
+	// debug env vars
+	for _, e := range os.Environ() {
+		fmt.Println(e)
+	}
+	// debug plugin obj
+	fmt.Printf("Api server: %s \n", p.Config.APIServer)
+	fmt.Printf("Values: %s \n", p.Config.Values)
+	fmt.Printf("Values: %s \n", p.Config.Secrets)
+
+	kubeconfig, err := ioutil.ReadFile(KUBECONFIG)
+	if err == nil {
+		fmt.Println(string(kubeconfig))
+	}
+	config, err := ioutil.ReadFile(CONFIG)
+	if err == nil {
+		fmt.Println(string(config))
+	}
+
+}