From a25dfc4b3c3c4925a9b4fb43b9cffdd3f3bfd245 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 3 Dec 2024 23:37:16 +0000 Subject: [PATCH] Update vendored dependencies --- go.mod | 12 ++++---- go.sum | 28 +++++++++---------- .../bosh-utils/fileutil/tarball_compressor.go | 21 +++++++------- vendor/modules.txt | 12 ++++---- 4 files changed, 37 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index b9f970942..3e1f4b51b 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,14 @@ module github.com/cloudfoundry/bosh-agent go 1.22.0 require ( - code.cloudfoundry.org/clock v1.22.0 - code.cloudfoundry.org/tlsconfig v0.10.0 + code.cloudfoundry.org/clock v1.23.0 + code.cloudfoundry.org/tlsconfig v0.11.0 github.com/Microsoft/hcsshim v0.8.14 github.com/charlievieth/fs v0.0.3 github.com/cloudfoundry/bosh-cli/v7 v7.8.2 - github.com/cloudfoundry/bosh-davcli v0.0.381 - github.com/cloudfoundry/bosh-utils v0.0.505 - github.com/cloudfoundry/gosigar v1.3.77 + github.com/cloudfoundry/bosh-davcli v0.0.383 + github.com/cloudfoundry/bosh-utils v0.0.508 + github.com/cloudfoundry/gosigar v1.3.78 github.com/containerd/cgroups v1.1.0 github.com/coreos/go-iptables v0.8.0 github.com/gofrs/uuid v4.4.0+incompatible @@ -58,7 +58,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 // indirect + github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect diff --git a/go.sum b/go.sum index 466343af0..46191ac9b 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -code.cloudfoundry.org/clock v1.22.0 h1:wNLKi3vSt0ywYrC1KLOlGYxT6ELwUlWrSpEqe9YczRo= -code.cloudfoundry.org/clock v1.22.0/go.mod h1:wcGQ7OOBfS8oex7J/Xx+nDqfrgWLQFpQHZx9sVDHs5A= -code.cloudfoundry.org/tlsconfig v0.10.0 h1:IGbLsOfQmzjI1o5bcGtsTwsZl/Qoz/n5/NkBK68Lk1I= -code.cloudfoundry.org/tlsconfig v0.10.0/go.mod h1:Rz8UI6zoOnB9UFxYfPpZhAsl2hDsmjmVW9SGmUhsDSk= +code.cloudfoundry.org/clock v1.23.0 h1:/PPIGBVNX7K+CHCANJmWkNaE+1tf5QBU4hEo7HzMgR4= +code.cloudfoundry.org/clock v1.23.0/go.mod h1:bxeePzZ5ESN99hM/gJWTEfDegvu5/oRuNwsR48x6DJw= +code.cloudfoundry.org/tlsconfig v0.11.0 h1:I8NZMCRj06Mb6i08kpjyOR7seD16wMe9yOBXnrEPBK0= +code.cloudfoundry.org/tlsconfig v0.11.0/go.mod h1:BYtu1JO9TeKqBnHbLke7tioY9Efh1vkYt0XpkXgbF44= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= @@ -30,14 +30,14 @@ github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmE github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudfoundry/bosh-cli/v7 v7.8.2 h1:xFw66c7EMV6QMEa5QZ4ypwzz2hMkXw9XEpU6mrpYfYo= github.com/cloudfoundry/bosh-cli/v7 v7.8.2/go.mod h1:T+Yk01mge4PFc4Epg1CyQHw25/8u2f9k7lWxsojSrvg= -github.com/cloudfoundry/bosh-davcli v0.0.381 h1:Nu0AFvSjIQ9vfbExx/HU0bi+db0ILJfwSXHwJ1LnfaY= -github.com/cloudfoundry/bosh-davcli v0.0.381/go.mod h1:OYqTwjSK9k9UAH5/1RpshIgkNLLFcjWQxIWKKLsenEc= -github.com/cloudfoundry/bosh-utils v0.0.505 h1:6G6pFogaDgA6+SkIBu7RuNO5c82K1tB4Ok3tLrbzKZ8= -github.com/cloudfoundry/bosh-utils v0.0.505/go.mod h1:oCDSYbBy7IHdZ5yk2DN76b4MwUZzb5e1sI48V3+x9hU= +github.com/cloudfoundry/bosh-davcli v0.0.383 h1:mRzaBe5CLNGGgHmEY/Wv6Y/uDFkmC0CBjVZ8xTp9JlM= +github.com/cloudfoundry/bosh-davcli v0.0.383/go.mod h1:OYqTwjSK9k9UAH5/1RpshIgkNLLFcjWQxIWKKLsenEc= +github.com/cloudfoundry/bosh-utils v0.0.508 h1:ABMgRC79kleUK9uSmCUVMlZNmgsIEIN6yj62fkbW32U= +github.com/cloudfoundry/bosh-utils v0.0.508/go.mod h1:oCDSYbBy7IHdZ5yk2DN76b4MwUZzb5e1sI48V3+x9hU= github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee h1:88ruSYvCUKX2YcF2CMYVTmPGITvNdRbzaBRk2c/iMds= github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee/go.mod h1:72EEm1oq5oXqGfu9XGtaRPWEcAFYd/P10cMNln0QhA8= -github.com/cloudfoundry/gosigar v1.3.77 h1:NDfXQyKHLSHjV9G6vDs0lFvb5gyXxpo4ASysq3YRyO4= -github.com/cloudfoundry/gosigar v1.3.77/go.mod h1:d1HeUfNr/LvSDHea6eZWyOzheyuMTEz4ov2+Cb9d9vg= +github.com/cloudfoundry/gosigar v1.3.78 h1:qmIi/8UyewNBUx6mQOoP15l4LctK635Sc4XbCUEcSak= +github.com/cloudfoundry/gosigar v1.3.78/go.mod h1:maubgJfTKKiwxiVaW/ZvKXF7R5zfYpG/TMIC25l8byk= github.com/cloudfoundry/socks5-proxy v0.2.133 h1:+vZ2Geqe8JaUrRWadE++rfqw06IE7jSsDwJhYLQ1pMM= github.com/cloudfoundry/socks5-proxy v0.2.133/go.mod h1:oF7WYWuSmLJ980vPVwM0oAuXuMmVNaERa2Vsg1T9QCo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -116,8 +116,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/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-20241128161848-dc51965c6481 h1:yudKIrXagAOl99WQzrP1gbz5HLB9UjhcOFnPzdd6Qec= -github.com/google/pprof v0.0.0-20241128161848-dc51965c6481/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 h1:keEZFtbLJugfE0qHn+Ge1JCE71spzkchQobDf3mzS/4= +github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -249,8 +249,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.step.sm/crypto v0.54.2 h1:3LSA5nYDQvcd484OSx7xsS3XDqQ7/WZjVqvq0+a0fWc= -go.step.sm/crypto v0.54.2/go.mod h1:1+OjUozd5aA3TkBJfr5Aobd6vNt9F70n1DagcoBh3Pc= +go.step.sm/crypto v0.55.0 h1:575Q7NahuM/ZRxUVN1GkO2e1aDYQJqIIg+nbfOajQJk= +go.step.sm/crypto v0.55.0/go.mod h1:MgEmD1lgwsuzZwTgI0GwKapHjKVEQLVggSvHuf3bYnU= go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M= go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go b/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go index 23e8857d4..4a789f04c 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go @@ -1,6 +1,7 @@ package fileutil import ( + "archive/tar" "fmt" "io" "io/fs" @@ -9,16 +10,16 @@ import ( "runtime" "strings" - "archive/tar" - "github.com/klauspost/pgzip" bosherr "github.com/cloudfoundry/bosh-utils/errors" boshsys "github.com/cloudfoundry/bosh-utils/system" ) +const forwardSlash string = "/" + type tarballCompressor struct { - fs boshsys.FileSystem + fs boshsys.FileSystem } func NewTarballCompressor( @@ -72,7 +73,7 @@ func (c tarballCompressor) CompressSpecificFilesInDir(dir string, files []string header.Name = relPath if runtime.GOOS == "windows" { - header.Name = strings.ReplaceAll(relPath, "\\", "/") + header.Name = strings.ReplaceAll(relPath, "\\", forwardSlash) } if err := tw.WriteHeader(header); err != nil { @@ -98,7 +99,7 @@ func (c tarballCompressor) CompressSpecificFilesInDir(dir string, files []string return "", bosherr.WrapError(err, "Creating tgz") } - if err = tw.Close(); err != nil { + if err = tw.Close(); err != nil { return "", bosherr.WrapError(err, "Closing tar writer") } @@ -140,13 +141,13 @@ func (c tarballCompressor) DecompressFileToDir(tarballPath string, dir string, o if options.PathInArchive != "" && !strings.HasPrefix( filepath.Clean(header.Name), filepath.Clean(options.PathInArchive)) { - continue + continue } fullName := filepath.Join(dir, filepath.FromSlash(header.Name)) if options.StripComponents > 0 { - components := strings.Split(filepath.Clean(header.Name), string(filepath.Separator)) + components := strings.Split(header.Name, forwardSlash) if len(components) <= options.StripComponents { continue } @@ -171,12 +172,12 @@ func (c tarballCompressor) DecompressFileToDir(tarballPath string, dir string, o } case tar.TypeLink: - if err := c.fs.Symlink(header.Linkname, fullName); err != nil { + if err := c.fs.Symlink(header.Linkname, fullName); err != nil { return bosherr.WrapError(err, "Decompressing link") } - case tar.TypeSymlink: - if err := c.fs.Symlink(header.Linkname, fullName); err != nil { + case tar.TypeSymlink: + if err := c.fs.Symlink(header.Linkname, fullName); err != nil { return bosherr.WrapError(err, "Decompressing symlink") } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5b35a9394..a5a7d7431 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,8 +1,8 @@ -# code.cloudfoundry.org/clock v1.22.0 +# code.cloudfoundry.org/clock v1.23.0 ## explicit; go 1.22.0 code.cloudfoundry.org/clock code.cloudfoundry.org/clock/fakeclock -# code.cloudfoundry.org/tlsconfig v0.10.0 +# code.cloudfoundry.org/tlsconfig v0.11.0 ## explicit; go 1.22 code.cloudfoundry.org/tlsconfig # github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 @@ -72,12 +72,12 @@ github.com/charlievieth/fs # github.com/cloudfoundry/bosh-cli/v7 v7.8.2 ## explicit; go 1.22.0 github.com/cloudfoundry/bosh-cli/v7/release/manifest -# github.com/cloudfoundry/bosh-davcli v0.0.381 +# github.com/cloudfoundry/bosh-davcli v0.0.383 ## explicit; go 1.22.0 github.com/cloudfoundry/bosh-davcli/client github.com/cloudfoundry/bosh-davcli/config github.com/cloudfoundry/bosh-davcli/signer -# github.com/cloudfoundry/bosh-utils v0.0.505 +# github.com/cloudfoundry/bosh-utils v0.0.508 ## explicit; go 1.22.0 github.com/cloudfoundry/bosh-utils/assert github.com/cloudfoundry/bosh-utils/blobstore @@ -99,7 +99,7 @@ github.com/cloudfoundry/bosh-utils/work # github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee ## explicit; go 1.21.0 github.com/cloudfoundry/go-socks5 -# github.com/cloudfoundry/gosigar v1.3.77 +# github.com/cloudfoundry/gosigar v1.3.78 ## explicit; go 1.22.0 github.com/cloudfoundry/gosigar github.com/cloudfoundry/gosigar/fakes @@ -161,7 +161,7 @@ github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value -# github.com/google/pprof v0.0.0-20241128161848-dc51965c6481 +# github.com/google/pprof v0.0.0-20241203143554-1e3fdc7de467 ## explicit; go 1.22 github.com/google/pprof/profile # github.com/google/uuid v1.6.0