From f345cb2b8cc77365e8f1ef3efed249439ddf97d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Apr 2026 03:11:55 +0000 Subject: [PATCH] Bump github.com/cloudfoundry/bosh-utils from 0.0.582 to 0.0.608 Bumps [github.com/cloudfoundry/bosh-utils](https://github.com/cloudfoundry/bosh-utils) from 0.0.582 to 0.0.608. - [Commits](https://github.com/cloudfoundry/bosh-utils/compare/v0.0.582...v0.0.608) --- updated-dependencies: - dependency-name: github.com/cloudfoundry/bosh-utils dependency-version: 0.0.608 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 11 +- go.sum | 42 ++- vendor/github.com/charlievieth/fs/LICENSE | 21 -- vendor/github.com/charlievieth/fs/fs.go | 180 ----------- vendor/github.com/charlievieth/fs/fs_unix.go | 85 ----- .../github.com/charlievieth/fs/fs_windows.go | 293 ------------------ .../bosh-utils/errors/multi_error.go | 2 +- .../cloudfoundry/bosh-utils/logger/logger.go | 2 +- .../system/fakes/fake_file_system.go | 24 +- .../bosh-utils/system/ip_helper.go | 4 +- .../bosh-utils/system/os_file_system.go | 23 +- .../bosh-utils/system/os_file_system_unix.go | 9 +- vendor/github.com/onsi/gomega/CHANGELOG.md | 4 + vendor/github.com/onsi/gomega/gomega_dsl.go | 2 +- vendor/golang.org/x/net/html/iter.go | 2 - vendor/golang.org/x/net/html/node.go | 1 + .../golang.org/x/net/html/nodetype_string.go | 31 ++ vendor/golang.org/x/sys/unix/ioctl_signed.go | 11 +- .../golang.org/x/sys/unix/ioctl_unsigned.go | 11 +- .../golang.org/x/sys/unix/syscall_solaris.go | 8 - vendor/golang.org/x/sys/unix/syscall_unix.go | 10 +- vendor/golang.org/x/sys/unix/ztypes_linux.go | 229 +++++++------- vendor/golang.org/x/sys/windows/aliases.go | 1 + .../golang.org/x/sys/windows/dll_windows.go | 37 +-- .../x/sys/windows/security_windows.go | 6 +- .../x/sys/windows/syscall_windows.go | 15 +- .../golang.org/x/sys/windows/types_windows.go | 85 +++++ .../x/sys/windows/zsyscall_windows.go | 7 + vendor/modules.txt | 23 +- 29 files changed, 351 insertions(+), 828 deletions(-) delete mode 100644 vendor/github.com/charlievieth/fs/LICENSE delete mode 100644 vendor/github.com/charlievieth/fs/fs.go delete mode 100644 vendor/github.com/charlievieth/fs/fs_unix.go delete mode 100644 vendor/github.com/charlievieth/fs/fs_windows.go create mode 100644 vendor/golang.org/x/net/html/nodetype_string.go diff --git a/go.mod b/go.mod index 6504291d..233b9b44 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ require ( github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect github.com/apache/cloudstack-go/v2 v2.19.0 github.com/cloudfoundry/bosh-cpi-go v0.0.0-20251206100214-575efd567282 - github.com/cloudfoundry/bosh-utils v0.0.582 + github.com/cloudfoundry/bosh-utils v0.0.608 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.39.0 + github.com/onsi/gomega v1.39.1 github.com/prometheus/common v0.67.5 ) @@ -19,7 +19,6 @@ require ( require ( github.com/bmatcuk/doublestar v1.3.4 // indirect - github.com/charlievieth/fs v0.0.3 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/kr/pretty v0.3.1 // indirect @@ -28,8 +27,8 @@ require ( github.com/xhit/go-str2duration/v2 v2.1.0 // indirect go.uber.org/mock v0.6.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sys v0.40.0 // indirect - golang.org/x/text v0.33.0 // indirect + golang.org/x/net v0.53.0 // indirect + golang.org/x/sys v0.43.0 // indirect + golang.org/x/text v0.36.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) diff --git a/go.sum b/go.sum index 79b326fe..94861b67 100644 --- a/go.sum +++ b/go.sum @@ -8,12 +8,10 @@ github.com/apache/cloudstack-go/v2 v2.19.0 h1:YHLw770MmgiqXx6NRFYw2Nr7DpnylLhLG2 github.com/apache/cloudstack-go/v2 v2.19.0/go.mod h1:p/YBUwIEkQN6CQxFhw8Ff0wzf1MY0qRRRuGYNbcb1F8= github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0= github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= -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-20251206100214-575efd567282 h1:cXw5riXWfWFfn9E7ehxnqaFZpDlXAFMvYLTih64w62A= github.com/cloudfoundry/bosh-cpi-go v0.0.0-20251206100214-575efd567282/go.mod h1:K0NKOBGaTfIX3Yo/21fdDzzgYHSkUvfmWLhAV4+9lF8= -github.com/cloudfoundry/bosh-utils v0.0.582 h1:GvpXLVuqIFO0ANzUC/cLp+ZNcbM6M/pozTmmFFflCaM= -github.com/cloudfoundry/bosh-utils v0.0.582/go.mod h1:2XGBz94ysudy+8WawbeMyiMntLgVNU492pIpZUQkxyI= +github.com/cloudfoundry/bosh-utils v0.0.608 h1:Q0mJPdvkCSU3D/O5F9OGvvH1ezhCu50vk0h6EqDfxug= +github.com/cloudfoundry/bosh-utils v0.0.608/go.mod h1:ASB+Wzh6oeaooXeyBJbW0sC2+LSB9SPxlowi7nlEtmM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -41,8 +39,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc= -github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= +github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 h1:EwtI+Al+DeppwYX2oXJCETMO23COyaKGP6fHVpkpWpg= +github.com/google/pprof v0.0.0-20260402051712-545e8a4df936/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -60,12 +58,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= 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.27.5 h1:ZeVgZMx2PDMdJm/+w5fE/OyG6ILo1Y3e+QX4zSR0zTE= -github.com/onsi/ginkgo/v2 v2.27.5/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= +github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI= +github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= 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.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q= -github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4= +github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28= +github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -96,20 +94,20 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= 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.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= 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.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/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= @@ -120,17 +118,17 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w 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.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= 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.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= -golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= 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.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= 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= diff --git a/vendor/github.com/charlievieth/fs/LICENSE b/vendor/github.com/charlievieth/fs/LICENSE deleted file mode 100644 index 9f3ecfad..00000000 --- a/vendor/github.com/charlievieth/fs/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Charlie Vieth - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/github.com/charlievieth/fs/fs.go b/vendor/github.com/charlievieth/fs/fs.go deleted file mode 100644 index feab9c60..00000000 --- a/vendor/github.com/charlievieth/fs/fs.go +++ /dev/null @@ -1,180 +0,0 @@ -package fs - -import ( - "os" - "time" -) - -/* - The below code contains portions of the Go standard library, specically - the os package. - - Copyright (c) 2009 The Go Authors. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - * Neither the name of Google Inc. nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -// Chdir changes the current working directory to the named directory. -// If there is an error, it will be of type *PathError. -func Chdir(dir string) error { - return chdir(dir) -} - -// Chmod changes the mode of the named file to mode. -// If the file is a symbolic link, it changes the mode of the link's target. -// If there is an error, it will be of type *PathError. -func Chmod(name string, mode os.FileMode) error { - return chmod(name, mode) -} - -// Chown changes the numeric uid and gid of the named file. -// If the file is a symbolic link, it changes the uid and gid of the link's target. -// If there is an error, it will be of type *PathError. -func Chown(name string, uid, gid int) error { - return chown(name, uid, gid) -} - -// Chtimes changes the access and modification times of the named -// file, similar to the Unix utime() or utimes() functions. -// -// The underlying filesystem may truncate or round the values to a -// less precise time unit. -// If there is an error, it will be of type *PathError. -func Chtimes(name string, atime time.Time, mtime time.Time) error { - return chtimes(name, atime, mtime) -} - -// Lchown changes the numeric uid and gid of the named file. -// If the file is a symbolic link, it changes the uid and gid of the link itself. -// If there is an error, it will be of type *PathError. -func Lchown(name string, uid, gid int) error { - return lchown(name, uid, gid) -} - -// Link creates newname as a hard link to the oldname file. -// If there is an error, it will be of type *LinkError. -func Link(oldname, newname string) error { - return link(oldname, newname) -} - -// Mkdir creates a new directory with the specified name and permission bits. -// If there is an error, it will be of type *PathError. -func Mkdir(name string, perm os.FileMode) error { - return mkdir(name, perm) -} - -// MkdirAll creates a directory named path, -// along with any necessary parents, and returns nil, -// or else returns an error. -// The permission bits perm are used for all -// directories that MkdirAll creates. -// If path is already a directory, MkdirAll does nothing -// and returns nil. -func MkdirAll(path string, perm os.FileMode) error { - return mkdirall(path, perm) -} - -// Readlink returns the destination of the named symbolic link. -// If there is an error, it will be of type *PathError. -func Readlink(name string) (string, error) { - return readlink(name) -} - -// Remove removes the named file or directory. -// If there is an error, it will be of type *PathError. -func Remove(name string) error { - return remove(name) -} - -// RemoveAll removes path and any children it contains. -// It removes everything it can but returns the first error -// it encounters. If the path does not exist, RemoveAll -// returns nil (no error). -func RemoveAll(path string) error { - return removeall(path) -} - -// Rename renames (moves) a file. OS-specific restrictions might apply. -// If there is an error, it will be of type *LinkError. -func Rename(oldpath, newpath string) error { - return rename(oldpath, newpath) -} - -// Symlink creates newname as a symbolic link to oldname. -// If there is an error, it will be of type *LinkError. -func Symlink(oldname, newname string) error { - return symlink(oldname, newname) -} - -// File - -// Create creates the named file with mode 0666 (before umask), truncating -// it if it already exists. If successful, methods on the returned -// File can be used for I/O; the associated file descriptor has mode -// O_RDWR. -// If there is an error, it will be of type *PathError. -func Create(name string) (*os.File, error) { - return create(name) -} - -// NewFile returns a new File with the given file descriptor and name. -func NewFile(fd uintptr, name string) *os.File { - return newfile(fd, name) -} - -// Open opens the named file for reading. If successful, methods on -// the returned file can be used for reading; the associated file -// descriptor has mode O_RDONLY. -// If there is an error, it will be of type *PathError. -func Open(name string) (*os.File, error) { - return open(name) -} - -// OpenFile is the generalized open call; most users will use Open -// or Create instead. It opens the named file with specified flag -// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful, -// methods on the returned File can be used for I/O. -// If there is an error, it will be of type *PathError. -func OpenFile(name string, flag int, perm os.FileMode) (*os.File, error) { - return openfile(name, flag, perm) -} - -// FileInfo - -// Lstat returns a FileInfo describing the named file. -// If the file is a symbolic link, the returned FileInfo -// describes the symbolic link. Lstat makes no attempt to follow the link. -// If there is an error, it will be of type *PathError. -func Lstat(name string) (os.FileInfo, error) { - return lstat(name) -} - -// Stat returns a FileInfo describing the named file. -// If there is an error, it will be of type *PathError. -func Stat(name string) (os.FileInfo, error) { - return stat(name) -} diff --git a/vendor/github.com/charlievieth/fs/fs_unix.go b/vendor/github.com/charlievieth/fs/fs_unix.go deleted file mode 100644 index 33561e0d..00000000 --- a/vendor/github.com/charlievieth/fs/fs_unix.go +++ /dev/null @@ -1,85 +0,0 @@ -//go:build !windows -// +build !windows - -package fs - -import ( - "os" - "time" -) - -func chdir(dir string) error { - return os.Chdir(dir) -} - -func chmod(name string, mode os.FileMode) error { - return os.Chmod(name, mode) -} - -func chown(name string, uid, gid int) error { - return os.Chown(name, uid, gid) -} - -func chtimes(name string, atime time.Time, mtime time.Time) error { - return os.Chtimes(name, atime, mtime) -} - -func lchown(name string, uid, gid int) error { - return os.Lchown(name, uid, gid) -} - -func link(oldname, newname string) error { - return os.Link(oldname, newname) -} - -func mkdir(name string, perm os.FileMode) error { - return os.Mkdir(name, perm) -} - -func mkdirall(path string, perm os.FileMode) error { - return os.MkdirAll(path, perm) -} - -func readlink(name string) (string, error) { - return os.Readlink(name) -} - -func remove(name string) error { - return os.Remove(name) -} - -func removeall(path string) error { - return os.RemoveAll(path) -} - -func rename(oldpath, newpath string) error { - return os.Rename(oldpath, newpath) -} - -func symlink(oldname, newname string) error { - return os.Symlink(oldname, newname) -} - -func create(name string) (*os.File, error) { - return os.Create(name) -} - -func newfile(fd uintptr, name string) *os.File { - return os.NewFile(fd, name) -} - -func open(name string) (*os.File, error) { - return os.Open(name) -} - -func openfile(name string, flag int, perm os.FileMode) (*os.File, error) { - return os.OpenFile(name, flag, perm) -} - -func lstat(name string) (os.FileInfo, error) { - return os.Lstat(name) -} - -func stat(name string) (os.FileInfo, error) { - return os.Stat(name) -} diff --git a/vendor/github.com/charlievieth/fs/fs_windows.go b/vendor/github.com/charlievieth/fs/fs_windows.go deleted file mode 100644 index d7fafe8f..00000000 --- a/vendor/github.com/charlievieth/fs/fs_windows.go +++ /dev/null @@ -1,293 +0,0 @@ -// The below code uses portions of the Go standard library. -// The full license can be found in fs.go. -// -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package fs - -import ( - "io" - "os" - "path/filepath" - "strings" - "syscall" - "time" - "unicode" -) - -// https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#maxpath -// -// When using an API to create a directory, the specified path cannot be so -// long that you cannot append an 8.3 file name (that is, the directory name -// cannot exceed MAX_PATH minus 12). -// -// MAX_PATH = 260 -// -const MAX_PATH = 248 // 260 - 12 - -func absPath(path string) (string, error) { - if filepath.IsAbs(path) { - return filepath.Clean(path), nil - } - return filepath.Abs(filepath.Clean(path)) -} - -func winPath(path string) (string, error) { - if len(path) == 0 || (len(path) >= 2 && path[:2] == `\\`) { - return path, nil - } - p, err := absPath(path) - if err != nil { - return "", err - } - if len(p) >= MAX_PATH { - return `\\?\` + strings.TrimRightFunc(p, unicode.IsSpace), nil - } - return path, nil -} - -func newPathError(op, path string, err error) error { - return &os.PathError{ - Op: "fs: " + op, - Path: path, - Err: err, - } -} - -func newLinkError(op, oldname, newname string, err error) error { - return &os.LinkError{ - Op: "fs: " + op, - Old: oldname, - New: newname, - Err: err, - } -} - -func chdir(dir string) error { - p, err := winPath(dir) - if err != nil { - return newPathError("chdir", dir, err) - } - return os.Chdir(p) -} - -func chmod(name string, mode os.FileMode) error { - p, err := winPath(name) - if err != nil { - return newPathError("chmod", name, err) - } - return os.Chmod(p, mode) -} - -func chown(name string, uid, gid int) error { - p, err := winPath(name) - if err != nil { - return newPathError("chown", name, err) - } - return os.Chown(p, uid, gid) -} - -func chtimes(name string, atime time.Time, mtime time.Time) error { - p, err := winPath(name) - if err != nil { - return newPathError("chtimes", name, err) - } - return os.Chtimes(p, atime, mtime) -} - -func lchown(name string, uid, gid int) error { - p, err := winPath(name) - if err != nil { - return newPathError("lchown", name, err) - } - return os.Lchown(p, uid, gid) -} - -func link(oldname, newname string) error { - op, err := winPath(oldname) - if err != nil { - return newLinkError("link", oldname, newname, err) - } - np, err := winPath(newname) - if err != nil { - return newLinkError("link", oldname, newname, err) - } - return os.Link(op, np) -} - -func mkdir(name string, perm os.FileMode) error { - p, err := winPath(name) - if err != nil { - return newPathError("mkdir", name, err) - } - return os.Mkdir(p, perm) -} - -func mkdirall(path string, perm os.FileMode) error { - p, err := winPath(path) - if err != nil { - return err - } - return os.MkdirAll(p, perm) -} - -func readlink(name string) (string, error) { - p, err := winPath(name) - if err != nil { - return "", newPathError("readlink", name, err) - } - return os.Readlink(p) -} - -func remove(name string) error { - p, err := winPath(name) - if err != nil { - return newPathError("remove", name, err) - } - return os.Remove(p) -} - -func removeall(name string) error { - path, err := winPath(name) - if err != nil { - return newPathError("remove", path, err) - } - // Simple case: if Remove works, we're done. - err = os.Remove(path) - if err == nil || os.IsNotExist(err) { - return nil - } - - // Otherwise, is this a directory we need to recurse into? - dir, serr := Lstat(path) - if serr != nil { - if serr, ok := serr.(*os.PathError); ok && (os.IsNotExist(serr.Err) || serr.Err == syscall.ENOTDIR) { - return nil - } - return serr - } - if !dir.IsDir() { - // Not a directory; return the error from Remove. - return err - } - - // Directory. - fd, err := Open(path) - if err != nil { - if os.IsNotExist(err) { - // Race. It was deleted between the Lstat and Open. - // Return nil per RemoveAll's docs. - return nil - } - return err - } - - // Remove contents & return first error. - err = nil - for { - names, err1 := fd.Readdirnames(100) - for _, name := range names { - err1 := RemoveAll(path + string(os.PathSeparator) + name) - if err == nil { - err = err1 - } - } - if err1 == io.EOF { - break - } - // If Readdirnames returned an error, use it. - if err == nil { - err = err1 - } - if len(names) == 0 { - break - } - } - - // Close directory, because windows won't remove opened directory. - fd.Close() - - // Remove directory. - err1 := Remove(path) - if err1 == nil || os.IsNotExist(err1) { - return nil - } - if err == nil { - err = err1 - } - return err -} - -func rename(oldpath, newpath string) error { - op, err := winPath(oldpath) - if err != nil { - return newLinkError("rename", oldpath, newpath, err) - } - np, err := winPath(newpath) - if err != nil { - return newLinkError("rename", oldpath, newpath, err) - } - return os.Rename(op, np) -} - -func symlink(oldname, newname string) error { - op, err := winPath(oldname) - if err != nil { - return newLinkError("symlink", oldname, newname, err) - } - np, err := winPath(newname) - if err != nil { - return newLinkError("symlink", oldname, newname, err) - } - return os.Symlink(op, np) -} - -func create(name string) (*os.File, error) { - p, err := winPath(name) - if err != nil { - return nil, newPathError("create", name, err) - } - return os.Create(p) -} - -func newfile(fd uintptr, name string) *os.File { - p, err := winPath(name) - if err != nil { - return os.NewFile(fd, name) - } - return os.NewFile(fd, p) -} - -func open(name string) (*os.File, error) { - p, err := winPath(name) - if err != nil { - return nil, newPathError("open", name, err) - } - return os.Open(p) -} - -func openfile(name string, flag int, perm os.FileMode) (*os.File, error) { - p, err := winPath(name) - if err != nil { - return nil, newPathError("openfile", name, err) - } - return os.OpenFile(p, flag, perm) -} - -func lstat(name string) (os.FileInfo, error) { - p, err := winPath(name) - if err != nil { - return nil, newPathError("lstat", name, err) - } - return os.Lstat(p) -} - -func stat(name string) (os.FileInfo, error) { - p, err := winPath(name) - if err != nil { - return nil, newPathError("stat", name, err) - } - return os.Stat(p) -} diff --git a/vendor/github.com/cloudfoundry/bosh-utils/errors/multi_error.go b/vendor/github.com/cloudfoundry/bosh-utils/errors/multi_error.go index e7dd48d0..24a5e631 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/errors/multi_error.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/errors/multi_error.go @@ -13,7 +13,7 @@ func NewMultiError(errors ...error) error { } func (e MultiError) Error() string { - errors := make([]string, len(e.Errors), len(e.Errors)) //nolint:gosimple + errors := make([]string, len(e.Errors)) for i, err := range e.Errors { errors[i] = err.Error() } diff --git a/vendor/github.com/cloudfoundry/bosh-utils/logger/logger.go b/vendor/github.com/cloudfoundry/bosh-utils/logger/logger.go index 2d6b0f2e..32cff824 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/logger/logger.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/logger/logger.go @@ -39,7 +39,7 @@ func Levelify(levelString string) (LogLevel, error) { level, ok := levels[upperLevelString] if !ok { expected := strings.Join(levelKeys, ", ") - return level, fmt.Errorf("Unknown LogLevel string '%s', expected one of [%s]", levelString, expected) + return level, fmt.Errorf("unknown LogLevel string '%s', expected one of [%s]", levelString, expected) } return level, nil } diff --git a/vendor/github.com/cloudfoundry/bosh-utils/system/fakes/fake_file_system.go b/vendor/github.com/cloudfoundry/bosh-utils/system/fakes/fake_file_system.go index 832c8d10..f22a8403 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/system/fakes/fake_file_system.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/system/fakes/fake_file_system.go @@ -220,7 +220,7 @@ func (f *FakeFile) WriteAt(b []byte, offset int64) (int, error) { func (f *FakeFile) Seek(offset int64, whence int) (int64, error) { if whence != io.SeekStart { - return -1, errors.New(`Invalid argument for "whence": only SeekStart is supported`) + return -1, errors.New(`invalid argument for "whence": only SeekStart is supported`) } f.readIndex = offset return f.readIndex, nil @@ -347,7 +347,7 @@ func (fs *FakeFileSystem) FindFileStats(path string) (*FakeFileStats, error) { if stats := fs.fileRegistry.Get(path); stats != nil { return stats, nil } - return nil, fmt.Errorf("Path does not exist: %s", path) + return nil, fmt.Errorf("path does not exist: %s", path) } func (fs *FakeFileSystem) OpenFile(path string, flag int, perm os.FileMode) (boshsys.File, error) { @@ -403,8 +403,6 @@ func (fs *FakeFileSystem) StatHelper(path string) (os.FileInfo, error) { if targetStats == nil { return nil, fmt.Errorf("stat: %s: no such file or directory", path) } - - stats = targetStats //nolint:staticcheck } return NewFakeFile(path, fs).Stat() @@ -474,7 +472,7 @@ func (fs *FakeFileSystem) Chown(path, username string) error { stats := fs.fileRegistry.Get(path) if stats == nil { - return fmt.Errorf("Path does not exist: %s", path) + return fmt.Errorf("path does not exist: %s", path) } parts := strings.Split(username, ":") @@ -498,7 +496,7 @@ func (fs *FakeFileSystem) Chmod(path string, perm os.FileMode) error { stats := fs.fileRegistry.Get(path) if stats == nil { - return fmt.Errorf("Path does not exist: %s", path) + return fmt.Errorf("path does not exist: %s", path) } stats.FileMode = perm @@ -576,13 +574,13 @@ func (fs *FakeFileSystem) ConvergeFileContents(path string, content []byte, opts if stats == nil { return true, nil } - return bytes.Compare(stats.Content, content) != 0, nil //nolint:gosimple + return !bytes.Equal(stats.Content, content), nil } stats := fs.getOrCreateFile(path) stats.FileType = FakeFileTypeFile - if bytes.Compare(stats.Content, content) != 0 { //nolint:gosimple + if !bytes.Equal(stats.Content, content) { stats.Content = content return true, nil } @@ -663,12 +661,12 @@ func (fs *FakeFileSystem) Rename(oldPath, newPath string) error { parentDir := gopath.Dir(newPath) if parentDir != "." && fs.fileRegistry.Get(parentDir) == nil { - return errors.New("Parent directory does not exist") + return errors.New("parent directory does not exist") } stats := fs.fileRegistry.Get(oldPath) if stats == nil { - return errors.New("Old path did not exist") + return errors.New("old path did not exist") } fs.RenameOldPaths = append(fs.RenameOldPaths, oldPath) @@ -834,7 +832,7 @@ func (fs *FakeFileSystem) TempFile(prefix string) (file boshsys.File, err error) } if fs.strictTempRoot && fs.TempRootPath == "" { - return nil, errors.New("Temp file was requested without having set a temp root") + return nil, errors.New("temp file was requested without having set a temp root") } if fs.ReturnTempFilesByPrefix != nil { @@ -867,7 +865,7 @@ func (fs *FakeFileSystem) TempDir(prefix string) (string, error) { } if fs.strictTempRoot && fs.TempRootPath == "" { - return "", errors.New("Temp file was requested without having set a temp root") + return "", errors.New("temp file was requested without having set a temp root") } var path string @@ -875,7 +873,7 @@ func (fs *FakeFileSystem) TempDir(prefix string) (string, error) { path = fs.TempDirDir } else if fs.TempDirDirs != nil { if len(fs.TempDirDirs) == 0 { - return "", errors.New("Failed to create new temp dir: TempDirDirs is empty") + return "", errors.New("failed to create new temp dir: TempDirDirs is empty") } path = fs.TempDirDirs[0] fs.TempDirDirs = fs.TempDirDirs[1:] diff --git a/vendor/github.com/cloudfoundry/bosh-utils/system/ip_helper.go b/vendor/github.com/cloudfoundry/bosh-utils/system/ip_helper.go index 421b22a0..cc0c3a73 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/system/ip_helper.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/system/ip_helper.go @@ -9,12 +9,12 @@ import ( func CalculateNetworkAndBroadcast(ipAddress, netmask string) (string, string, int, error) { ip := net.ParseIP(ipAddress) if ip == nil { - return "", "", 0, fmt.Errorf("Invalid IP '%s'", ipAddress) + return "", "", 0, fmt.Errorf("invalid IP '%s'", ipAddress) } mask := net.ParseIP(netmask) if mask == nil { - return "", "", 0, fmt.Errorf("Invalid netmask '%s'", netmask) + return "", "", 0, fmt.Errorf("invalid netmask '%s'", netmask) } ip = ip.To4() diff --git a/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system.go b/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system.go index 4b127ddd..d0d61130 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system.go @@ -10,7 +10,6 @@ import ( "strings" "github.com/bmatcuk/doublestar" - fsWrapper "github.com/charlievieth/fs" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshlog "github.com/cloudfoundry/bosh-utils/logger" ) @@ -61,7 +60,7 @@ func (fs *osFileSystem) ExpandPath(path string) (string, error) { func (fs *osFileSystem) MkdirAll(path string, perm os.FileMode) (err error) { fs.logger.Debug(fs.logTag, "Making dir %s with perm %#o", path, perm) - return fsWrapper.MkdirAll(path, perm) + return os.MkdirAll(path, perm) } func (fs *osFileSystem) Chown(path, username string) error { @@ -71,11 +70,11 @@ func (fs *osFileSystem) Chown(path, username string) error { func (fs *osFileSystem) Chmod(path string, perm os.FileMode) (err error) { fs.logger.Debug(fs.logTag, "Chmod %s to %d", path, perm) - return fsWrapper.Chmod(path, perm) + return os.Chmod(path, perm) } func (fs *osFileSystem) openFile(path string, flag int, perm os.FileMode) (*os.File, error) { - return fsWrapper.OpenFile(path, flag, perm) + return os.OpenFile(path, flag, perm) } func (fs *osFileSystem) OpenFile(path string, flag int, perm os.FileMode) (File, error) { @@ -90,7 +89,7 @@ func (fs *osFileSystem) StatWithOpts(path string, opts StatOpts) (os.FileInfo, e if !opts.Quiet { fs.logger.Debug(fs.logTag, "Stat '%s'", path) } - return fsWrapper.Stat(path) + return os.Stat(path) } func (fs *osFileSystem) Stat(path string) (os.FileInfo, error) { @@ -99,7 +98,7 @@ func (fs *osFileSystem) Stat(path string) (os.FileInfo, error) { func (fs *osFileSystem) Lstat(path string) (os.FileInfo, error) { fs.logger.Debug(fs.logTag, "Lstat '%s'", path) - return fsWrapper.Lstat(path) + return os.Lstat(path) } func (fs *osFileSystem) WriteFileString(path, content string) (err error) { @@ -244,7 +243,7 @@ func (fs *osFileSystem) Rename(oldPath, newPath string) (err error) { fs.logger.Debug(fs.logTag, "Renaming %s to %s", oldPath, newPath) fs.RemoveAll(newPath) //nolint:errcheck - return fsWrapper.Rename(oldPath, newPath) + return os.Rename(oldPath, newPath) } func (fs *osFileSystem) Symlink(oldPath, newPath string) error { @@ -275,7 +274,7 @@ func (fs *osFileSystem) Symlink(oldPath, newPath string) error { fs.MkdirAll(containingDir, os.FileMode(0700)) //nolint:errcheck } - return fsWrapper.Symlink(source, target) + return os.Symlink(source, target) } func (fs *osFileSystem) ReadAndFollowLink(symlinkPath string) (targetPath string, err error) { @@ -283,7 +282,7 @@ func (fs *osFileSystem) ReadAndFollowLink(symlinkPath string) (targetPath string } func (fs *osFileSystem) Readlink(symlinkPath string) (targetPath string, err error) { - return fsWrapper.Readlink(symlinkPath) + return os.Readlink(symlinkPath) } func (fs *osFileSystem) CopyFile(srcPath, dstPath string) error { @@ -372,7 +371,7 @@ func (fs *osFileSystem) listDirContents(dirPath string) ([]os.FileInfo, error) { func (fs *osFileSystem) TempFile(prefix string) (file File, err error) { fs.logger.Debug(fs.logTag, "Creating temp file with prefix %s", prefix) if fs.tempRoot == "" && fs.requiresTempRoot { - return nil, errors.New("Set a temp directory root with ChangeTempRoot before making temp files") + return nil, errors.New("set a temp directory root with ChangeTempRoot before making temp files") } return os.CreateTemp(fs.tempRoot, prefix) } @@ -380,7 +379,7 @@ func (fs *osFileSystem) TempFile(prefix string) (file File, err error) { func (fs *osFileSystem) TempDir(prefix string) (path string, err error) { fs.logger.Debug(fs.logTag, "Creating temp dir with prefix %s", prefix) if fs.tempRoot == "" && fs.requiresTempRoot { - return "", errors.New("Set a temp directory root with ChangeTempRoot before making temp directories") + return "", errors.New("set a temp directory root with ChangeTempRoot before making temp directories") } return os.MkdirTemp(fs.tempRoot, prefix) } @@ -396,7 +395,7 @@ func (fs *osFileSystem) ChangeTempRoot(tempRootPath string) error { func (fs *osFileSystem) RemoveAll(fileOrDir string) (err error) { fs.logger.Debug(fs.logTag, "Remove all %s", fileOrDir) - err = fsWrapper.RemoveAll(fileOrDir) + err = os.RemoveAll(fileOrDir) return } diff --git a/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system_unix.go b/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system_unix.go index e3328742..7f62abdf 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system_unix.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/system/os_file_system_unix.go @@ -1,4 +1,5 @@ -//+build !windows +//go:build !windows +// +build !windows package system @@ -23,7 +24,7 @@ func (fs *osFileSystem) homeDir(username string) (string, error) { func (fs *osFileSystem) chown(path, owner string) error { if owner == "" { - return errors.New("Failed to lookup user ''") + return errors.New("failed to lookup user ''") } var group string @@ -35,7 +36,7 @@ func (fs *osFileSystem) chown(path, owner string) error { if len(ownerSplit) <= 1 { group, err = fs.runCommand(fmt.Sprintf("id -g %s", user)) if err != nil { - return bosherr.WrapErrorf(err, "Failed to lookup user '%s'", user) + return bosherr.WrapErrorf(err, "failed to lookup user '%s'", user) } } else { group = ownerSplit[1] @@ -43,7 +44,7 @@ func (fs *osFileSystem) chown(path, owner string) error { _, err = fs.runCommand(fmt.Sprintf("chown '%s:%s' '%s'", user, group, path)) if err != nil { - return bosherr.WrapError(err, "Failed to chown") + return bosherr.WrapError(err, "failed to chown") } return nil diff --git a/vendor/github.com/onsi/gomega/CHANGELOG.md b/vendor/github.com/onsi/gomega/CHANGELOG.md index cf020605..91e65521 100644 --- a/vendor/github.com/onsi/gomega/CHANGELOG.md +++ b/vendor/github.com/onsi/gomega/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.39.1 + +Update all dependencies. This auto-updated the required version of Go to 1.24, consistent with the fact that Go 1.23 has been out of support for almost six months. + ## 1.39.0 ### Features diff --git a/vendor/github.com/onsi/gomega/gomega_dsl.go b/vendor/github.com/onsi/gomega/gomega_dsl.go index cd6ce450..87c70692 100644 --- a/vendor/github.com/onsi/gomega/gomega_dsl.go +++ b/vendor/github.com/onsi/gomega/gomega_dsl.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/types" ) -const GOMEGA_VERSION = "1.39.0" +const GOMEGA_VERSION = "1.39.1" const nilGomegaPanic = `You are trying to make an assertion, but haven't registered Gomega's fail handler. If you're using Ginkgo then you probably forgot to put your assertion in an It(). diff --git a/vendor/golang.org/x/net/html/iter.go b/vendor/golang.org/x/net/html/iter.go index 54be8fd3..349ef73e 100644 --- a/vendor/golang.org/x/net/html/iter.go +++ b/vendor/golang.org/x/net/html/iter.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.23 - package html import "iter" diff --git a/vendor/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go index 77741a19..253e4679 100644 --- a/vendor/golang.org/x/net/html/node.go +++ b/vendor/golang.org/x/net/html/node.go @@ -11,6 +11,7 @@ import ( // A NodeType is the type of a Node. type NodeType uint32 +//go:generate stringer -type NodeType const ( ErrorNode NodeType = iota TextNode diff --git a/vendor/golang.org/x/net/html/nodetype_string.go b/vendor/golang.org/x/net/html/nodetype_string.go new file mode 100644 index 00000000..8253af49 --- /dev/null +++ b/vendor/golang.org/x/net/html/nodetype_string.go @@ -0,0 +1,31 @@ +// Code generated by "stringer -type NodeType"; DO NOT EDIT. + +package html + +import "strconv" + +func _() { + // An "invalid array index" compiler error signifies that the constant values have changed. + // Re-run the stringer command to generate them again. + var x [1]struct{} + _ = x[ErrorNode-0] + _ = x[TextNode-1] + _ = x[DocumentNode-2] + _ = x[ElementNode-3] + _ = x[CommentNode-4] + _ = x[DoctypeNode-5] + _ = x[RawNode-6] + _ = x[scopeMarkerNode-7] +} + +const _NodeType_name = "ErrorNodeTextNodeDocumentNodeElementNodeCommentNodeDoctypeNodeRawNodescopeMarkerNode" + +var _NodeType_index = [...]uint8{0, 9, 17, 29, 40, 51, 62, 69, 84} + +func (i NodeType) String() string { + idx := int(i) - 0 + if i < 0 || idx >= len(_NodeType_index)-1 { + return "NodeType(" + strconv.FormatInt(int64(i), 10) + ")" + } + return _NodeType_name[_NodeType_index[idx]:_NodeType_index[idx+1]] +} diff --git a/vendor/golang.org/x/sys/unix/ioctl_signed.go b/vendor/golang.org/x/sys/unix/ioctl_signed.go index 5b0759bd..be0f3fba 100644 --- a/vendor/golang.org/x/sys/unix/ioctl_signed.go +++ b/vendor/golang.org/x/sys/unix/ioctl_signed.go @@ -6,9 +6,7 @@ package unix -import ( - "unsafe" -) +import "unsafe" // ioctl itself should not be exposed directly, but additional get/set // functions for specific types are permissible. @@ -28,6 +26,13 @@ func IoctlSetPointerInt(fd int, req int, value int) error { return ioctlPtr(fd, req, unsafe.Pointer(&v)) } +// IoctlSetString performs an ioctl operation which sets a string value +// on fd, using the specified request number. +func IoctlSetString(fd int, req int, value string) error { + bs := append([]byte(value), 0) + return ioctlPtr(fd, req, unsafe.Pointer(&bs[0])) +} + // IoctlSetWinsize performs an ioctl on fd with a *Winsize argument. // // To change fd's window size, the req argument should be TIOCSWINSZ. diff --git a/vendor/golang.org/x/sys/unix/ioctl_unsigned.go b/vendor/golang.org/x/sys/unix/ioctl_unsigned.go index 20f470b9..f0c28213 100644 --- a/vendor/golang.org/x/sys/unix/ioctl_unsigned.go +++ b/vendor/golang.org/x/sys/unix/ioctl_unsigned.go @@ -6,9 +6,7 @@ package unix -import ( - "unsafe" -) +import "unsafe" // ioctl itself should not be exposed directly, but additional get/set // functions for specific types are permissible. @@ -28,6 +26,13 @@ func IoctlSetPointerInt(fd int, req uint, value int) error { return ioctlPtr(fd, req, unsafe.Pointer(&v)) } +// IoctlSetString performs an ioctl operation which sets a string value +// on fd, using the specified request number. +func IoctlSetString(fd int, req uint, value string) error { + bs := append([]byte(value), 0) + return ioctlPtr(fd, req, unsafe.Pointer(&bs[0])) +} + // IoctlSetWinsize performs an ioctl on fd with a *Winsize argument. // // To change fd's window size, the req argument should be TIOCSWINSZ. diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go index 18a3d9bd..a6a2ea0c 100644 --- a/vendor/golang.org/x/sys/unix/syscall_solaris.go +++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go @@ -1052,14 +1052,6 @@ func IoctlSetIntRetInt(fd int, req int, arg int) (int, error) { return ioctlRet(fd, req, uintptr(arg)) } -func IoctlSetString(fd int, req int, val string) error { - bs := make([]byte, len(val)+1) - copy(bs[:len(bs)-1], val) - err := ioctlPtr(fd, req, unsafe.Pointer(&bs[0])) - runtime.KeepAlive(&bs[0]) - return err -} - // Lifreq Helpers func (l *Lifreq) SetName(name string) error { diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go index 4e92e5aa..de6fccf9 100644 --- a/vendor/golang.org/x/sys/unix/syscall_unix.go +++ b/vendor/golang.org/x/sys/unix/syscall_unix.go @@ -367,7 +367,9 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from iov[0].SetLen(len(p)) } var rsa RawSockaddrAny - n, oobn, recvflags, err = recvmsgRaw(fd, iov[:], oob, flags, &rsa) + if n, oobn, recvflags, err = recvmsgRaw(fd, iov[:], oob, flags, &rsa); err != nil { + return + } // source address is only specified if the socket is unconnected if rsa.Addr.Family != AF_UNSPEC { from, err = anyToSockaddr(fd, &rsa) @@ -389,8 +391,10 @@ func RecvmsgBuffers(fd int, buffers [][]byte, oob []byte, flags int) (n, oobn in } } var rsa RawSockaddrAny - n, oobn, recvflags, err = recvmsgRaw(fd, iov, oob, flags, &rsa) - if err == nil && rsa.Addr.Family != AF_UNSPEC { + if n, oobn, recvflags, err = recvmsgRaw(fd, iov, oob, flags, &rsa); err != nil { + return + } + if rsa.Addr.Family != AF_UNSPEC { from, err = anyToSockaddr(fd, &rsa) } return diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go index c1a46701..45476a73 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -593,110 +593,115 @@ const ( ) const ( - NDA_UNSPEC = 0x0 - NDA_DST = 0x1 - NDA_LLADDR = 0x2 - NDA_CACHEINFO = 0x3 - NDA_PROBES = 0x4 - NDA_VLAN = 0x5 - NDA_PORT = 0x6 - NDA_VNI = 0x7 - NDA_IFINDEX = 0x8 - NDA_MASTER = 0x9 - NDA_LINK_NETNSID = 0xa - NDA_SRC_VNI = 0xb - NTF_USE = 0x1 - NTF_SELF = 0x2 - NTF_MASTER = 0x4 - NTF_PROXY = 0x8 - NTF_EXT_LEARNED = 0x10 - NTF_OFFLOADED = 0x20 - NTF_ROUTER = 0x80 - NUD_INCOMPLETE = 0x1 - NUD_REACHABLE = 0x2 - NUD_STALE = 0x4 - NUD_DELAY = 0x8 - NUD_PROBE = 0x10 - NUD_FAILED = 0x20 - NUD_NOARP = 0x40 - NUD_PERMANENT = 0x80 - NUD_NONE = 0x0 - IFA_UNSPEC = 0x0 - IFA_ADDRESS = 0x1 - IFA_LOCAL = 0x2 - IFA_LABEL = 0x3 - IFA_BROADCAST = 0x4 - IFA_ANYCAST = 0x5 - IFA_CACHEINFO = 0x6 - IFA_MULTICAST = 0x7 - IFA_FLAGS = 0x8 - IFA_RT_PRIORITY = 0x9 - IFA_TARGET_NETNSID = 0xa - IFAL_LABEL = 0x2 - IFAL_ADDRESS = 0x1 - RT_SCOPE_UNIVERSE = 0x0 - RT_SCOPE_SITE = 0xc8 - RT_SCOPE_LINK = 0xfd - RT_SCOPE_HOST = 0xfe - RT_SCOPE_NOWHERE = 0xff - RT_TABLE_UNSPEC = 0x0 - RT_TABLE_COMPAT = 0xfc - RT_TABLE_DEFAULT = 0xfd - RT_TABLE_MAIN = 0xfe - RT_TABLE_LOCAL = 0xff - RT_TABLE_MAX = 0xffffffff - RTA_UNSPEC = 0x0 - RTA_DST = 0x1 - RTA_SRC = 0x2 - RTA_IIF = 0x3 - RTA_OIF = 0x4 - RTA_GATEWAY = 0x5 - RTA_PRIORITY = 0x6 - RTA_PREFSRC = 0x7 - RTA_METRICS = 0x8 - RTA_MULTIPATH = 0x9 - RTA_FLOW = 0xb - RTA_CACHEINFO = 0xc - RTA_TABLE = 0xf - RTA_MARK = 0x10 - RTA_MFC_STATS = 0x11 - RTA_VIA = 0x12 - RTA_NEWDST = 0x13 - RTA_PREF = 0x14 - RTA_ENCAP_TYPE = 0x15 - RTA_ENCAP = 0x16 - RTA_EXPIRES = 0x17 - RTA_PAD = 0x18 - RTA_UID = 0x19 - RTA_TTL_PROPAGATE = 0x1a - RTA_IP_PROTO = 0x1b - RTA_SPORT = 0x1c - RTA_DPORT = 0x1d - RTN_UNSPEC = 0x0 - RTN_UNICAST = 0x1 - RTN_LOCAL = 0x2 - RTN_BROADCAST = 0x3 - RTN_ANYCAST = 0x4 - RTN_MULTICAST = 0x5 - RTN_BLACKHOLE = 0x6 - RTN_UNREACHABLE = 0x7 - RTN_PROHIBIT = 0x8 - RTN_THROW = 0x9 - RTN_NAT = 0xa - RTN_XRESOLVE = 0xb - SizeofNlMsghdr = 0x10 - SizeofNlMsgerr = 0x14 - SizeofRtGenmsg = 0x1 - SizeofNlAttr = 0x4 - SizeofRtAttr = 0x4 - SizeofIfInfomsg = 0x10 - SizeofIfAddrmsg = 0x8 - SizeofIfAddrlblmsg = 0xc - SizeofIfaCacheinfo = 0x10 - SizeofRtMsg = 0xc - SizeofRtNexthop = 0x8 - SizeofNdUseroptmsg = 0x10 - SizeofNdMsg = 0xc + NDA_UNSPEC = 0x0 + NDA_DST = 0x1 + NDA_LLADDR = 0x2 + NDA_CACHEINFO = 0x3 + NDA_PROBES = 0x4 + NDA_VLAN = 0x5 + NDA_PORT = 0x6 + NDA_VNI = 0x7 + NDA_IFINDEX = 0x8 + NDA_MASTER = 0x9 + NDA_LINK_NETNSID = 0xa + NDA_SRC_VNI = 0xb + NTF_USE = 0x1 + NTF_SELF = 0x2 + NTF_MASTER = 0x4 + NTF_PROXY = 0x8 + NTF_EXT_LEARNED = 0x10 + NTF_OFFLOADED = 0x20 + NTF_ROUTER = 0x80 + NUD_INCOMPLETE = 0x1 + NUD_REACHABLE = 0x2 + NUD_STALE = 0x4 + NUD_DELAY = 0x8 + NUD_PROBE = 0x10 + NUD_FAILED = 0x20 + NUD_NOARP = 0x40 + NUD_PERMANENT = 0x80 + NUD_NONE = 0x0 + IFA_UNSPEC = 0x0 + IFA_ADDRESS = 0x1 + IFA_LOCAL = 0x2 + IFA_LABEL = 0x3 + IFA_BROADCAST = 0x4 + IFA_ANYCAST = 0x5 + IFA_CACHEINFO = 0x6 + IFA_MULTICAST = 0x7 + IFA_FLAGS = 0x8 + IFA_RT_PRIORITY = 0x9 + IFA_TARGET_NETNSID = 0xa + IFAL_LABEL = 0x2 + IFAL_ADDRESS = 0x1 + RT_SCOPE_UNIVERSE = 0x0 + RT_SCOPE_SITE = 0xc8 + RT_SCOPE_LINK = 0xfd + RT_SCOPE_HOST = 0xfe + RT_SCOPE_NOWHERE = 0xff + RT_TABLE_UNSPEC = 0x0 + RT_TABLE_COMPAT = 0xfc + RT_TABLE_DEFAULT = 0xfd + RT_TABLE_MAIN = 0xfe + RT_TABLE_LOCAL = 0xff + RT_TABLE_MAX = 0xffffffff + RTA_UNSPEC = 0x0 + RTA_DST = 0x1 + RTA_SRC = 0x2 + RTA_IIF = 0x3 + RTA_OIF = 0x4 + RTA_GATEWAY = 0x5 + RTA_PRIORITY = 0x6 + RTA_PREFSRC = 0x7 + RTA_METRICS = 0x8 + RTA_MULTIPATH = 0x9 + RTA_FLOW = 0xb + RTA_CACHEINFO = 0xc + RTA_TABLE = 0xf + RTA_MARK = 0x10 + RTA_MFC_STATS = 0x11 + RTA_VIA = 0x12 + RTA_NEWDST = 0x13 + RTA_PREF = 0x14 + RTA_ENCAP_TYPE = 0x15 + RTA_ENCAP = 0x16 + RTA_EXPIRES = 0x17 + RTA_PAD = 0x18 + RTA_UID = 0x19 + RTA_TTL_PROPAGATE = 0x1a + RTA_IP_PROTO = 0x1b + RTA_SPORT = 0x1c + RTA_DPORT = 0x1d + RTN_UNSPEC = 0x0 + RTN_UNICAST = 0x1 + RTN_LOCAL = 0x2 + RTN_BROADCAST = 0x3 + RTN_ANYCAST = 0x4 + RTN_MULTICAST = 0x5 + RTN_BLACKHOLE = 0x6 + RTN_UNREACHABLE = 0x7 + RTN_PROHIBIT = 0x8 + RTN_THROW = 0x9 + RTN_NAT = 0xa + RTN_XRESOLVE = 0xb + PREFIX_UNSPEC = 0x0 + PREFIX_ADDRESS = 0x1 + PREFIX_CACHEINFO = 0x2 + SizeofNlMsghdr = 0x10 + SizeofNlMsgerr = 0x14 + SizeofRtGenmsg = 0x1 + SizeofNlAttr = 0x4 + SizeofRtAttr = 0x4 + SizeofIfInfomsg = 0x10 + SizeofPrefixmsg = 0xc + SizeofPrefixCacheinfo = 0x8 + SizeofIfAddrmsg = 0x8 + SizeofIfAddrlblmsg = 0xc + SizeofIfaCacheinfo = 0x10 + SizeofRtMsg = 0xc + SizeofRtNexthop = 0x8 + SizeofNdUseroptmsg = 0x10 + SizeofNdMsg = 0xc ) type NlMsghdr struct { @@ -735,6 +740,22 @@ type IfInfomsg struct { Change uint32 } +type Prefixmsg struct { + Family uint8 + Pad1 uint8 + Pad2 uint16 + Ifindex int32 + Type uint8 + Len uint8 + Flags uint8 + Pad3 uint8 +} + +type PrefixCacheinfo struct { + Preferred_time uint32 + Valid_time uint32 +} + type IfAddrmsg struct { Family uint8 Prefixlen uint8 diff --git a/vendor/golang.org/x/sys/windows/aliases.go b/vendor/golang.org/x/sys/windows/aliases.go index 16f90560..96317966 100644 --- a/vendor/golang.org/x/sys/windows/aliases.go +++ b/vendor/golang.org/x/sys/windows/aliases.go @@ -8,5 +8,6 @@ package windows import "syscall" +type Signal = syscall.Signal type Errno = syscall.Errno type SysProcAttr = syscall.SysProcAttr diff --git a/vendor/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go index 3ca814f5..1157b06d 100644 --- a/vendor/golang.org/x/sys/windows/dll_windows.go +++ b/vendor/golang.org/x/sys/windows/dll_windows.go @@ -163,42 +163,7 @@ func (p *Proc) Addr() uintptr { // (according to the semantics of the specific function being called) before consulting // the error. The error will be guaranteed to contain windows.Errno. func (p *Proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) { - switch len(a) { - case 0: - return syscall.Syscall(p.Addr(), uintptr(len(a)), 0, 0, 0) - case 1: - return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], 0, 0) - case 2: - return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], 0) - case 3: - return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], a[2]) - case 4: - return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], 0, 0) - case 5: - return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], 0) - case 6: - return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5]) - case 7: - return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0) - case 8: - return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0) - case 9: - return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8]) - case 10: - return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0) - case 11: - return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0) - case 12: - return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11]) - case 13: - return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0) - case 14: - return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0) - case 15: - return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14]) - default: - panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".") - } + return syscall.SyscallN(p.Addr(), a...) } // A LazyDLL implements access to a single DLL. diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go index a8b0364c..6c955cea 100644 --- a/vendor/golang.org/x/sys/windows/security_windows.go +++ b/vendor/golang.org/x/sys/windows/security_windows.go @@ -1438,13 +1438,17 @@ func GetSecurityInfo(handle Handle, objectType SE_OBJECT_TYPE, securityInformati } // GetNamedSecurityInfo queries the security information for a given named object and returns the self-relative security -// descriptor result on the Go heap. +// descriptor result on the Go heap. The security descriptor might be nil, even when err is nil, if the object exists +// but has no security descriptor. func GetNamedSecurityInfo(objectName string, objectType SE_OBJECT_TYPE, securityInformation SECURITY_INFORMATION) (sd *SECURITY_DESCRIPTOR, err error) { var winHeapSD *SECURITY_DESCRIPTOR err = getNamedSecurityInfo(objectName, objectType, securityInformation, nil, nil, nil, nil, &winHeapSD) if err != nil { return } + if winHeapSD == nil { + return nil, nil + } defer LocalFree(Handle(unsafe.Pointer(winHeapSD))) return winHeapSD.copySelfRelativeSecurityDescriptor(), nil } diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index 69439df2..d7664365 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -900,6 +900,7 @@ const socket_error = uintptr(^uint32(0)) //sys NotifyRouteChange2(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyRouteChange2 //sys NotifyUnicastIpAddressChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyUnicastIpAddressChange //sys CancelMibChangeNotify2(notificationHandle Handle) (errcode error) = iphlpapi.CancelMibChangeNotify2 +//sys IsProcessorFeaturePresent(ProcessorFeature uint32) (ret bool) = kernel32.IsProcessorFeaturePresent // For testing: clients can set this flag to force // creation of IPv6 sockets to return EAFNOSUPPORT. @@ -1489,20 +1490,6 @@ func Getgid() (gid int) { return -1 } func Getegid() (egid int) { return -1 } func Getgroups() (gids []int, err error) { return nil, syscall.EWINDOWS } -type Signal int - -func (s Signal) Signal() {} - -func (s Signal) String() string { - if 0 <= s && int(s) < len(signals) { - str := signals[s] - if str != "" { - return str - } - } - return "signal " + itoa(int(s)) -} - func LoadCreateSymbolicLink() error { return procCreateSymbolicLinkW.Find() } diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index 6e4f50eb..d5658a13 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -3938,3 +3938,88 @@ const ( MOUSE_EVENT = 0x0002 WINDOW_BUFFER_SIZE_EVENT = 0x0004 ) + +// The processor features to be tested for IsProcessorFeaturePresent, see +// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-isprocessorfeaturepresent +const ( + PF_ARM_64BIT_LOADSTORE_ATOMIC = 25 + PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE = 24 + PF_ARM_EXTERNAL_CACHE_AVAILABLE = 26 + PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE = 27 + PF_ARM_VFP_32_REGISTERS_AVAILABLE = 18 + PF_3DNOW_INSTRUCTIONS_AVAILABLE = 7 + PF_CHANNELS_ENABLED = 16 + PF_COMPARE_EXCHANGE_DOUBLE = 2 + PF_COMPARE_EXCHANGE128 = 14 + PF_COMPARE64_EXCHANGE128 = 15 + PF_FASTFAIL_AVAILABLE = 23 + PF_FLOATING_POINT_EMULATED = 1 + PF_FLOATING_POINT_PRECISION_ERRATA = 0 + PF_MMX_INSTRUCTIONS_AVAILABLE = 3 + PF_NX_ENABLED = 12 + PF_PAE_ENABLED = 9 + PF_RDTSC_INSTRUCTION_AVAILABLE = 8 + PF_RDWRFSGSBASE_AVAILABLE = 22 + PF_SECOND_LEVEL_ADDRESS_TRANSLATION = 20 + PF_SSE3_INSTRUCTIONS_AVAILABLE = 13 + PF_SSSE3_INSTRUCTIONS_AVAILABLE = 36 + PF_SSE4_1_INSTRUCTIONS_AVAILABLE = 37 + PF_SSE4_2_INSTRUCTIONS_AVAILABLE = 38 + PF_AVX_INSTRUCTIONS_AVAILABLE = 39 + PF_AVX2_INSTRUCTIONS_AVAILABLE = 40 + PF_AVX512F_INSTRUCTIONS_AVAILABLE = 41 + PF_VIRT_FIRMWARE_ENABLED = 21 + PF_XMMI_INSTRUCTIONS_AVAILABLE = 6 + PF_XMMI64_INSTRUCTIONS_AVAILABLE = 10 + PF_XSAVE_ENABLED = 17 + PF_ARM_V8_INSTRUCTIONS_AVAILABLE = 29 + PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE = 30 + PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE = 31 + PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE = 34 + PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE = 43 + PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE = 44 + PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE = 45 + PF_ARM_SVE_INSTRUCTIONS_AVAILABLE = 46 + PF_ARM_SVE2_INSTRUCTIONS_AVAILABLE = 47 + PF_ARM_SVE2_1_INSTRUCTIONS_AVAILABLE = 48 + PF_ARM_SVE_AES_INSTRUCTIONS_AVAILABLE = 49 + PF_ARM_SVE_PMULL128_INSTRUCTIONS_AVAILABLE = 50 + PF_ARM_SVE_BITPERM_INSTRUCTIONS_AVAILABLE = 51 + PF_ARM_SVE_BF16_INSTRUCTIONS_AVAILABLE = 52 + PF_ARM_SVE_EBF16_INSTRUCTIONS_AVAILABLE = 53 + PF_ARM_SVE_B16B16_INSTRUCTIONS_AVAILABLE = 54 + PF_ARM_SVE_SHA3_INSTRUCTIONS_AVAILABLE = 55 + PF_ARM_SVE_SM4_INSTRUCTIONS_AVAILABLE = 56 + PF_ARM_SVE_I8MM_INSTRUCTIONS_AVAILABLE = 57 + PF_ARM_SVE_F32MM_INSTRUCTIONS_AVAILABLE = 58 + PF_ARM_SVE_F64MM_INSTRUCTIONS_AVAILABLE = 59 + PF_BMI2_INSTRUCTIONS_AVAILABLE = 60 + PF_MOVDIR64B_INSTRUCTION_AVAILABLE = 61 + PF_ARM_LSE2_AVAILABLE = 62 + PF_ARM_SHA3_INSTRUCTIONS_AVAILABLE = 64 + PF_ARM_SHA512_INSTRUCTIONS_AVAILABLE = 65 + PF_ARM_V82_I8MM_INSTRUCTIONS_AVAILABLE = 66 + PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE = 67 + PF_ARM_V86_BF16_INSTRUCTIONS_AVAILABLE = 68 + PF_ARM_V86_EBF16_INSTRUCTIONS_AVAILABLE = 69 + PF_ARM_SME_INSTRUCTIONS_AVAILABLE = 70 + PF_ARM_SME2_INSTRUCTIONS_AVAILABLE = 71 + PF_ARM_SME2_1_INSTRUCTIONS_AVAILABLE = 72 + PF_ARM_SME2_2_INSTRUCTIONS_AVAILABLE = 73 + PF_ARM_SME_AES_INSTRUCTIONS_AVAILABLE = 74 + PF_ARM_SME_SBITPERM_INSTRUCTIONS_AVAILABLE = 75 + PF_ARM_SME_SF8MM4_INSTRUCTIONS_AVAILABLE = 76 + PF_ARM_SME_SF8MM8_INSTRUCTIONS_AVAILABLE = 77 + PF_ARM_SME_SF8DP2_INSTRUCTIONS_AVAILABLE = 78 + PF_ARM_SME_SF8DP4_INSTRUCTIONS_AVAILABLE = 79 + PF_ARM_SME_SF8FMA_INSTRUCTIONS_AVAILABLE = 80 + PF_ARM_SME_F8F32_INSTRUCTIONS_AVAILABLE = 81 + PF_ARM_SME_F8F16_INSTRUCTIONS_AVAILABLE = 82 + PF_ARM_SME_F16F16_INSTRUCTIONS_AVAILABLE = 83 + PF_ARM_SME_B16B16_INSTRUCTIONS_AVAILABLE = 84 + PF_ARM_SME_F64F64_INSTRUCTIONS_AVAILABLE = 85 + PF_ARM_SME_I16I64_INSTRUCTIONS_AVAILABLE = 86 + PF_ARM_SME_LUTv2_INSTRUCTIONS_AVAILABLE = 87 + PF_ARM_SME_FA64_INSTRUCTIONS_AVAILABLE = 88 + PF_UMONITOR_INSTRUCTION_AVAILABLE = 89 +) diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go index f25b7308..fe7a4ea1 100644 --- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go +++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go @@ -320,6 +320,7 @@ var ( procGetVolumePathNamesForVolumeNameW = modkernel32.NewProc("GetVolumePathNamesForVolumeNameW") procGetWindowsDirectoryW = modkernel32.NewProc("GetWindowsDirectoryW") procInitializeProcThreadAttributeList = modkernel32.NewProc("InitializeProcThreadAttributeList") + procIsProcessorFeaturePresent = modkernel32.NewProc("IsProcessorFeaturePresent") procIsWow64Process = modkernel32.NewProc("IsWow64Process") procIsWow64Process2 = modkernel32.NewProc("IsWow64Process2") procLoadLibraryExW = modkernel32.NewProc("LoadLibraryExW") @@ -2786,6 +2787,12 @@ func initializeProcThreadAttributeList(attrlist *ProcThreadAttributeList, attrco return } +func IsProcessorFeaturePresent(ProcessorFeature uint32) (ret bool) { + r0, _, _ := syscall.SyscallN(procIsProcessorFeaturePresent.Addr(), uintptr(ProcessorFeature)) + ret = r0 != 0 + return +} + func IsWow64Process(handle Handle, isWow64 *bool) (err error) { var _p0 uint32 if *isWow64 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c20d88f..9d23362a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,15 +10,12 @@ github.com/apache/cloudstack-go/v2/cloudstack # github.com/bmatcuk/doublestar v1.3.4 ## explicit; go 1.12 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-20251206100214-575efd567282 ## explicit; go 1.24.0 github.com/cloudfoundry/bosh-cpi-go/apiv1 github.com/cloudfoundry/bosh-cpi-go/rpc -# github.com/cloudfoundry/bosh-utils v0.0.582 -## explicit; go 1.24.0 +# github.com/cloudfoundry/bosh-utils v0.0.608 +## explicit; go 1.25.0 github.com/cloudfoundry/bosh-utils/errors github.com/cloudfoundry/bosh-utils/logger github.com/cloudfoundry/bosh-utils/system @@ -71,8 +68,8 @@ github.com/onsi/ginkgo/reporters/stenographer github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty github.com/onsi/ginkgo/types -# github.com/onsi/gomega v1.39.0 -## explicit; go 1.23.0 +# github.com/onsi/gomega v1.39.1 +## explicit; go 1.24.0 github.com/onsi/gomega github.com/onsi/gomega/format github.com/onsi/gomega/internal @@ -96,17 +93,17 @@ go.uber.org/mock/gomock # go.yaml.in/yaml/v3 v3.0.4 ## explicit; go 1.16 go.yaml.in/yaml/v3 -# golang.org/x/net v0.49.0 -## explicit; go 1.24.0 +# golang.org/x/net v0.53.0 +## explicit; go 1.25.0 golang.org/x/net/html golang.org/x/net/html/atom golang.org/x/net/html/charset -# golang.org/x/sys v0.40.0 -## explicit; go 1.24.0 +# golang.org/x/sys v0.43.0 +## explicit; go 1.25.0 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/text v0.33.0 -## explicit; go 1.24.0 +# golang.org/x/text v0.36.0 +## explicit; go 1.25.0 golang.org/x/text/encoding golang.org/x/text/encoding/charmap golang.org/x/text/encoding/htmlindex