From f2a71fd0d906e0fd795feecfc6aac37f02834c03 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 13 Jan 2022 12:22:49 -0600 Subject: [PATCH] deps: pty has new home github.com/kr/pty was moved to github.com/creack/pty Swap this dependency so we can upgrade to the latest version and no longer need a replace directive. --- .changelog/11855.txt | 3 +++ command/meta_test.go | 2 +- drivers/shared/executor/executor.go | 2 +- drivers/shared/executor/pty_unix.go | 2 +- go.mod | 3 +-- go.sum | 5 +++-- 6 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .changelog/11855.txt diff --git a/.changelog/11855.txt b/.changelog/11855.txt new file mode 100644 index 000000000..3f39bc79d --- /dev/null +++ b/.changelog/11855.txt @@ -0,0 +1,3 @@ +```release-note:improvement +deps: Upgrade kr/pty to creack/pty v1.1.5 +``` diff --git a/command/meta_test.go b/command/meta_test.go index e8ba4209a..7ebce9036 100644 --- a/command/meta_test.go +++ b/command/meta_test.go @@ -7,7 +7,7 @@ import ( "sort" "testing" - "github.com/kr/pty" + "github.com/creack/pty" "github.com/mitchellh/cli" "github.com/stretchr/testify/require" ) diff --git a/drivers/shared/executor/executor.go b/drivers/shared/executor/executor.go index e4b5880a9..5026730b6 100644 --- a/drivers/shared/executor/executor.go +++ b/drivers/shared/executor/executor.go @@ -14,6 +14,7 @@ import ( "time" "github.com/armon/circbuf" + "github.com/creack/pty" "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" @@ -22,7 +23,6 @@ import ( "github.com/hashicorp/nomad/client/stats" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/plugins/drivers" - "github.com/kr/pty" "github.com/syndtr/gocapability/capability" shelpers "github.com/hashicorp/nomad/helper/stats" diff --git a/drivers/shared/executor/pty_unix.go b/drivers/shared/executor/pty_unix.go index d940d9e04..2df23e3d8 100644 --- a/drivers/shared/executor/pty_unix.go +++ b/drivers/shared/executor/pty_unix.go @@ -10,7 +10,7 @@ import ( "strings" "syscall" - "github.com/kr/pty" + "github.com/creack/pty" "golang.org/x/sys/unix" ) diff --git a/go.mod b/go.mod index 980101f08..db596bcd9 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ replace ( github.com/apparentlymart/go-textseg/v12 => github.com/apparentlymart/go-textseg/v12 v12.0.0 github.com/hashicorp/go-discover => github.com/hashicorp/go-discover v0.0.0-20210818145131-c573d69da192 github.com/hashicorp/hcl => github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee - github.com/kr/pty => github.com/kr/pty v1.1.5 ) // Nomad is built using the current source of the API module @@ -27,6 +26,7 @@ require ( github.com/containernetworking/plugins v0.9.1 github.com/coreos/go-iptables v0.5.0 github.com/coreos/go-semver v0.3.0 + github.com/creack/pty v1.1.17 github.com/docker/cli v20.10.3-0.20220113150236-6e2838e18645+incompatible github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v20.10.12+incompatible @@ -83,7 +83,6 @@ require ( github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745 github.com/kr/pretty v0.3.0 - github.com/kr/pty v1.1.5 github.com/kr/text v0.2.0 github.com/mattn/go-colorable v0.1.9 github.com/miekg/dns v1.1.26 diff --git a/go.sum b/go.sum index e0738ae83..8abf200ce 100644 --- a/go.sum +++ b/go.sum @@ -357,8 +357,9 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= +github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1 h1:dCqRswe3ZAwkQWdvFLwRqmJCpGP3DWb7bFogdqY3+QU= github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= @@ -841,7 +842,7 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= -github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=