From 812fa4be9eab8882055874dd7e2a645845e0cf76 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Thu, 14 Sep 2023 18:04:47 +0100 Subject: [PATCH] Update to go-execute v2 Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- cmd/ready.go | 4 ++-- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- pkg/operator/exec_operator.go | 6 ++++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cmd/ready.go b/cmd/ready.go index 886325eb..9e12d595 100644 --- a/cmd/ready.go +++ b/cmd/ready.go @@ -6,7 +6,7 @@ import ( "strings" "time" - execute "github.com/alexellis/go-execute/pkg/v1" + execute "github.com/alexellis/go-execute/v2" "github.com/alexellis/k3sup/pkg" "github.com/spf13/cobra" ) @@ -74,7 +74,7 @@ func MakeReady() *cobra.Command { StreamStdio: false, } - res, err := task.Execute() + res, err := task.Execute(cmd.Context()) if err != nil { return err } diff --git a/go.mod b/go.mod index f0f93a78..5fe1a153 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,16 @@ module github.com/alexellis/k3sup go 1.20 require ( - github.com/alexellis/go-execute v0.6.0 + github.com/alexellis/go-execute/v2 v2.0.0 github.com/mitchellh/go-homedir v1.1.0 github.com/morikuni/aec v1.0.0 github.com/spf13/cobra v1.7.0 - golang.org/x/crypto v0.12.0 + golang.org/x/crypto v0.13.0 ) require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/term v0.12.0 // indirect ) diff --git a/go.sum b/go.sum index b983ad73..1a398de5 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/alexellis/go-execute v0.6.0 h1:FVGoudJnWSObwf9qmehbvVuvhK6g1UpKOCBjS+OUXEA= -github.com/alexellis/go-execute v0.6.0/go.mod h1:nlg2F6XdYydUm1xXQMMiuibQCV1mveybBkNWfdNznjk= +github.com/alexellis/go-execute/v2 v2.0.0 h1:e2fB9kZcPG0yg65XHL1/t6efcCUdt32AMbr/mv7A2tc= +github.com/alexellis/go-execute/v2 v2.0.0/go.mod h1:FMdRnUTiFAmYXcv23txrp3VYZfLo24nMpiIneWgKHTQ= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= @@ -12,11 +12,11 @@ github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/operator/exec_operator.go b/pkg/operator/exec_operator.go index 06cbef09..3885b398 100644 --- a/pkg/operator/exec_operator.go +++ b/pkg/operator/exec_operator.go @@ -1,7 +1,9 @@ package ssh import ( - goexecute "github.com/alexellis/go-execute/pkg/v1" + "context" + + goexecute "github.com/alexellis/go-execute/v2" ) // ExecOperator executes commands on the local machine directly @@ -15,7 +17,7 @@ func (ex ExecOperator) ExecuteStdio(command string, stream bool) (CommandRes, er StreamStdio: stream, } - res, err := task.Execute() + res, err := task.Execute(context.Background()) if err != nil { return CommandRes{}, err }