From 0599530cf1a2b4497a2cb8ef86c20057507da9b0 Mon Sep 17 00:00:00 2001 From: Cryogenics CI Bot <75623249+Cryogenics-CI@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:48:32 +0000 Subject: [PATCH] Bump code.cloudfoundry.org/dockerdriver from v0.0.0-20230406152506-76bff1bc51ef to v0.0.0-20240213153304-5bf6621f54e1 (#146) --- go.mod | 12 +-- go.sum | 100 ++++-------------- vendor/code.cloudfoundry.org/clock/README.md | 8 ++ .../dockerdriver/CODEOWNERS | 1 + .../dockerdriver/README.md | 6 +- .../dockerdriver/driverhttp/handlers.go | 17 ++- .../dockerdriver/driverhttp/remote_client.go | 17 ++- .../driverhttp/remote_client_factory.go | 4 +- .../dockerdriver/resources.go | 9 +- .../tlsconfig/.gitignore | 18 ++++ .../tlsconfig/.travis.yml | 12 --- .../code.cloudfoundry.org/tlsconfig/README.md | 42 +++++--- .../tlsconfig/authority.go | 4 +- .../code.cloudfoundry.org/tlsconfig/config.go | 8 +- .../tlsconfig/package.go | 1 - vendor/modules.txt | 24 ++--- 16 files changed, 122 insertions(+), 161 deletions(-) create mode 100644 vendor/code.cloudfoundry.org/dockerdriver/CODEOWNERS create mode 100644 vendor/code.cloudfoundry.org/tlsconfig/.gitignore delete mode 100644 vendor/code.cloudfoundry.org/tlsconfig/.travis.yml delete mode 100644 vendor/code.cloudfoundry.org/tlsconfig/package.go diff --git a/go.mod b/go.mod index 42b0432e..c287577a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module code.cloudfoundry.org/volumedriver go 1.22.0 require ( - code.cloudfoundry.org/dockerdriver v0.0.0-20230406152506-76bff1bc51ef + code.cloudfoundry.org/dockerdriver v0.0.0-20240213153304-5bf6621f54e1 code.cloudfoundry.org/goshims v0.30.0 code.cloudfoundry.org/lager/v3 v3.0.3 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 @@ -13,23 +13,21 @@ require ( require ( code.cloudfoundry.org/cfhttp v2.0.0+incompatible // indirect - code.cloudfoundry.org/clock v1.0.0 // indirect - code.cloudfoundry.org/tlsconfig v0.0.0-20200131000646-bbe0f8da39b3 // indirect + code.cloudfoundry.org/clock v1.1.0 // indirect + code.cloudfoundry.org/tlsconfig v0.0.0-20230320190829-8f91c367795b // indirect github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-logr/logr v1.3.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect - github.com/kr/pretty v0.2.1 // indirect - github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect - github.com/onsi/ginkgo v1.16.5 // indirect github.com/openzipkin/zipkin-go v0.4.2 // indirect - github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4 // indirect github.com/tedsuo/rata v1.0.0 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 1db18bb4..522e12f8 100644 --- a/go.sum +++ b/go.sum @@ -1,149 +1,93 @@ code.cloudfoundry.org/cfhttp v2.0.0+incompatible h1:Gk1oNYalXmkebrG9kgUtZ9+FPjQGnqZtS457RP2gWhc= code.cloudfoundry.org/cfhttp v2.0.0+incompatible/go.mod h1:kwYQ8kChWl4AuUJG3vKtp1po2B91S7XoUWhoKElabmA= -code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o= -code.cloudfoundry.org/clock v1.0.0/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8= -code.cloudfoundry.org/dockerdriver v0.0.0-20230406152506-76bff1bc51ef h1:fpG3gyNb/st+mqmdz5bFrjTsfVfuqPIfrziKp/Oe/Hg= -code.cloudfoundry.org/dockerdriver v0.0.0-20230406152506-76bff1bc51ef/go.mod h1:LHp3o0peO3VemcRBZc8OqppAvEjauYfZuqx5Z0Y+sJ8= +code.cloudfoundry.org/clock v1.1.0 h1:XLzC6W3Ah/Y7ht1rmZ6+QfPdt1iGWEAAtIZXgiaj57c= +code.cloudfoundry.org/clock v1.1.0/go.mod h1:yA3fxddT9RINQL2XHS7PS+OXxKCGhfrZmlNUCIM6AKo= +code.cloudfoundry.org/dockerdriver v0.0.0-20240213153304-5bf6621f54e1 h1:ekskzxMKaqSs72N8BSGi8LHHwWm9MDzbJwXt2S4XFBs= +code.cloudfoundry.org/dockerdriver v0.0.0-20240213153304-5bf6621f54e1/go.mod h1:tqB0l3zbTCHDEd5Pof0asPkXYuV5avhvf5g86aBhGao= code.cloudfoundry.org/goshims v0.30.0 h1:hVYXO5vcCTxW5mcmtrNi/r3lPr1LyVAPZ8MX4heWz7k= code.cloudfoundry.org/goshims v0.30.0/go.mod h1:l8024gqm7ZS7azMXI1A6TjWQ0usk/wx7r2zqzkcBwG4= code.cloudfoundry.org/lager/v3 v3.0.3 h1:/UTmadZfIaKuT/whEinSxK1mzRfNu1uPfvjFfGqiwzM= code.cloudfoundry.org/lager/v3 v3.0.3/go.mod h1:Zn5q1SrIuuHjEUE7xerMKt3ztunrJQCZETAo7rV0CH8= -code.cloudfoundry.org/tlsconfig v0.0.0-20200131000646-bbe0f8da39b3 h1:2Qal+q+tw/DmDOoJBWwDCPE3lIJNj/1o7oMkkb2c5SI= -code.cloudfoundry.org/tlsconfig v0.0.0-20200131000646-bbe0f8da39b3/go.mod h1:eTbFJpyXRGuFVyg5+oaj9B2eIbIc+0/kZjH8ftbtdew= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +code.cloudfoundry.org/tlsconfig v0.0.0-20230320190829-8f91c367795b h1:FjTuGbVBKeaSyvW7WEATlIFCyb0uCpaiuTSaMQXjUyY= +code.cloudfoundry.org/tlsconfig v0.0.0-20230320190829-8f91c367795b/go.mod h1:C8SxvGRSutmgzV2FxH8Zwqz2Q8HsaAITQRQFKhlDzPw= +filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= +filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f h1:gOO/tNZMjjvTKZWpY7YnXC72ULNLErRtp94LountVE8= github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/pprof v0.0.0-20230406165453-00490a63f317/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 h1:NicmruxkeqHjDv03SfSxqmaLuisddudfP3h5wdXFbhM= github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1/go.mod h1:eyp4DdUJAKkr9tvxR3jWhw2mDK7CWABMG5r9uyaKC7I= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= +github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= +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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM= -github.com/square/certstrap v1.2.0 h1:ecgyABrbFLr8jSbOC6oTBmBek0t/HqtgrMUZCPuyfdw= -github.com/square/certstrap v1.2.0/go.mod h1:CUHqV+fxJW0Y5UQFnnbYwQ7bpKXO1AKbic9g73799yw= +github.com/square/certstrap v1.3.0 h1:N9P0ZRA+DjT8pq5fGDj0z3FjafRKnBDypP0QHpMlaAk= +github.com/square/certstrap v1.3.0/go.mod h1:wGZo9eE1B7WX2GKBn0htJ+B3OuRl2UsdCFySNooy9hU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4 h1:MGZzzxBuPuK4J0XQo+0uy0NnXQGKzHXhYp5oG1Wy860= github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE= github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +go.step.sm/crypto v0.16.2 h1:Pr9aazTwWBBZNogUsOqhOrPSdwAa9pPs+lMB602lnDA= +go.step.sm/crypto v0.16.2/go.mod h1:1WkTOTY+fOX/RY4TnZREp6trQAsBHRQ7nu6QJBiNQF8= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/vendor/code.cloudfoundry.org/clock/README.md b/vendor/code.cloudfoundry.org/clock/README.md index abaf6414..f6dc4a4a 100644 --- a/vendor/code.cloudfoundry.org/clock/README.md +++ b/vendor/code.cloudfoundry.org/clock/README.md @@ -3,3 +3,11 @@ **Note**: This repository should be imported as `code.cloudfoundry.org/clock`. Provides a `Clock` interface, useful for injecting time dependencies in tests. + +## Reporting issues and requesting features + +Please report all issues and feature requests in [cloudfoundry/diego-release](https://github.com/cloudfoundry/diego-release/issues). + +## Contributing + +For tagging please use the semver compatible version format e.g. `v1.0.0`. diff --git a/vendor/code.cloudfoundry.org/dockerdriver/CODEOWNERS b/vendor/code.cloudfoundry.org/dockerdriver/CODEOWNERS new file mode 100644 index 00000000..6a633c7e --- /dev/null +++ b/vendor/code.cloudfoundry.org/dockerdriver/CODEOWNERS @@ -0,0 +1 @@ +* @cloudfoundry/wg-app-runtime-platform-diego-approvers diff --git a/vendor/code.cloudfoundry.org/dockerdriver/README.md b/vendor/code.cloudfoundry.org/dockerdriver/README.md index 710c4b7a..c483498c 100644 --- a/vendor/code.cloudfoundry.org/dockerdriver/README.md +++ b/vendor/code.cloudfoundry.org/dockerdriver/README.md @@ -1,7 +1,11 @@ # dockerdriver -this repo contains a server/client skeleton and the interfaces to to implement a docker volume driver server for use with Diego's [volume manager](https://github.com/cloudfoundry-incubator/volman). +This repo contains a server/client skeleton and the interfaces to to implement a docker volume driver server for use with Diego's [volume manager](https://github.com/cloudfoundry-incubator/volman). ## Reporting issues and requesting features Please report all issues and feature requests in [cloudfoundry/diego-release](https://github.com/cloudfoundry/diego-release/issues). + +## Development +- To run the tests, run `go run github.com/onsi/ginkgo/v2/ginkgo -r`, `go test`, or `ginkgo -r` if you have [Ginkgo](https://github.com/onsi/ginkgo) installed. +- To re-generate the test fakes, run `go generate`. \ No newline at end of file diff --git a/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/handlers.go b/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/handlers.go index 33ab30b0..015f0f94 100644 --- a/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/handlers.go +++ b/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/handlers.go @@ -1,14 +1,13 @@ package driverhttp import ( + "context" "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" - "context" - cf_http_handlers "code.cloudfoundry.org/cfhttp/handlers" "code.cloudfoundry.org/dockerdriver" "code.cloudfoundry.org/lager/v3" @@ -117,7 +116,7 @@ func newGetHandler(logger lager.Logger, client dockerdriver.Driver) http.Handler logger.Info("start") defer logger.Info("end") - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { logger.Error("failed-reading-get-request-body", err) cf_http_handlers.WriteJSONResponse(w, StatusInternalServerError, dockerdriver.MountResponse{Err: err.Error()}) @@ -165,7 +164,7 @@ func newPathHandler(logger lager.Logger, client dockerdriver.Driver) http.Handle logger.Info("start") defer logger.Info("end") - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { logger.Error("failed-reading-path-request-body", err) cf_http_handlers.WriteJSONResponse(w, StatusInternalServerError, dockerdriver.MountResponse{Err: err.Error()}) @@ -208,7 +207,7 @@ func newCreateHandler(logger lager.Logger, client dockerdriver.Driver) http.Hand logger.Info("start") defer logger.Info("end") - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { logger.Error("failed-reading-create-request-body", err) cf_http_handlers.WriteJSONResponse(w, StatusInternalServerError, dockerdriver.ErrorResponse{Err: err.Error()}) @@ -239,7 +238,7 @@ func newMountHandler(logger lager.Logger, client dockerdriver.Driver) http.Handl logger.Info("start") defer logger.Info("end") - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { logger.Error("failed-reading-mount-request-body", err) cf_http_handlers.WriteJSONResponse(w, StatusInternalServerError, dockerdriver.MountResponse{Err: err.Error()}) @@ -270,7 +269,7 @@ func newUnmountHandler(logger lager.Logger, client dockerdriver.Driver) http.Han logger.Info("start") defer logger.Info("end") - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { logger.Error("failed-reading-unmount-request-body", err) cf_http_handlers.WriteJSONResponse(w, StatusInternalServerError, dockerdriver.ErrorResponse{Err: err.Error()}) @@ -301,7 +300,7 @@ func newRemoveHandler(logger lager.Logger, client dockerdriver.Driver) http.Hand logger.Info("start") defer logger.Info("end") - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { logger.Error("failed-reading-remove-request-body", err) cf_http_handlers.WriteJSONResponse(w, StatusInternalServerError, dockerdriver.ErrorResponse{Err: err.Error()}) diff --git a/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client.go b/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client.go index 6118f806..1e40875c 100644 --- a/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client.go +++ b/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client.go @@ -2,14 +2,14 @@ package driverhttp import ( "bytes" + "context" "encoding/json" - "io/ioutil" + "errors" + "fmt" + "io" "net/http" - "strings" - "fmt" - "code.cloudfoundry.org/cfhttp" "code.cloudfoundry.org/clock" "code.cloudfoundry.org/dockerdriver" @@ -17,11 +17,6 @@ import ( "code.cloudfoundry.org/lager/v3" "code.cloudfoundry.org/tlsconfig" "github.com/tedsuo/rata" - - os_http "net/http" - - "context" - "errors" ) type reqFactory struct { @@ -38,7 +33,7 @@ func newReqFactory(reqGen *rata.RequestGenerator, route string, payload []byte) } } -func (r *reqFactory) Request() (*os_http.Request, error) { +func (r *reqFactory) Request() (*http.Request, error) { return r.reqGen.CreateRequest(r.route, nil, bytes.NewBuffer(r.payload)) } @@ -414,7 +409,7 @@ func (r *remoteClient) do(ctx context.Context, logger lager.Logger, requestFacto } logger.Debug("response", lager.Data{"response": response.Status}) - data, err = ioutil.ReadAll(response.Body) + data, err = io.ReadAll(response.Body) if err != nil { return data, err } diff --git a/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client_factory.go b/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client_factory.go index 351c8003..038ab493 100644 --- a/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client_factory.go +++ b/vendor/code.cloudfoundry.org/dockerdriver/driverhttp/remote_client_factory.go @@ -4,8 +4,8 @@ import ( "code.cloudfoundry.org/dockerdriver" ) -//go:generate counterfeiter -o ../dockerdriverfakes/fake_remote_client_factory.go . RemoteClientFactory - +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//counterfeiter:generate -o ../dockerdriverfakes/fake_remote_client_factory.go . RemoteClientFactory type RemoteClientFactory interface { NewRemoteClient(url string, tls *dockerdriver.TLSConfig) (dockerdriver.Driver, error) } diff --git a/vendor/code.cloudfoundry.org/dockerdriver/resources.go b/vendor/code.cloudfoundry.org/dockerdriver/resources.go index 2e775d8c..7af82cf2 100644 --- a/vendor/code.cloudfoundry.org/dockerdriver/resources.go +++ b/vendor/code.cloudfoundry.org/dockerdriver/resources.go @@ -31,20 +31,21 @@ var Routes = rata.Routes{ {Path: "/VolumeDriver.Capabilities", Method: "POST", Name: CapabilitiesRoute}, } -//go:generate counterfeiter -o dockerdriverfakes/fake_env.go . Env +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate +//counterfeiter:generate -o dockerdriverfakes/fake_env.go . Env type Env interface { Logger() lager.Logger Context() context.Context } -//go:generate counterfeiter -o dockerdriverfakes/fake_matchable_driver_client.go . MatchableDriver +//counterfeiter:generate -o dockerdriverfakes/fake_matchable_driver_client.go . MatchableDriver type MatchableDriver interface { Matches(lager.Logger, string, *TLSConfig) bool Driver } -//go:generate counterfeiter -o dockerdriverfakes/fake_driver_client.go . Driver +//counterfeiter:generate -o dockerdriverfakes/fake_driver_client.go . Driver type Driver interface { Activate(env Env) ActivateResponse Get(env Env, getRequest GetRequest) GetResponse @@ -57,7 +58,7 @@ type Driver interface { Provisioner } -//go:generate counterfeiter -o dockerdriverfakes/fake_provisioner.go . Provisioner +//counterfeiter:generate -o dockerdriverfakes/fake_provisioner.go . Provisioner type Provisioner interface { Create(env Env, createRequest CreateRequest) ErrorResponse Remove(env Env, removeRequest RemoveRequest) ErrorResponse diff --git a/vendor/code.cloudfoundry.org/tlsconfig/.gitignore b/vendor/code.cloudfoundry.org/tlsconfig/.gitignore new file mode 100644 index 00000000..125de6c1 --- /dev/null +++ b/vendor/code.cloudfoundry.org/tlsconfig/.gitignore @@ -0,0 +1,18 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories +vendor/ + +# Go workspace file +go.work \ No newline at end of file diff --git a/vendor/code.cloudfoundry.org/tlsconfig/.travis.yml b/vendor/code.cloudfoundry.org/tlsconfig/.travis.yml deleted file mode 100644 index 22cdd220..00000000 --- a/vendor/code.cloudfoundry.org/tlsconfig/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -language: go - -go: -- "1.x" -- "master" - -install: true - -script: -- env GO111MODULE=on go build ./... -- env GO111MODULE=on go test ./... diff --git a/vendor/code.cloudfoundry.org/tlsconfig/README.md b/vendor/code.cloudfoundry.org/tlsconfig/README.md index 4be8c83d..15be084f 100644 --- a/vendor/code.cloudfoundry.org/tlsconfig/README.md +++ b/vendor/code.cloudfoundry.org/tlsconfig/README.md @@ -1,28 +1,40 @@ # tlsconfig -> build tls configurations +[![Go Report Card](https://goreportcard.com/badge/code.cloudfoundry.org/tlsconfig)](https://goreportcard.com/report/code.cloudfoundry.org/tlsconfig) +[![Go Reference](https://pkg.go.dev/badge/code.cloudfoundry.org/tlsconfig.svg)](https://pkg.go.dev/code.cloudfoundry.org/tlsconfig) -## Reporting issues and requesting features +tlsconfig generates shared [crypto/tls configurations](https://pkg.go.dev/crypto/tls#Config) for internal and external-facing services in Cloud Foundry. This module is considered internal to Cloud Foundry, and does not provide any stability guarantees for external usage. -Please report all issues and feature requests in [cloudfoundry/diego-release](https://github.com/cloudfoundry/diego-release/issues). +## Getting Started -## about +### Usage -There are requirements and guidelines for the TLS configurations -we'd like to use for our internal services. This library stays up to date with -those internal requirements so that services just need to link against this. +Import this module as `code.cloudfoundry.org/tlsconfig`. -This repository also includes a sub-package called `certtest` which can be used -to build valid PKIs for test. +Update to the latest version of the library off the main branch with: +``` +go get -u code.cloudfoundry.org/tlsconfig@main +``` -## usage +### Running the tests -**Note**: This repository should be imported as `code.cloudfoundry.org/tlsconfig` +All the tests use the standard go testing library and can be run with: +``` +go test ./... +``` -See [GoDoc][godoc]. +## Contributing -[godoc]: https://godoc.org/code.cloudfoundry.org/tlsconfig +Cloud Foundry uses GitHub to manage reviews of pull requests and issues. -## getting help +* If you have a trivial fix or improvement, go ahead and create a pull request. +* If you plan to do something more involved, first discuss your ideas in [Slack](cloudfoundry.slack.com). This will help avoid unnecessary work :). +* Make sure you've signed the CLA! -Please file an issue! +## Versioning + +This module is not currently versioned. Whatever is on the `main` branch is considered to be the latest release of the module. + +## License + +This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details. diff --git a/vendor/code.cloudfoundry.org/tlsconfig/authority.go b/vendor/code.cloudfoundry.org/tlsconfig/authority.go index 071fe99a..738c6da5 100644 --- a/vendor/code.cloudfoundry.org/tlsconfig/authority.go +++ b/vendor/code.cloudfoundry.org/tlsconfig/authority.go @@ -4,7 +4,7 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "io/ioutil" + "os" ) // PoolOption is an functional option type that can be used to configure a @@ -59,7 +59,7 @@ func FromSystemPool(opts ...PoolOption) PoolBuilder { // file to a certificate pool. func WithCertsFromFile(path string) PoolOption { return func(pool *x509.CertPool) error { - pemCerts, err := ioutil.ReadFile(path) + pemCerts, err := os.ReadFile(path) if err != nil { return fmt.Errorf("failed to read certificate(s) at path %q: %s", path, err) } diff --git a/vendor/code.cloudfoundry.org/tlsconfig/config.go b/vendor/code.cloudfoundry.org/tlsconfig/config.go index 05f4da2b..d81dead7 100644 --- a/vendor/code.cloudfoundry.org/tlsconfig/config.go +++ b/vendor/code.cloudfoundry.org/tlsconfig/config.go @@ -86,8 +86,7 @@ func (c Config) Client(opts ...ClientOption) (*tls.Config, error) { func WithExternalServiceDefaults() TLSOption { return func(c *tls.Config) error { c.MinVersion = tls.VersionTLS12 - c.MaxVersion = tls.VersionTLS12 - c.PreferServerCipherSuites = false + c.MaxVersion = tls.VersionTLS13 c.CipherSuites = []uint16{ tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, @@ -115,8 +114,7 @@ func WithExternalServiceDefaults() TLSOption { func WithInternalServiceDefaults() TLSOption { return func(c *tls.Config) error { c.MinVersion = tls.VersionTLS12 - c.MaxVersion = tls.VersionTLS12 - c.PreferServerCipherSuites = true + c.MaxVersion = tls.VersionTLS13 c.CipherSuites = []uint16{ tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, @@ -141,7 +139,7 @@ func WithIdentity(cert tls.Certificate) TLSOption { return fail(err) } c.Certificates = []tls.Certificate{cert} - c.BuildNameToCertificate() + c.BuildNameToCertificate() //nolint:staticcheck return nil } } diff --git a/vendor/code.cloudfoundry.org/tlsconfig/package.go b/vendor/code.cloudfoundry.org/tlsconfig/package.go deleted file mode 100644 index 0c583457..00000000 --- a/vendor/code.cloudfoundry.org/tlsconfig/package.go +++ /dev/null @@ -1 +0,0 @@ -package tlsconfig // import "code.cloudfoundry.org/tlsconfig" diff --git a/vendor/modules.txt b/vendor/modules.txt index 59638d7e..4858d5ae 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -3,11 +3,11 @@ code.cloudfoundry.org/cfhttp code.cloudfoundry.org/cfhttp/handlers code.cloudfoundry.org/cfhttp/unix_transport -# code.cloudfoundry.org/clock v1.0.0 -## explicit +# code.cloudfoundry.org/clock v1.1.0 +## explicit; go 1.20 code.cloudfoundry.org/clock -# code.cloudfoundry.org/dockerdriver v0.0.0-20230406152506-76bff1bc51ef -## explicit +# code.cloudfoundry.org/dockerdriver v0.0.0-20240213153304-5bf6621f54e1 +## explicit; go 1.19 code.cloudfoundry.org/dockerdriver code.cloudfoundry.org/dockerdriver/driverhttp # code.cloudfoundry.org/goshims v0.30.0 @@ -29,12 +29,14 @@ code.cloudfoundry.org/lager/v3 code.cloudfoundry.org/lager/v3/internal/truncate code.cloudfoundry.org/lager/v3/lagerctx code.cloudfoundry.org/lager/v3/lagertest -# code.cloudfoundry.org/tlsconfig v0.0.0-20200131000646-bbe0f8da39b3 -## explicit; go 1.13 +# code.cloudfoundry.org/tlsconfig v0.0.0-20230320190829-8f91c367795b +## explicit; go 1.19 code.cloudfoundry.org/tlsconfig # github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f ## explicit github.com/bmizerany/pat +# github.com/fsnotify/fsnotify v1.4.9 +## explicit; go 1.13 # github.com/go-logr/logr v1.3.0 ## explicit; go 1.18 github.com/go-logr/logr @@ -52,18 +54,12 @@ github.com/google/go-cmp/cmp/internal/value # github.com/google/pprof v0.0.0-20230406165453-00490a63f317 ## explicit; go 1.19 github.com/google/pprof/profile -# github.com/kr/pretty v0.2.1 -## explicit; go 1.12 # github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 ## explicit; go 1.20 github.com/maxbrunsfeld/counterfeiter/v6 github.com/maxbrunsfeld/counterfeiter/v6/arguments github.com/maxbrunsfeld/counterfeiter/v6/command github.com/maxbrunsfeld/counterfeiter/v6/generator -# github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d -## explicit -# github.com/onsi/ginkgo v1.16.5 -## explicit; go 1.16 # github.com/onsi/ginkgo/v2 v2.15.0 ## explicit; go 1.20 github.com/onsi/ginkgo/v2 @@ -103,8 +99,6 @@ github.com/onsi/gomega/types ## explicit; go 1.18 github.com/openzipkin/zipkin-go/idgenerator github.com/openzipkin/zipkin-go/model -# github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4 -## explicit # github.com/tedsuo/rata v1.0.0 ## explicit github.com/tedsuo/rata @@ -169,6 +163,8 @@ golang.org/x/tools/internal/tokeninternal golang.org/x/tools/internal/typeparams golang.org/x/tools/internal/typesinternal golang.org/x/tools/internal/versions +# gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 +## explicit # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3