From 10776ba4d80ca8d2d39d3845fe33fb99417bc96f Mon Sep 17 00:00:00 2001 From: Jacob McCann Date: Thu, 26 Apr 2018 14:29:21 -0500 Subject: [PATCH] make plugin a package so that it can be used/imported by other things --- main.go | 8 +++++--- plugin.go => plugin/plugin.go | 2 +- plugin_test.go => plugin/plugin_test.go | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) rename plugin.go => plugin/plugin.go (99%) rename plugin_test.go => plugin/plugin_test.go (99%) diff --git a/main.go b/main.go index 49217ed..02ea5a0 100644 --- a/main.go +++ b/main.go @@ -4,6 +4,8 @@ import ( "fmt" "os" + "github.com/ipedrazas/drone-helm/plugin" + "github.com/Sirupsen/logrus" "github.com/joho/godotenv" "github.com/urfave/cli" @@ -139,8 +141,8 @@ func run(c *cli.Context) error { if c.String("env-file") != "" { _ = godotenv.Load(c.String("env-file")) } - plugin := Plugin{ - Config: Config{ + p := plugin.Plugin{ + Config: plugin.Config{ APIServer: c.String("api_server"), Token: c.String("token"), ServiceAccount: c.String("service-account"), @@ -169,5 +171,5 @@ func run(c *cli.Context) error { Force: c.Bool("force"), }, } - return plugin.Exec() + return p.Exec() } diff --git a/plugin.go b/plugin/plugin.go similarity index 99% rename from plugin.go rename to plugin/plugin.go index 3b66d66..f4b434e 100644 --- a/plugin.go +++ b/plugin/plugin.go @@ -1,4 +1,4 @@ -package main +package plugin import ( "fmt" diff --git a/plugin_test.go b/plugin/plugin_test.go similarity index 99% rename from plugin_test.go rename to plugin/plugin_test.go index ef8fbab..3244cdd 100644 --- a/plugin_test.go +++ b/plugin/plugin_test.go @@ -1,4 +1,4 @@ -package main +package plugin import ( "fmt" @@ -22,7 +22,7 @@ func TestInitialiseKubeconfig(t *testing.T) { } configfile := "config3.test" - initialiseKubeconfig(&plugin.Config, "kubeconfig", configfile) + initialiseKubeconfig(&plugin.Config, "../kubeconfig", configfile) data, err := ioutil.ReadFile(configfile) if err != nil { t.Errorf("Error reading file %v", err)