From fc177e9762edd65a0e20f791b65518d0b600e98f Mon Sep 17 00:00:00 2001 From: Luiz Felipe Stangarlin Date: Sat, 29 Apr 2023 15:30:16 -0700 Subject: [PATCH 1/2] update deps and mod tidy --- go.mod | 48 ++++++++------- go.sum | 2 - vendor/github.com/hectane/go-acl/go.mod | 5 -- vendor/github.com/hectane/go-acl/go.sum | 2 - .../go-windows-terminal-sequences/go.mod | 1 - vendor/github.com/moby/term/go.mod | 13 ----- vendor/github.com/moby/term/go.sum | 33 ----------- vendor/github.com/sirupsen/logrus/go.mod | 10 ---- vendor/github.com/sirupsen/logrus/go.sum | 16 ----- vendor/modules.txt | 58 +++++++++++++++++++ 10 files changed, 86 insertions(+), 102 deletions(-) delete mode 100644 vendor/github.com/hectane/go-acl/go.mod delete mode 100644 vendor/github.com/hectane/go-acl/go.sum delete mode 100644 vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod delete mode 100644 vendor/github.com/moby/term/go.mod delete mode 100644 vendor/github.com/moby/term/go.sum delete mode 100644 vendor/github.com/sirupsen/logrus/go.mod delete mode 100644 vendor/github.com/sirupsen/logrus/go.sum diff --git a/go.mod b/go.mod index ae7a48a461..df1297c88e 100644 --- a/go.mod +++ b/go.mod @@ -1,41 +1,22 @@ module github.com/docker/machine -go 1.13 +go 1.20 require ( github.com/Azure/azure-sdk-for-go v5.0.0-beta+incompatible github.com/Azure/go-autorest v7.2.1+incompatible - github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/aws/aws-sdk-go v1.4.10 - github.com/bitly/go-simplejson v0.5.0 // indirect - github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/bugsnag/bugsnag-go v0.0.0-20151120182711-02e952891c52 - github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b // indirect - github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f // indirect - github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87 // indirect github.com/codegangsta/cli v0.0.0-20151120215642-0302d3914d2a - github.com/dgrijalva/jwt-go v0.0.0-20160831183534-24c63f56522a // indirect github.com/digitalocean/godo v0.0.0-20170317202744-d59ed2fe842b - github.com/docker/docker v0.0.0-20180621001606-093424bec097 // indirect - github.com/docker/go-units v0.0.0-20151230175859-0bbddae09c5a // indirect github.com/exoscale/egoscale v0.9.23 - github.com/go-ini/ini v0.0.0-20151124192405-03e0e7d51a13 // indirect - github.com/golang/protobuf v0.0.0-20160221214941-3c84672111d9 // indirect - github.com/google/go-querystring v0.0.0-20140804062624-30f7a39f4a21 // indirect - github.com/gorilla/mux v1.8.0 // indirect github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 - github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 // indirect - github.com/jmespath/go-jmespath v0.0.0-20151117175822-3433f3ea46d9 // indirect - github.com/juju/loggo v1.0.0 // indirect - github.com/mitchellh/mapstructure v0.0.0-20140721150620-740c764bc614 // indirect github.com/moby/term v0.0.0-20200416134343-063f2cd0b49d github.com/rackspace/gophercloud v0.0.0-20150408191457-ce0f487f6747 github.com/samalba/dockerclient v0.0.0-20151231000007-f661dd4754aa github.com/skarademir/naturalsort v0.0.0-20150715044055-69a5d87bef62 - github.com/smartystreets/goconvey v1.7.2 // indirect github.com/stretchr/testify v1.2.2 - github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9 // indirect github.com/vmware/govcloudair v0.0.2 github.com/vmware/govmomi v0.6.2 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 @@ -43,6 +24,33 @@ require ( golang.org/x/oauth2 v0.0.0-20151117210313-442624c9ec92 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 google.golang.org/api v0.0.0-20180213000552-87a2f5c77b36 +) + +require ( + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/bitly/go-simplejson v0.5.0 // indirect + github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b // indirect + github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f // indirect + github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgrijalva/jwt-go v0.0.0-20160831183534-24c63f56522a // indirect + github.com/docker/docker v0.0.0-20180621001606-093424bec097 // indirect + github.com/docker/go-units v0.0.0-20151230175859-0bbddae09c5a // indirect + github.com/go-ini/ini v0.0.0-20151124192405-03e0e7d51a13 // indirect + github.com/golang/protobuf v0.0.0-20160221214941-3c84672111d9 // indirect + github.com/google/go-querystring v0.0.0-20140804062624-30f7a39f4a21 // indirect + github.com/gorilla/mux v1.8.0 // indirect + github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 // indirect + github.com/jmespath/go-jmespath v0.0.0-20151117175822-3433f3ea46d9 // indirect + github.com/juju/loggo v1.0.0 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect + github.com/mitchellh/mapstructure v0.0.0-20140721150620-740c764bc614 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/sirupsen/logrus v1.4.2 // indirect + github.com/smartystreets/goconvey v1.7.2 // indirect + github.com/stretchr/objx v0.1.1 // indirect + github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9 // indirect google.golang.org/appengine v0.0.0-20160205025855-6a436539be38 // indirect google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/go.sum b/go.sum index 04365a7f6b..2933f6b21e 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,6 @@ github.com/aws/aws-sdk-go v1.4.10 h1:edjsaZGVeOBOS5HBzvag8lfLZMFlQMNC+yCvM5roBro github.com/aws/aws-sdk-go v1.4.10/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bugsnag/bugsnag-go v0.0.0-20151120182711-02e952891c52 h1:p8KmEtec4AQdLNtpfFlTMQCmO2ynjlPf93rUEuFqhkU= github.com/bugsnag/bugsnag-go v0.0.0-20151120182711-02e952891c52/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= diff --git a/vendor/github.com/hectane/go-acl/go.mod b/vendor/github.com/hectane/go-acl/go.mod deleted file mode 100644 index f47398bf8f..0000000000 --- a/vendor/github.com/hectane/go-acl/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/hectane/go-acl - -go 1.12 - -require golang.org/x/sys v0.0.0-20190529164535-6a60838ec259 diff --git a/vendor/github.com/hectane/go-acl/go.sum b/vendor/github.com/hectane/go-acl/go.sum deleted file mode 100644 index 456e8b3b4f..0000000000 --- a/vendor/github.com/hectane/go-acl/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -golang.org/x/sys v0.0.0-20190529164535-6a60838ec259 h1:so6Hr/LodwSZ5UQDu/7PmQiDeS112WwtLvU3lpSPZTU= -golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod b/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod deleted file mode 100644 index 716c613125..0000000000 --- a/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/konsorten/go-windows-terminal-sequences diff --git a/vendor/github.com/moby/term/go.mod b/vendor/github.com/moby/term/go.mod deleted file mode 100644 index 9f23ce0d5e..0000000000 --- a/vendor/github.com/moby/term/go.mod +++ /dev/null @@ -1,13 +0,0 @@ -module github.com/moby/term - -go 1.13 - -require ( - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 - github.com/google/go-cmp v0.3.1 - github.com/pkg/errors v0.9.1 // indirect - github.com/sirupsen/logrus v1.4.2 - golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 - gotest.tools v2.2.0+incompatible - gotest.tools/v3 v3.0.2 // indirect -) diff --git a/vendor/github.com/moby/term/go.sum b/vendor/github.com/moby/term/go.sum deleted file mode 100644 index 413bf36668..0000000000 --- a/vendor/github.com/moby/term/go.sum +++ /dev/null @@ -1,33 +0,0 @@ -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= diff --git a/vendor/github.com/sirupsen/logrus/go.mod b/vendor/github.com/sirupsen/logrus/go.mod deleted file mode 100644 index 12fdf98984..0000000000 --- a/vendor/github.com/sirupsen/logrus/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module github.com/sirupsen/logrus - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/konsorten/go-windows-terminal-sequences v1.0.1 - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.1.1 // indirect - github.com/stretchr/testify v1.2.2 - golang.org/x/sys v0.0.0-20190422165155-953cdadca894 -) diff --git a/vendor/github.com/sirupsen/logrus/go.sum b/vendor/github.com/sirupsen/logrus/go.sum deleted file mode 100644 index 596c318b9f..0000000000 --- a/vendor/github.com/sirupsen/logrus/go.sum +++ /dev/null @@ -1,16 +0,0 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs= -github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/vendor/modules.txt b/vendor/modules.txt index db96b56631..a3c2e9e0f3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,5 @@ # github.com/Azure/azure-sdk-for-go v5.0.0-beta+incompatible +## explicit github.com/Azure/azure-sdk-for-go/arm/compute github.com/Azure/azure-sdk-for-go/arm/network github.com/Azure/azure-sdk-for-go/arm/resources/resources @@ -6,15 +7,20 @@ github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions github.com/Azure/azure-sdk-for-go/arm/storage github.com/Azure/azure-sdk-for-go/storage # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 +## explicit github.com/Azure/go-ansiterm github.com/Azure/go-ansiterm/winterm # github.com/Azure/go-autorest v7.2.1+incompatible +## explicit github.com/Azure/go-autorest/autorest github.com/Azure/go-autorest/autorest/azure github.com/Azure/go-autorest/autorest/date github.com/Azure/go-autorest/autorest/to github.com/Azure/go-autorest/autorest/validation +# github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 +## explicit # github.com/aws/aws-sdk-go v1.4.10 +## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr github.com/aws/aws-sdk-go/aws/awsutil @@ -40,52 +46,82 @@ github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil github.com/aws/aws-sdk-go/private/waiter github.com/aws/aws-sdk-go/service/ec2 github.com/aws/aws-sdk-go/service/sts +# github.com/bitly/go-simplejson v0.5.0 +## explicit # github.com/bugsnag/bugsnag-go v0.0.0-20151120182711-02e952891c52 +## explicit github.com/bugsnag/bugsnag-go github.com/bugsnag/bugsnag-go/errors # github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b +## explicit github.com/bugsnag/osext # github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f +## explicit github.com/bugsnag/panicwrap # github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87 +## explicit github.com/cenkalti/backoff # github.com/codegangsta/cli v0.0.0-20151120215642-0302d3914d2a +## explicit github.com/codegangsta/cli # github.com/davecgh/go-spew v1.1.1 +## explicit github.com/davecgh/go-spew/spew # github.com/dgrijalva/jwt-go v0.0.0-20160831183534-24c63f56522a +## explicit github.com/dgrijalva/jwt-go # github.com/digitalocean/godo v0.0.0-20170317202744-d59ed2fe842b +## explicit github.com/digitalocean/godo +# github.com/docker/docker v0.0.0-20180621001606-093424bec097 +## explicit # github.com/docker/go-units v0.0.0-20151230175859-0bbddae09c5a +## explicit github.com/docker/go-units # github.com/exoscale/egoscale v0.9.23 +## explicit github.com/exoscale/egoscale # github.com/go-ini/ini v0.0.0-20151124192405-03e0e7d51a13 +## explicit github.com/go-ini/ini # github.com/golang/protobuf v0.0.0-20160221214941-3c84672111d9 +## explicit github.com/golang/protobuf/proto # github.com/google/go-querystring v0.0.0-20140804062624-30f7a39f4a21 +## explicit github.com/google/go-querystring/query +# github.com/gorilla/mux v1.8.0 +## explicit; go 1.12 # github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 +## explicit; go 1.12 github.com/hectane/go-acl github.com/hectane/go-acl/api # github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 +## explicit github.com/intel-go/cpuid # github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 +## explicit github.com/jinzhu/copier # github.com/jmespath/go-jmespath v0.0.0-20151117175822-3433f3ea46d9 +## explicit github.com/jmespath/go-jmespath +# github.com/juju/loggo v1.0.0 +## explicit; go 1.14 # github.com/konsorten/go-windows-terminal-sequences v1.0.1 +## explicit github.com/konsorten/go-windows-terminal-sequences # github.com/mitchellh/mapstructure v0.0.0-20140721150620-740c764bc614 +## explicit github.com/mitchellh/mapstructure # github.com/moby/term v0.0.0-20200416134343-063f2cd0b49d +## explicit; go 1.13 github.com/moby/term github.com/moby/term/windows # github.com/pmezard/go-difflib v1.0.0 +## explicit github.com/pmezard/go-difflib/difflib # github.com/rackspace/gophercloud v0.0.0-20150408191457-ce0f487f6747 +## explicit github.com/rackspace/gophercloud github.com/rackspace/gophercloud/openstack github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip @@ -107,22 +143,32 @@ github.com/rackspace/gophercloud/rackspace/identity/v2/tokens github.com/rackspace/gophercloud/testhelper github.com/rackspace/gophercloud/testhelper/client # github.com/samalba/dockerclient v0.0.0-20151231000007-f661dd4754aa => github.com/sayboras/dockerclient v1.0.0 +## explicit github.com/samalba/dockerclient # github.com/sirupsen/logrus v1.4.2 +## explicit github.com/sirupsen/logrus # github.com/skarademir/naturalsort v0.0.0-20150715044055-69a5d87bef62 +## explicit github.com/skarademir/naturalsort +# github.com/smartystreets/goconvey v1.7.2 +## explicit; go 1.16 # github.com/stretchr/objx v0.1.1 +## explicit github.com/stretchr/objx # github.com/stretchr/testify v1.2.2 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/mock # github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9 +## explicit github.com/tent/http-link-go # github.com/vmware/govcloudair v0.0.2 +## explicit github.com/vmware/govcloudair github.com/vmware/govcloudair/types/v56 # github.com/vmware/govmomi v0.6.2 +## explicit github.com/vmware/govmomi github.com/vmware/govmomi/find github.com/vmware/govmomi/guest @@ -140,6 +186,7 @@ github.com/vmware/govmomi/vim25/soap github.com/vmware/govmomi/vim25/types github.com/vmware/govmomi/vim25/xml # golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 +## explicit golang.org/x/crypto/curve25519 golang.org/x/crypto/ed25519 golang.org/x/crypto/ed25519/internal/edwards25519 @@ -149,25 +196,30 @@ golang.org/x/crypto/poly1305 golang.org/x/crypto/ssh golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20190311183353-d8887717615a +## explicit golang.org/x/net/context golang.org/x/net/context/ctxhttp # golang.org/x/oauth2 v0.0.0-20151117210313-442624c9ec92 +## explicit golang.org/x/oauth2 golang.org/x/oauth2/google golang.org/x/oauth2/internal golang.org/x/oauth2/jws golang.org/x/oauth2/jwt # golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 +## explicit; go 1.12 golang.org/x/sys/cpu golang.org/x/sys/unix golang.org/x/sys/windows golang.org/x/sys/windows/registry # google.golang.org/api v0.0.0-20180213000552-87a2f5c77b36 +## explicit google.golang.org/api/compute/v1 google.golang.org/api/gensupport google.golang.org/api/googleapi google.golang.org/api/googleapi/internal/uritemplates # google.golang.org/appengine v0.0.0-20160205025855-6a436539be38 +## explicit google.golang.org/appengine google.golang.org/appengine/internal google.golang.org/appengine/internal/app_identity @@ -179,5 +231,11 @@ google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/urlfetch # google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 +## explicit google.golang.org/cloud/compute/metadata google.golang.org/cloud/internal +# gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c +## explicit; go 1.11 +# launchpad.net/gocheck v0.0.0-20140225173054-000000000087 +## explicit +# github.com/samalba/dockerclient => github.com/sayboras/dockerclient v1.0.0 From 21c66feecf5d9721cdad1188eb2a28932a7539bd Mon Sep 17 00:00:00 2001 From: Luiz Felipe Stangarlin Date: Sat, 29 Apr 2023 20:12:09 -0700 Subject: [PATCH 2/2] debug, added the possibility to attach to running plugin --- .vscode/launch.json | 40 +++++++++++++++++++ .../drivers/plugin/localbinary/plugin.go | 15 +++++++ libmachine/drivers/plugin/register_driver.go | 5 ++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..cb5facc778 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,40 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch cmd", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "cmd/docker-machine/machine.go", + "args": [ + "env", "--shell", "powershell" + // "regenerate-certs", "--force" + ], + "env": { + "MACHINE_PLUGIN_REATTACH": "127.0.0.1:55704", + "MACHINE_DEBUG": "1", + "MACHINE_NOHEART": "1", + "GODEBUG": "execerrdot=0" + }, + "cwd": "${workspaceFolder}" + }, + { + "name": "Launch plugin", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "drivers/docker-machine-driver-vmware/main.go", + "args": [ + ], + "env": { + "MACHINE_DEBUG": "1", + "MACHINE_PLUGIN_TOKEN": "42", + "MACHINE_NOHEART": "1", + } + } + ] +} \ No newline at end of file diff --git a/libmachine/drivers/plugin/localbinary/plugin.go b/libmachine/drivers/plugin/localbinary/plugin.go index c431c7eda9..d2495c0345 100644 --- a/libmachine/drivers/plugin/localbinary/plugin.go +++ b/libmachine/drivers/plugin/localbinary/plugin.go @@ -29,6 +29,7 @@ const ( PluginEnvKey = "MACHINE_PLUGIN_TOKEN" PluginEnvVal = "42" PluginEnvDriverName = "MACHINE_PLUGIN_DRIVER_NAME" + PluginEnvReattach = "MACHINE_PLUGIN_REATTACH" ) type PluginStreamer interface { @@ -112,6 +113,16 @@ func driverPath(driverName string) string { } func NewPlugin(driverName string) (*Plugin, error) { + reattachAddr := os.Getenv(PluginEnvReattach) + if (reattachAddr != "") { + addrCh := make(chan string, 1) + addrCh <- reattachAddr + return &Plugin{ + stopCh: make(chan struct{}), + addrCh: addrCh, + }, nil + } + driverPath := driverPath(driverName) binaryPath, err := exec.LookPath(driverPath) if err != nil { @@ -189,6 +200,10 @@ func (lbp *Plugin) AttachStream(scanner *bufio.Scanner) <-chan string { } func (lbp *Plugin) execServer() error { + if (lbp.Executor == nil) { + return nil + } + outScanner, errScanner, err := lbp.Executor.Start() if err != nil { return err diff --git a/libmachine/drivers/plugin/register_driver.go b/libmachine/drivers/plugin/register_driver.go index 27e0dbc33d..d325ce276e 100644 --- a/libmachine/drivers/plugin/register_driver.go +++ b/libmachine/drivers/plugin/register_driver.go @@ -28,6 +28,7 @@ Please use this plugin through the main 'docker-machine' binary. `, version.APIVersion) os.Exit(1) } + noheartEnv := os.Getenv("MACHINE_NOHEART") log.SetDebug(true) os.Setenv("MACHINE_DEBUG", "1") @@ -57,7 +58,9 @@ Please use this plugin through the main 'docker-machine' binary. continue case <-time.After(heartbeatTimeout): // TODO: Add heartbeat retry logic - os.Exit(1) + if noheartEnv == "" { + os.Exit(1) + } } } }