diff --git a/src/bosh-docker-cpi/go.mod b/src/bosh-docker-cpi/go.mod index 3ed45b0..c05f32f 100644 --- a/src/bosh-docker-cpi/go.mod +++ b/src/bosh-docker-cpi/go.mod @@ -3,14 +3,14 @@ module bosh-docker-cpi go 1.22.0 require ( - github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241207100358-4719c3273ffb - github.com/cloudfoundry/bosh-utils v0.0.513 - github.com/docker/docker v27.4.0+incompatible + github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241214100229-ac5e82eede68 + github.com/cloudfoundry/bosh-utils v0.0.516 + github.com/docker/docker v27.4.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.34.2 github.com/opencontainers/image-spec v1.1.0 - golang.org/x/net v0.32.0 + golang.org/x/net v0.33.0 ) require ( diff --git a/src/bosh-docker-cpi/go.sum b/src/bosh-docker-cpi/go.sum index 90f5226..17918c9 100644 --- a/src/bosh-docker-cpi/go.sum +++ b/src/bosh-docker-cpi/go.sum @@ -8,10 +8,10 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/charlievieth/fs v0.0.3 h1:3lZQXTj4PbE81CVPwALSn+JoyCNXkZgORHN6h2XHGlg= github.com/charlievieth/fs v0.0.3/go.mod h1:hD4sRzto1Hw8zCua76tNVKZxaeZZr1RiKftjAJQRLLo= -github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241207100358-4719c3273ffb h1:pPsoo1rbMd6tFKRULfKlQ+91EANr/2MHoIYNrNLWiHA= -github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241207100358-4719c3273ffb/go.mod h1:dkLkDnPmBYa2qonwx/DOovq9LzBVD1rwaHS0KXjdL2g= -github.com/cloudfoundry/bosh-utils v0.0.513 h1:PV3qhdX5ZcAB8870hqeB9TB/4pEkRsefig9vLtBUZP4= -github.com/cloudfoundry/bosh-utils v0.0.513/go.mod h1:GCh00+zqULOUWDhIeYYjXP0vghoQgi1uX+RzC8q9rMU= +github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241214100229-ac5e82eede68 h1:LFh4BMLr0p4PPy0otfTScJKFrTslllXJjW0FKLW9tvY= +github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241214100229-ac5e82eede68/go.mod h1:mrp7E9FrvRleUdmVsPj5zFtyIKy8srkCB/C7DMQWFT4= +github.com/cloudfoundry/bosh-utils v0.0.516 h1:WLBnFYA9x2XGy6ylirrjTtexcq5jl8arcbUApTocTto= +github.com/cloudfoundry/bosh-utils v0.0.516/go.mod h1:Yl7mT/Fy99deXXwaZZVUTf9VC878kUuoTS3h1F9Dzho= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -19,8 +19,8 @@ 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/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A= -github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= +github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -109,8 +109,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/src/bosh-docker-cpi/vendor/github.com/docker/docker/api/swagger.yaml b/src/bosh-docker-cpi/vendor/github.com/docker/docker/api/swagger.yaml index cfd52ae..f519806 100644 --- a/src/bosh-docker-cpi/vendor/github.com/docker/docker/api/swagger.yaml +++ b/src/bosh-docker-cpi/vendor/github.com/docker/docker/api/swagger.yaml @@ -5820,8 +5820,6 @@ definitions: type: "string" example: - "WARNING: No memory limit support" - - "WARNING: bridge-nf-call-iptables is disabled" - - "WARNING: bridge-nf-call-ip6tables is disabled" CDISpecDirs: description: | List of directories where (Container Device Interface) CDI @@ -9563,7 +9561,7 @@ paths: type: "string" example: "OK" headers: - API-Version: + Api-Version: type: "string" description: "Max API Version the server supports" Builder-Version: @@ -9619,7 +9617,7 @@ paths: type: "string" example: "(empty)" headers: - API-Version: + Api-Version: type: "string" description: "Max API Version the server supports" Builder-Version: diff --git a/src/bosh-docker-cpi/vendor/github.com/docker/docker/client/ping.go b/src/bosh-docker-cpi/vendor/github.com/docker/docker/client/ping.go index bf3e9b1..7c43268 100644 --- a/src/bosh-docker-cpi/vendor/github.com/docker/docker/client/ping.go +++ b/src/bosh-docker-cpi/vendor/github.com/docker/docker/client/ping.go @@ -56,8 +56,8 @@ func parsePingResponse(cli *Client, resp serverResponse) (types.Ping, error) { err := cli.checkResponseErr(resp) return ping, errdefs.FromStatusCode(err, resp.statusCode) } - ping.APIVersion = resp.header.Get("API-Version") - ping.OSType = resp.header.Get("OSType") + ping.APIVersion = resp.header.Get("Api-Version") + ping.OSType = resp.header.Get("Ostype") if resp.header.Get("Docker-Experimental") == "true" { ping.Experimental = true } diff --git a/src/bosh-docker-cpi/vendor/golang.org/x/net/html/doctype.go b/src/bosh-docker-cpi/vendor/golang.org/x/net/html/doctype.go index c484e5a..bca3ae9 100644 --- a/src/bosh-docker-cpi/vendor/golang.org/x/net/html/doctype.go +++ b/src/bosh-docker-cpi/vendor/golang.org/x/net/html/doctype.go @@ -87,7 +87,7 @@ func parseDoctype(s string) (n *Node, quirks bool) { } } if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" && - strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" { + strings.EqualFold(lastAttr.Val, "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd") { quirks = true } } diff --git a/src/bosh-docker-cpi/vendor/golang.org/x/net/html/foreign.go b/src/bosh-docker-cpi/vendor/golang.org/x/net/html/foreign.go index 9da9e9d..e8515d8 100644 --- a/src/bosh-docker-cpi/vendor/golang.org/x/net/html/foreign.go +++ b/src/bosh-docker-cpi/vendor/golang.org/x/net/html/foreign.go @@ -40,8 +40,7 @@ func htmlIntegrationPoint(n *Node) bool { if n.Data == "annotation-xml" { for _, a := range n.Attr { if a.Key == "encoding" { - val := strings.ToLower(a.Val) - if val == "text/html" || val == "application/xhtml+xml" { + if strings.EqualFold(a.Val, "text/html") || strings.EqualFold(a.Val, "application/xhtml+xml") { return true } } diff --git a/src/bosh-docker-cpi/vendor/golang.org/x/net/html/parse.go b/src/bosh-docker-cpi/vendor/golang.org/x/net/html/parse.go index 46a89ed..643c674 100644 --- a/src/bosh-docker-cpi/vendor/golang.org/x/net/html/parse.go +++ b/src/bosh-docker-cpi/vendor/golang.org/x/net/html/parse.go @@ -840,6 +840,10 @@ func afterHeadIM(p *parser) bool { p.parseImpliedToken(StartTagToken, a.Body, a.Body.String()) p.framesetOK = true + if p.tok.Type == ErrorToken { + // Stop parsing. + return true + } return false } @@ -1031,7 +1035,7 @@ func inBodyIM(p *parser) bool { if p.tok.DataAtom == a.Input { for _, t := range p.tok.Attr { if t.Key == "type" { - if strings.ToLower(t.Val) == "hidden" { + if strings.EqualFold(t.Val, "hidden") { // Skip setting framesetOK = false return true } @@ -1459,7 +1463,7 @@ func inTableIM(p *parser) bool { return inHeadIM(p) case a.Input: for _, t := range p.tok.Attr { - if t.Key == "type" && strings.ToLower(t.Val) == "hidden" { + if t.Key == "type" && strings.EqualFold(t.Val, "hidden") { p.addElement() p.oe.pop() return true diff --git a/src/bosh-docker-cpi/vendor/modules.txt b/src/bosh-docker-cpi/vendor/modules.txt index b44eeb7..5fd81f1 100644 --- a/src/bosh-docker-cpi/vendor/modules.txt +++ b/src/bosh-docker-cpi/vendor/modules.txt @@ -11,11 +11,11 @@ github.com/bmatcuk/doublestar # github.com/charlievieth/fs v0.0.3 ## explicit; go 1.18 github.com/charlievieth/fs -# github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241207100358-4719c3273ffb +# github.com/cloudfoundry/bosh-cpi-go v0.0.0-20241214100229-ac5e82eede68 ## explicit; go 1.22.0 github.com/cloudfoundry/bosh-cpi-go/apiv1 github.com/cloudfoundry/bosh-cpi-go/rpc -# github.com/cloudfoundry/bosh-utils v0.0.513 +# github.com/cloudfoundry/bosh-utils v0.0.516 ## explicit; go 1.22.0 github.com/cloudfoundry/bosh-utils/errors github.com/cloudfoundry/bosh-utils/logger @@ -26,7 +26,7 @@ github.com/cloudfoundry/bosh-utils/uuid # github.com/distribution/reference v0.6.0 ## explicit; go 1.20 github.com/distribution/reference -# github.com/docker/docker v27.4.0+incompatible +# github.com/docker/docker v27.4.1+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types @@ -174,7 +174,7 @@ go.opentelemetry.io/otel/metric/noop go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/noop -# golang.org/x/net v0.32.0 +# golang.org/x/net v0.33.0 ## explicit; go 1.18 golang.org/x/net/context golang.org/x/net/html