From e585b4b3988a2e31b644f6716a40fbff9e0c1726 Mon Sep 17 00:00:00 2001 From: Ed King Date: Fri, 19 May 2017 11:36:45 +0100 Subject: [PATCH] Update commandrunner import path * Previously imported as "github.com/cloudfoundry/gunk/command_runner" * Now imported as "code.cloudfoundry.org/commandrunner" [#145185373] Signed-off-by: Konstantinos Karampogias --- cmd/dadoo/dadoo_linux_test.go | 2 +- guardiancmd/command_linux.go | 8 ++++---- guardiancmd/command_windows.go | 8 ++++---- imageplugin/image_plugin.go | 4 ++-- imageplugin/image_plugin_test.go | 2 +- kawasaki/iptables/global_chains_test.go | 4 ++-- kawasaki/iptables/instance_chain_creator_test.go | 4 ++-- kawasaki/iptables/iptables.go | 6 +++--- kawasaki/iptables/iptables_linux_test.go | 2 +- kawasaki/iptables/port_forwarder_test.go | 4 ++-- logging/runner.go | 4 ++-- logging/runner_test.go | 10 +++++----- netplugin/external_networker.go | 6 +++--- netplugin/external_networker_test.go | 2 +- rundmc/bundlerules/rootfs.go | 4 ++-- rundmc/bundlerules/rootfs_test.go | 4 ++-- rundmc/dadoo/execrunner.go | 6 +++--- rundmc/dadoo/execrunner_linux_test.go | 2 +- rundmc/nstar.go | 6 +++--- rundmc/nstar_test.go | 4 ++-- rundmc/runrunc/create.go | 6 +++--- rundmc/runrunc/create_test.go | 2 +- rundmc/runrunc/deleter_test.go | 4 ++-- rundmc/runrunc/kill_test.go | 4 ++-- rundmc/runrunc/log.go | 6 +++--- rundmc/runrunc/log_test.go | 4 ++-- rundmc/runrunc/runrunc.go | 6 +++--- rundmc/runrunc/state_test.go | 4 ++-- rundmc/runrunc/stats_test.go | 4 ++-- rundmc/runrunc/watch.go | 6 +++--- rundmc/runrunc/watch_test.go | 2 +- rundmc/starter.go | 6 +++--- rundmc/starter_test.go | 4 ++-- 33 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cmd/dadoo/dadoo_linux_test.go b/cmd/dadoo/dadoo_linux_test.go index 1d57061d5..0cf036409 100644 --- a/cmd/dadoo/dadoo_linux_test.go +++ b/cmd/dadoo/dadoo_linux_test.go @@ -13,11 +13,11 @@ import ( "syscall" "time" + "code.cloudfoundry.org/commandrunner/linux_command_runner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/rundmc" "code.cloudfoundry.org/guardian/rundmc/goci" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/linux_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/guardiancmd/command_linux.go b/guardiancmd/command_linux.go index 821f40102..0c6af53d6 100644 --- a/guardiancmd/command_linux.go +++ b/guardiancmd/command_linux.go @@ -5,6 +5,8 @@ import ( "path/filepath" "time" + "code.cloudfoundry.org/commandrunner" + "code.cloudfoundry.org/commandrunner/linux_command_runner" "code.cloudfoundry.org/garden-shed/distclient" quotaed_aufs "code.cloudfoundry.org/garden-shed/docker_drivers/aufs" "code.cloudfoundry.org/garden-shed/layercake" @@ -17,15 +19,13 @@ import ( "code.cloudfoundry.org/guardian/rundmc/dadoo" "code.cloudfoundry.org/guardian/rundmc/runrunc" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" - "github.com/cloudfoundry/gunk/command_runner/linux_command_runner" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/graph" "github.com/eapache/go-resiliency/retrier" "github.com/pivotal-golang/clock" ) -func commandRunner() command_runner.CommandRunner { +func commandRunner() commandrunner.CommandRunner { return linux_command_runner.New() } @@ -148,7 +148,7 @@ func (cmd *ServerCommand) wireVolumeCreator(logger lager.Logger, graphRoot strin ovenCleaner) } -func (cmd *ServerCommand) wireExecRunner(dadooPath, runcPath, runcRoot string, processIDGen runrunc.UidGenerator, commandRunner command_runner.CommandRunner, shouldCleanup bool) *dadoo.ExecRunner { +func (cmd *ServerCommand) wireExecRunner(dadooPath, runcPath, runcRoot string, processIDGen runrunc.UidGenerator, commandRunner commandrunner.CommandRunner, shouldCleanup bool) *dadoo.ExecRunner { pidFileReader := &dadoo.PidFileReader{ Clock: clock.NewClock(), diff --git a/guardiancmd/command_windows.go b/guardiancmd/command_windows.go index 9dff08047..a057c6dd5 100644 --- a/guardiancmd/command_windows.go +++ b/guardiancmd/command_windows.go @@ -1,12 +1,12 @@ package guardiancmd import ( + "code.cloudfoundry.org/commandrunner" + "code.cloudfoundry.org/commandrunner/windows_command_runner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/gardener" "code.cloudfoundry.org/guardian/rundmc/runrunc" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" - "github.com/cloudfoundry/gunk/command_runner/windows_command_runner" ) type NoopExecRunner struct{} @@ -19,7 +19,7 @@ func (n *NoopExecRunner) Attach(log lager.Logger, processID string, io garden.Pr panic("not supported on this platform") } -func commandRunner() command_runner.CommandRunner { +func commandRunner() commandrunner.CommandRunner { return windows_command_runner.New(false) } @@ -27,6 +27,6 @@ func (cmd *ServerCommand) wireVolumeCreator(logger lager.Logger, graphRoot strin return gardener.NoopVolumeCreator{} } -func (cmd *ServerCommand) wireExecRunner(dadooPath, runcPath, runcRoot string, processIDGen runrunc.UidGenerator, commandRunner command_runner.CommandRunner, shouldCleanup bool) runrunc.ExecRunner { +func (cmd *ServerCommand) wireExecRunner(dadooPath, runcPath, runcRoot string, processIDGen runrunc.UidGenerator, commandRunner commandrunner.CommandRunner, shouldCleanup bool) runrunc.ExecRunner { return &NoopExecRunner{} } diff --git a/imageplugin/image_plugin.go b/imageplugin/image_plugin.go index 1fac0ca16..01df41801 100644 --- a/imageplugin/image_plugin.go +++ b/imageplugin/image_plugin.go @@ -6,10 +6,10 @@ import ( "net/url" "os/exec" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/garden-shed/rootfs_spec" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" errorwrapper "github.com/pkg/errors" "github.com/tscolari/lagregator" ) @@ -24,7 +24,7 @@ type CommandCreator interface { type ImagePlugin struct { UnprivilegedCommandCreator CommandCreator PrivilegedCommandCreator CommandCreator - CommandRunner command_runner.CommandRunner + CommandRunner commandrunner.CommandRunner DefaultRootfs string } diff --git a/imageplugin/image_plugin_test.go b/imageplugin/image_plugin_test.go index ae79ea436..081b3495c 100644 --- a/imageplugin/image_plugin_test.go +++ b/imageplugin/image_plugin_test.go @@ -7,12 +7,12 @@ import ( "net/url" "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/garden-shed/rootfs_spec" "code.cloudfoundry.org/guardian/imageplugin" fakes "code.cloudfoundry.org/guardian/imageplugin/imagepluginfakes" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/kawasaki/iptables/global_chains_test.go b/kawasaki/iptables/global_chains_test.go index f638c2a2e..ba76bf1f1 100644 --- a/kawasaki/iptables/global_chains_test.go +++ b/kawasaki/iptables/global_chains_test.go @@ -6,10 +6,10 @@ import ( "os" "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/kawasaki/iptables" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/kawasaki/iptables/instance_chain_creator_test.go b/kawasaki/iptables/instance_chain_creator_test.go index c36512e01..15a85ac72 100644 --- a/kawasaki/iptables/instance_chain_creator_test.go +++ b/kawasaki/iptables/instance_chain_creator_test.go @@ -6,12 +6,12 @@ import ( "net" "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/guardian/kawasaki/iptables" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" diff --git a/kawasaki/iptables/iptables.go b/kawasaki/iptables/iptables.go index 1b3934a5f..c803c83e5 100644 --- a/kawasaki/iptables/iptables.go +++ b/kawasaki/iptables/iptables.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/guardian/pkg/locksmith" - "github.com/cloudfoundry/gunk/command_runner" + "code.cloudfoundry.org/commandrunner" ) const LockKey = "/var/run/garden-iptables.lock" @@ -34,7 +34,7 @@ type IPTables interface { } type IPTablesController struct { - runner command_runner.CommandRunner + runner commandrunner.CommandRunner locksmith Locksmith iptablesBinPath string iptablesRestoreBinPath string @@ -45,7 +45,7 @@ type Chains struct { Prerouting, Postrouting, Input, Forward, Default string } -func New(iptablesBinPath, iptablesRestoreBinPath string, runner command_runner.CommandRunner, locksmith Locksmith, chainPrefix string) *IPTablesController { +func New(iptablesBinPath, iptablesRestoreBinPath string, runner commandrunner.CommandRunner, locksmith Locksmith, chainPrefix string) *IPTablesController { return &IPTablesController{ runner: runner, locksmith: locksmith, diff --git a/kawasaki/iptables/iptables_linux_test.go b/kawasaki/iptables/iptables_linux_test.go index 8d2586e73..1fae768bc 100644 --- a/kawasaki/iptables/iptables_linux_test.go +++ b/kawasaki/iptables/iptables_linux_test.go @@ -6,10 +6,10 @@ import ( "os/exec" "time" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/guardian/kawasaki/iptables" fakes "code.cloudfoundry.org/guardian/kawasaki/iptables/iptablesfakes" "code.cloudfoundry.org/guardian/pkg/locksmith" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/kawasaki/iptables/port_forwarder_test.go b/kawasaki/iptables/port_forwarder_test.go index 163ccaa79..6e2666022 100644 --- a/kawasaki/iptables/port_forwarder_test.go +++ b/kawasaki/iptables/port_forwarder_test.go @@ -3,10 +3,10 @@ package iptables_test import ( "net" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/kawasaki" "code.cloudfoundry.org/guardian/kawasaki/iptables" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/logging/runner.go b/logging/runner.go index 36e30fc74..5d82400c2 100644 --- a/logging/runner.go +++ b/logging/runner.go @@ -7,12 +7,12 @@ import ( "syscall" "time" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) type Runner struct { - command_runner.CommandRunner + commandrunner.CommandRunner Logger lager.Logger } diff --git a/logging/runner_test.go b/logging/runner_test.go index 09daa391a..06c44a8d5 100644 --- a/logging/runner_test.go +++ b/logging/runner_test.go @@ -5,20 +5,20 @@ import ( "os/exec" "time" + "code.cloudfoundry.org/commandrunner" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" + "code.cloudfoundry.org/commandrunner/linux_command_runner" "code.cloudfoundry.org/guardian/logging" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" - "github.com/cloudfoundry/gunk/command_runner/linux_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) var _ = Describe("Logging Runner", func() { - var innerRunner command_runner.CommandRunner + var innerRunner commandrunner.CommandRunner var logger *lagertest.TestLogger var runner *logging.Runner diff --git a/netplugin/external_networker.go b/netplugin/external_networker.go index c0d935ccf..ead09a5f5 100644 --- a/netplugin/external_networker.go +++ b/netplugin/external_networker.go @@ -9,17 +9,17 @@ import ( "os/exec" "strings" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/gardener" "code.cloudfoundry.org/guardian/kawasaki" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) const NetworkPropertyPrefix = "network." type externalBinaryNetworker struct { - commandRunner command_runner.CommandRunner + commandRunner commandrunner.CommandRunner configStore kawasaki.ConfigStore externalIP net.IP operatorNameservers []net.IP @@ -30,7 +30,7 @@ type externalBinaryNetworker struct { } func New( - commandRunner command_runner.CommandRunner, + commandRunner commandrunner.CommandRunner, configStore kawasaki.ConfigStore, externalIP net.IP, operatorNameServers []net.IP, diff --git a/netplugin/external_networker_test.go b/netplugin/external_networker_test.go index e0aceaa5e..bd97429c9 100644 --- a/netplugin/external_networker_test.go +++ b/netplugin/external_networker_test.go @@ -7,6 +7,7 @@ import ( "net" "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/gardener" "code.cloudfoundry.org/guardian/kawasaki" @@ -15,7 +16,6 @@ import ( "code.cloudfoundry.org/guardian/properties" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/rundmc/bundlerules/rootfs.go b/rundmc/bundlerules/rootfs.go index e1b93b744..b17ad41df 100644 --- a/rundmc/bundlerules/rootfs.go +++ b/rundmc/bundlerules/rootfs.go @@ -4,9 +4,9 @@ import ( "os" "os/exec" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/guardian/gardener" "code.cloudfoundry.org/guardian/rundmc/goci" - "github.com/cloudfoundry/gunk/command_runner" ) type MkdirChowner interface { @@ -43,7 +43,7 @@ func (r RootFS) Apply(bndl goci.Bndl, spec gardener.DesiredContainerSpec) goci.B type ChrootMkdir struct { Command func(rootfsPath string, uid, gid int, mode os.FileMode, recreate bool, paths ...string) *exec.Cmd - CommandRunner command_runner.CommandRunner + CommandRunner commandrunner.CommandRunner } func (m ChrootMkdir) MkdirAs(rootfsPath string, uid, gid int, mode os.FileMode, recreate bool, paths ...string) error { diff --git a/rundmc/bundlerules/rootfs_test.go b/rundmc/bundlerules/rootfs_test.go index fcb9dd78c..a76fdfb3b 100644 --- a/rundmc/bundlerules/rootfs_test.go +++ b/rundmc/bundlerules/rootfs_test.go @@ -6,8 +6,8 @@ import ( "os/exec" "strconv" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/rundmc/dadoo/execrunner.go b/rundmc/dadoo/execrunner.go index ee2ac8849..784d5dd7b 100644 --- a/rundmc/dadoo/execrunner.go +++ b/rundmc/dadoo/execrunner.go @@ -15,10 +15,10 @@ import ( "sync" "syscall" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/rundmc/runrunc" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" "github.com/kr/logfmt" ) @@ -33,11 +33,11 @@ type ExecRunner struct { runcRoot string processIDGen runrunc.UidGenerator pidGetter PidGetter - commandRunner command_runner.CommandRunner + commandRunner commandrunner.CommandRunner cleanupProcessDirsOnWait bool } -func NewExecRunner(dadooPath, runcPath, runcRoot string, processIDGen runrunc.UidGenerator, pidGetter PidGetter, commandRunner command_runner.CommandRunner, shouldCleanup bool) *ExecRunner { +func NewExecRunner(dadooPath, runcPath, runcRoot string, processIDGen runrunc.UidGenerator, pidGetter PidGetter, commandRunner commandrunner.CommandRunner, shouldCleanup bool) *ExecRunner { return &ExecRunner{ dadooPath: dadooPath, runcPath: runcPath, diff --git a/rundmc/dadoo/execrunner_linux_test.go b/rundmc/dadoo/execrunner_linux_test.go index c9c07453b..500f979b8 100644 --- a/rundmc/dadoo/execrunner_linux_test.go +++ b/rundmc/dadoo/execrunner_linux_test.go @@ -15,6 +15,7 @@ import ( "syscall" "time" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/rundmc/dadoo" dadoofakes "code.cloudfoundry.org/guardian/rundmc/dadoo/dadoofakes" @@ -22,7 +23,6 @@ import ( fakes "code.cloudfoundry.org/guardian/rundmc/runrunc/runruncfakes" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/rundmc/nstar.go b/rundmc/nstar.go index d3791eac6..3b38466cc 100644 --- a/rundmc/nstar.go +++ b/rundmc/nstar.go @@ -9,18 +9,18 @@ import ( "path/filepath" "strings" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) type nstar struct { NstarBinPath string TarBinPath string - CommandRunner command_runner.CommandRunner + CommandRunner commandrunner.CommandRunner } -func NewNstarRunner(nstarPath, tarPath string, runner command_runner.CommandRunner) NstarRunner { +func NewNstarRunner(nstarPath, tarPath string, runner commandrunner.CommandRunner) NstarRunner { return &nstar{ NstarBinPath: nstarPath, TarBinPath: tarPath, diff --git a/rundmc/nstar_test.go b/rundmc/nstar_test.go index 000a80fdb..3d32acede 100644 --- a/rundmc/nstar_test.go +++ b/rundmc/nstar_test.go @@ -6,10 +6,10 @@ import ( "io/ioutil" "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/rundmc" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/rundmc/runrunc/create.go b/rundmc/runrunc/create.go index 2fedc624a..543070a03 100644 --- a/rundmc/runrunc/create.go +++ b/rundmc/runrunc/create.go @@ -7,9 +7,9 @@ import ( "os/exec" "path/filepath" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) type Creator struct { @@ -17,10 +17,10 @@ type Creator struct { runcRoot string newuidmapPath string newgidmapPath string - commandRunner command_runner.CommandRunner + commandRunner commandrunner.CommandRunner } -func NewCreator(runcPath, runcRoot, newuidmapPath, newgidmapPath string, commandRunner command_runner.CommandRunner) *Creator { +func NewCreator(runcPath, runcRoot, newuidmapPath, newgidmapPath string, commandRunner commandrunner.CommandRunner) *Creator { return &Creator{ runcPath, runcRoot, diff --git a/rundmc/runrunc/create_test.go b/rundmc/runrunc/create_test.go index 22b1c34c6..3782a6540 100644 --- a/rundmc/runrunc/create_test.go +++ b/rundmc/runrunc/create_test.go @@ -9,11 +9,11 @@ import ( "os/exec" "path/filepath" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/rundmc/runrunc" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/rundmc/runrunc/deleter_test.go b/rundmc/runrunc/deleter_test.go index a3914748d..0d3e52297 100644 --- a/rundmc/runrunc/deleter_test.go +++ b/rundmc/runrunc/deleter_test.go @@ -3,12 +3,12 @@ package runrunc_test import ( "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/rundmc/runrunc" fakes "code.cloudfoundry.org/guardian/rundmc/runrunc/runruncfakes" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/rundmc/runrunc/kill_test.go b/rundmc/runrunc/kill_test.go index 3318eb50f..d79fe6d2f 100644 --- a/rundmc/runrunc/kill_test.go +++ b/rundmc/runrunc/kill_test.go @@ -3,12 +3,12 @@ package runrunc_test import ( "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/rundmc/runrunc" fakes "code.cloudfoundry.org/guardian/rundmc/runrunc/runruncfakes" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/rundmc/runrunc/log.go b/rundmc/runrunc/log.go index 62d633584..1f01ff12a 100644 --- a/rundmc/runrunc/log.go +++ b/rundmc/runrunc/log.go @@ -6,8 +6,8 @@ import ( "os" "os/exec" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) //go:generate counterfeiter . RuncCmdRunner @@ -21,11 +21,11 @@ type RuncCmdRunner interface { } type logRunner struct { - runner command_runner.CommandRunner + runner commandrunner.CommandRunner generateLogFile generateLogFileFunc } -func NewLogRunner(runner command_runner.CommandRunner, logFileGenerator generateLogFileFunc) *logRunner { +func NewLogRunner(runner commandrunner.CommandRunner, logFileGenerator generateLogFileFunc) *logRunner { return &logRunner{runner, logFileGenerator} } diff --git a/rundmc/runrunc/log_test.go b/rundmc/runrunc/log_test.go index 0d145ec49..ccf69296c 100644 --- a/rundmc/runrunc/log_test.go +++ b/rundmc/runrunc/log_test.go @@ -6,11 +6,11 @@ import ( "os" "os/exec" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/rundmc/runrunc" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/rundmc/runrunc/runrunc.go b/rundmc/runrunc/runrunc.go index b53ca420a..c25befe28 100644 --- a/rundmc/runrunc/runrunc.go +++ b/rundmc/runrunc/runrunc.go @@ -3,7 +3,7 @@ package runrunc import ( "os/exec" - "github.com/cloudfoundry/gunk/command_runner" + "code.cloudfoundry.org/commandrunner" ) const DefaultRootPath = "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" @@ -11,7 +11,7 @@ const DefaultPath = "PATH=/usr/local/bin:/usr/bin:/bin" // da doo type RunRunc struct { - commandRunner command_runner.CommandRunner + commandRunner commandrunner.CommandRunner runc RuncBinary *Execer @@ -33,7 +33,7 @@ type RuncBinary interface { DeleteCommand(id, logFile string) *exec.Cmd } -func New(runner command_runner.CommandRunner, runcCmdRunner RuncCmdRunner, runc RuncBinary, dadooPath, runcPath, runcRoot, newuidmapPath, newgidmapPath string, execPreparer ExecPreparer, execRunner ExecRunner) *RunRunc { +func New(runner commandrunner.CommandRunner, runcCmdRunner RuncCmdRunner, runc RuncBinary, dadooPath, runcPath, runcRoot, newuidmapPath, newgidmapPath string, execPreparer ExecPreparer, execRunner ExecRunner) *RunRunc { return &RunRunc{ Creator: NewCreator(runcPath, runcRoot, newuidmapPath, newgidmapPath, runner), Execer: NewExecer(execPreparer, execRunner), diff --git a/rundmc/runrunc/state_test.go b/rundmc/runrunc/state_test.go index 253fad94d..82493ad65 100644 --- a/rundmc/runrunc/state_test.go +++ b/rundmc/runrunc/state_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" ) var _ = Describe("State", func() { diff --git a/rundmc/runrunc/stats_test.go b/rundmc/runrunc/stats_test.go index dba80e8c0..acef5c2e5 100644 --- a/rundmc/runrunc/stats_test.go +++ b/rundmc/runrunc/stats_test.go @@ -9,11 +9,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/garden" "code.cloudfoundry.org/guardian/rundmc/runrunc" fakes "code.cloudfoundry.org/guardian/rundmc/runrunc/runruncfakes" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" ) var _ = Describe("Stats", func() { diff --git a/rundmc/runrunc/watch.go b/rundmc/runrunc/watch.go index e99b07337..f9fc91ae7 100644 --- a/rundmc/runrunc/watch.go +++ b/rundmc/runrunc/watch.go @@ -5,8 +5,8 @@ import ( "fmt" "io" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) //go:generate counterfeiter . EventsNotifier @@ -15,11 +15,11 @@ type EventsNotifier interface { } type OomWatcher struct { - commandRunner command_runner.CommandRunner + commandRunner commandrunner.CommandRunner runc RuncBinary } -func NewOomWatcher(runner command_runner.CommandRunner, runc RuncBinary) *OomWatcher { +func NewOomWatcher(runner commandrunner.CommandRunner, runc RuncBinary) *OomWatcher { return &OomWatcher{runner, runc} } diff --git a/rundmc/runrunc/watch_test.go b/rundmc/runrunc/watch_test.go index 8dfb30fdb..f8e54df30 100644 --- a/rundmc/runrunc/watch_test.go +++ b/rundmc/runrunc/watch_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "code.cloudfoundry.org/commandrunner/fake_command_runner" "code.cloudfoundry.org/guardian/rundmc/runrunc" fakes "code.cloudfoundry.org/guardian/rundmc/runrunc/runruncfakes" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" ) var _ = Describe("Watching for Events", func() { diff --git a/rundmc/starter.go b/rundmc/starter.go index 1346ed136..a11dd3986 100644 --- a/rundmc/starter.go +++ b/rundmc/starter.go @@ -9,9 +9,9 @@ import ( "path" "strings" + "code.cloudfoundry.org/commandrunner" "code.cloudfoundry.org/guardian/logging" "code.cloudfoundry.org/lager" - "github.com/cloudfoundry/gunk/command_runner" ) type Starter struct { @@ -28,7 +28,7 @@ func (err CgroupsFormatError) Error() string { return fmt.Sprintf("unknown /proc/cgroups format: %s", err.Content) } -func NewStarter(logger lager.Logger, procCgroupReader io.ReadCloser, procSelfCgroupReader io.ReadCloser, cgroupMountpoint string, runner command_runner.CommandRunner) *Starter { +func NewStarter(logger lager.Logger, procCgroupReader io.ReadCloser, procSelfCgroupReader io.ReadCloser, cgroupMountpoint string, runner commandrunner.CommandRunner) *Starter { return &Starter{ &CgroupStarter{ CgroupPath: cgroupMountpoint, @@ -42,7 +42,7 @@ func NewStarter(logger lager.Logger, procCgroupReader io.ReadCloser, procSelfCgr type CgroupStarter struct { CgroupPath string - CommandRunner command_runner.CommandRunner + CommandRunner commandrunner.CommandRunner ProcCgroups io.ReadCloser ProcSelfCgroups io.ReadCloser diff --git a/rundmc/starter_test.go b/rundmc/starter_test.go index 18601a43c..777cd7a0f 100644 --- a/rundmc/starter_test.go +++ b/rundmc/starter_test.go @@ -8,11 +8,11 @@ import ( "os/exec" "path" + "code.cloudfoundry.org/commandrunner/fake_command_runner" + . "code.cloudfoundry.org/commandrunner/fake_command_runner/matchers" "code.cloudfoundry.org/guardian/rundmc" "code.cloudfoundry.org/lager" "code.cloudfoundry.org/lager/lagertest" - "github.com/cloudfoundry/gunk/command_runner/fake_command_runner" - . "github.com/cloudfoundry/gunk/command_runner/fake_command_runner/matchers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" )