From af38e0bcb69a2fdb4633fcd3f674395f177853c3 Mon Sep 17 00:00:00 2001 From: Bill Farner Date: Thu, 1 Dec 2016 11:30:11 -0800 Subject: [PATCH 1/2] Move all example code under pkg/example Signed-off-by: Bill Farner --- pkg/{plugin => example}/flavor/swarm/flavor.go | 2 +- pkg/{plugin => example}/flavor/swarm/flavor_test.go | 2 +- pkg/example/flavor/swarm/main.go | 3 +-- pkg/{plugin => example}/flavor/vanilla/flavor.go | 2 +- pkg/example/flavor/vanilla/main.go | 3 +-- pkg/{plugin => example}/flavor/zookeeper/flavor.go | 2 +- pkg/example/flavor/zookeeper/main.go | 3 +-- 7 files changed, 7 insertions(+), 10 deletions(-) rename pkg/{plugin => example}/flavor/swarm/flavor.go (99%) rename pkg/{plugin => example}/flavor/swarm/flavor_test.go (99%) rename pkg/{plugin => example}/flavor/vanilla/flavor.go (99%) rename pkg/{plugin => example}/flavor/zookeeper/flavor.go (99%) diff --git a/pkg/plugin/flavor/swarm/flavor.go b/pkg/example/flavor/swarm/flavor.go similarity index 99% rename from pkg/plugin/flavor/swarm/flavor.go rename to pkg/example/flavor/swarm/flavor.go index 6a1d7d5dc..941ffe81a 100644 --- a/pkg/plugin/flavor/swarm/flavor.go +++ b/pkg/example/flavor/swarm/flavor.go @@ -1,4 +1,4 @@ -package swarm +package main import ( "bytes" diff --git a/pkg/plugin/flavor/swarm/flavor_test.go b/pkg/example/flavor/swarm/flavor_test.go similarity index 99% rename from pkg/plugin/flavor/swarm/flavor_test.go rename to pkg/example/flavor/swarm/flavor_test.go index 11b6c6a7c..39f830c28 100644 --- a/pkg/plugin/flavor/swarm/flavor_test.go +++ b/pkg/example/flavor/swarm/flavor_test.go @@ -1,4 +1,4 @@ -package swarm +package main import ( "encoding/json" diff --git a/pkg/example/flavor/swarm/main.go b/pkg/example/flavor/swarm/main.go index 5cc446832..efb7f4a15 100644 --- a/pkg/example/flavor/swarm/main.go +++ b/pkg/example/flavor/swarm/main.go @@ -6,7 +6,6 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-connections/tlsconfig" "github.com/docker/infrakit/pkg/cli" - "github.com/docker/infrakit/pkg/plugin/flavor/swarm" flavor_plugin "github.com/docker/infrakit/pkg/rpc/flavor" "github.com/docker/infrakit/pkg/util/docker/1.24" "github.com/spf13/cobra" @@ -40,7 +39,7 @@ func main() { return err } - cli.RunPlugin(*name, flavor_plugin.PluginServer(swarm.NewSwarmFlavor(dockerClient))) + cli.RunPlugin(*name, flavor_plugin.PluginServer(NewSwarmFlavor(dockerClient))) return nil } diff --git a/pkg/plugin/flavor/vanilla/flavor.go b/pkg/example/flavor/vanilla/flavor.go similarity index 99% rename from pkg/plugin/flavor/vanilla/flavor.go rename to pkg/example/flavor/vanilla/flavor.go index 9fc94fdc4..917987602 100644 --- a/pkg/plugin/flavor/vanilla/flavor.go +++ b/pkg/example/flavor/vanilla/flavor.go @@ -1,4 +1,4 @@ -package vanilla +package main import ( "encoding/json" diff --git a/pkg/example/flavor/vanilla/main.go b/pkg/example/flavor/vanilla/main.go index 31e53c0ad..307f74940 100644 --- a/pkg/example/flavor/vanilla/main.go +++ b/pkg/example/flavor/vanilla/main.go @@ -5,7 +5,6 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/infrakit/pkg/cli" - "github.com/docker/infrakit/pkg/plugin/flavor/vanilla" flavor_plugin "github.com/docker/infrakit/pkg/rpc/flavor" "github.com/spf13/cobra" ) @@ -20,7 +19,7 @@ func main() { name := cmd.Flags().String("name", "flavor-vanilla", "Plugin name to advertise for discovery") cmd.Run = func(c *cobra.Command, args []string) { cli.SetLogLevel(*logLevel) - cli.RunPlugin(*name, flavor_plugin.PluginServer(vanilla.NewPlugin())) + cli.RunPlugin(*name, flavor_plugin.PluginServer(NewPlugin())) } cmd.AddCommand(cli.VersionCommand()) diff --git a/pkg/plugin/flavor/zookeeper/flavor.go b/pkg/example/flavor/zookeeper/flavor.go similarity index 99% rename from pkg/plugin/flavor/zookeeper/flavor.go rename to pkg/example/flavor/zookeeper/flavor.go index eb41e5637..669993794 100644 --- a/pkg/plugin/flavor/zookeeper/flavor.go +++ b/pkg/example/flavor/zookeeper/flavor.go @@ -1,4 +1,4 @@ -package zookeeper +package main import ( "bytes" diff --git a/pkg/example/flavor/zookeeper/main.go b/pkg/example/flavor/zookeeper/main.go index 1ef762ebc..04244b6be 100644 --- a/pkg/example/flavor/zookeeper/main.go +++ b/pkg/example/flavor/zookeeper/main.go @@ -5,7 +5,6 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/infrakit/pkg/cli" - zk "github.com/docker/infrakit/pkg/plugin/flavor/zookeeper" flavor_plugin "github.com/docker/infrakit/pkg/rpc/flavor" "github.com/spf13/cobra" ) @@ -20,7 +19,7 @@ func main() { logLevel := cmd.Flags().Int("log", cli.DefaultLogLevel, "Logging level. 0 is least verbose. Max is 5") cmd.Run = func(c *cobra.Command, args []string) { cli.SetLogLevel(*logLevel) - cli.RunPlugin(*name, flavor_plugin.PluginServer(zk.NewPlugin())) + cli.RunPlugin(*name, flavor_plugin.PluginServer(NewPlugin())) } cmd.AddCommand(cli.VersionCommand()) From 8f5bb54b40753d7e272c3daeb45e4fe653ef2480 Mon Sep 17 00:00:00 2001 From: Bill Farner Date: Thu, 1 Dec 2016 11:55:11 -0800 Subject: [PATCH 2/2] Also move vagrant code Signed-off-by: Bill Farner --- .../instance/vagrant/instance.go | 15 +-------------- pkg/example/instance/vagrant/main.go | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 17 deletions(-) rename pkg/{plugin => example}/instance/vagrant/instance.go (91%) diff --git a/pkg/plugin/instance/vagrant/instance.go b/pkg/example/instance/vagrant/instance.go similarity index 91% rename from pkg/plugin/instance/vagrant/instance.go rename to pkg/example/instance/vagrant/instance.go index ae4aa044e..06f83d778 100644 --- a/pkg/plugin/instance/vagrant/instance.go +++ b/pkg/example/instance/vagrant/instance.go @@ -1,4 +1,4 @@ -package vagrant +package main import ( "bytes" @@ -14,19 +14,6 @@ import ( "github.com/docker/infrakit/pkg/spi/instance" ) -// VagrantFile is the minimum definition of the vagrant file -const VagrantFile = ` -Vagrant.configure("2") do |config| - config.vm.box = "{{.Properties.Box}}" - config.vm.hostname = "infrakit.box" - config.vm.network "private_network"{{.NetworkOptions}} - config.vm.provision :shell, path: "boot.sh" - config.vm.provider :virtualbox do |vb| - vb.memory = {{.Properties.Memory}} - vb.cpus = {{.Properties.CPUs}} - end -end` - // NewVagrantPlugin creates an instance plugin for vagrant. func NewVagrantPlugin(dir string, template *template.Template) instance.Plugin { return &vagrantPlugin{VagrantfilesDir: dir, VagrantTmpl: template} diff --git a/pkg/example/instance/vagrant/main.go b/pkg/example/instance/vagrant/main.go index a504a5b2d..66a16169c 100644 --- a/pkg/example/instance/vagrant/main.go +++ b/pkg/example/instance/vagrant/main.go @@ -6,7 +6,6 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/infrakit/pkg/cli" - "github.com/docker/infrakit/pkg/plugin/instance/vagrant" instance_plugin "github.com/docker/infrakit/pkg/rpc/instance" "github.com/spf13/cobra" ) @@ -30,7 +29,7 @@ func main() { var templ *template.Template if *templFile == "" { - templ = template.Must(template.New("").Parse(vagrant.VagrantFile)) + templ = template.Must(template.New("").Parse(VagrantFile)) } else { var err error templ, err = template.ParseFiles() @@ -40,7 +39,7 @@ func main() { } cli.SetLogLevel(*logLevel) - cli.RunPlugin(*name, instance_plugin.PluginServer(vagrant.NewVagrantPlugin(*dir, templ))) + cli.RunPlugin(*name, instance_plugin.PluginServer(NewVagrantPlugin(*dir, templ))) return nil } @@ -51,3 +50,16 @@ func main() { os.Exit(1) } } + +// VagrantFile is the minimum definition of the vagrant file +const VagrantFile = ` +Vagrant.configure("2") do |config| + config.vm.box = "{{.Properties.Box}}" + config.vm.hostname = "infrakit.box" + config.vm.network "private_network"{{.NetworkOptions}} + config.vm.provision :shell, path: "boot.sh" + config.vm.provider :virtualbox do |vb| + vb.memory = {{.Properties.Memory}} + vb.cpus = {{.Properties.CPUs}} + end +end`