Skip to content

Commit

Permalink
Update commandrunner import path
Browse files Browse the repository at this point in the history 
* Previously imported as "github.com/cloudfoundry/gunk/command_runner"
* Now imported as "code.cloudfoundry.org/commandrunner"

[#145185373]

Signed-off-by: Konstantinos Karampogias <[email protected]>
  • Loading branch information
@teddyking @karampok
teddyking authored and karampok committed May 19, 2017
1 parent 0e8654a commit e585b4b
Show file tree
Hide file tree
Showing 33 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion cmd/dadoo/dadoo_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions guardiancmd/command_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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()
}

Expand Down Expand Up @@ -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(),
Expand Down
8 changes: 4 additions & 4 deletions guardiancmd/command_windows.go
View file
Original file line number Diff line number Diff line change
@@ -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{}
Expand All @@ -19,14 +19,14 @@ 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)
}

func (cmd *ServerCommand) wireVolumeCreator(logger lager.Logger, graphRoot string, insecureRegistries, persistentImages []string) gardener.VolumeCreator {
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{}
}
4 changes: 2 additions & 2 deletions imageplugin/image_plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -24,7 +24,7 @@ type CommandCreator interface {
type ImagePlugin struct {
UnprivilegedCommandCreator CommandCreator
PrivilegedCommandCreator CommandCreator
CommandRunner command_runner.CommandRunner
CommandRunner commandrunner.CommandRunner
DefaultRootfs string
}

Expand Down
2 changes: 1 addition & 1 deletion imageplugin/image_plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions kawasaki/iptables/global_chains_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions kawasaki/iptables/instance_chain_creator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions kawasaki/iptables/iptables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -34,7 +34,7 @@ type IPTables interface {
}

type IPTablesController struct {
runner command_runner.CommandRunner
runner commandrunner.CommandRunner
locksmith Locksmith
iptablesBinPath string
iptablesRestoreBinPath string
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion kawasaki/iptables/iptables_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions kawasaki/iptables/port_forwarder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions logging/runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
10 changes: 5 additions & 5 deletions logging/runner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions netplugin/external_networker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion netplugin/external_networker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions rundmc/bundlerules/rootfs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions rundmc/bundlerules/rootfs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions rundmc/dadoo/execrunner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion rundmc/dadoo/execrunner_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ 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"
"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/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down
6 changes: 3 additions & 3 deletions rundmc/nstar.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions rundmc/nstar_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit e585b4b

Please sign in to comment.