diff --git a/go.mod b/go.mod index 8e523049c..8edcfe80c 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,12 @@ go 1.22.0 require ( code.cloudfoundry.org/clock v1.21.0 - code.cloudfoundry.org/tlsconfig v0.9.0 + code.cloudfoundry.org/tlsconfig v0.10.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.379 - github.com/cloudfoundry/bosh-utils v0.0.502 + github.com/cloudfoundry/bosh-utils v0.0.503 github.com/cloudfoundry/gosigar v1.3.76 github.com/containerd/cgroups v1.1.0 github.com/coreos/go-iptables v0.8.0 diff --git a/go.sum b/go.sum index 909881d5d..767e28df9 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.21.0 h1:RFRz2iYx9/UynpK7U97a5u5z91t6mr/izP7+0QGtrJw= code.cloudfoundry.org/clock v1.21.0/go.mod h1:hgxNVpH5uqC1CeVocIe9TKol+jJ3Estd5SNXPk7kMwQ= -code.cloudfoundry.org/tlsconfig v0.9.0 h1:5gXZFMTYzuN02wuP3KNcHoKcTCqcKpL4k8Qo2q1jIl0= -code.cloudfoundry.org/tlsconfig v0.9.0/go.mod h1:P1DZ9RcPeMguVWveDyZt5PTpLTB8yVv/riz+iRFdlZk= +code.cloudfoundry.org/tlsconfig v0.10.0 h1:IGbLsOfQmzjI1o5bcGtsTwsZl/Qoz/n5/NkBK68Lk1I= +code.cloudfoundry.org/tlsconfig v0.10.0/go.mod h1:Rz8UI6zoOnB9UFxYfPpZhAsl2hDsmjmVW9SGmUhsDSk= 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= @@ -32,8 +32,8 @@ github.com/cloudfoundry/bosh-cli/v7 v7.8.2 h1:xFw66c7EMV6QMEa5QZ4ypwzz2hMkXw9XEp github.com/cloudfoundry/bosh-cli/v7 v7.8.2/go.mod h1:T+Yk01mge4PFc4Epg1CyQHw25/8u2f9k7lWxsojSrvg= github.com/cloudfoundry/bosh-davcli v0.0.379 h1:56BXoNLo//vM87DwoDpafMe4iKD4mwUx31y0TKMommo= github.com/cloudfoundry/bosh-davcli v0.0.379/go.mod h1:gDcLHYwX3aAxoo8Y8lDqDBqEoN+ifYhOW8ob67eppjg= -github.com/cloudfoundry/bosh-utils v0.0.502 h1:ii6W1JZIllHSxmHdg2Jf+/JnoHjcRCTp5KHzCCpA6sA= -github.com/cloudfoundry/bosh-utils v0.0.502/go.mod h1:0kOKnoVRsmW848K4o6SBdR5Wr1GfErPdbwvo1q1dZGA= +github.com/cloudfoundry/bosh-utils v0.0.503 h1:DuIipFBTiudRMsmr6RIfjSXc6gJF5IBZaRVJQtmf70Q= +github.com/cloudfoundry/bosh-utils v0.0.503/go.mod h1:0kOKnoVRsmW848K4o6SBdR5Wr1GfErPdbwvo1q1dZGA= 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.76 h1:oH0i+1a/mBkfh1OMYcZ92PdKqCd3iIRupHAkNJMgA1Y= @@ -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.0 h1:V8p+12Ld0NRA/RBMYoKXA0dWmVKZSdCwP56IwzweT9g= -go.step.sm/crypto v0.54.0/go.mod h1:vQJyTngfZDW+UyZdFzOMCY/txWDAmcwViEUC7Gn4YfU= +go.step.sm/crypto v0.54.2 h1:3LSA5nYDQvcd484OSx7xsS3XDqQ7/WZjVqvq0+a0fWc= +go.step.sm/crypto v0.54.2/go.mod h1:1+OjUozd5aA3TkBJfr5Aobd6vNt9F70n1DagcoBh3Pc= 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 fce223bd0..23e8857d4 100644 --- a/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go +++ b/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go @@ -1,14 +1,16 @@ package fileutil import ( - "os" - "io" "fmt" + "io" "io/fs" - "strings" + "os" "path/filepath" + "runtime" + "strings" "archive/tar" + "github.com/klauspost/pgzip" bosherr "github.com/cloudfoundry/bosh-utils/errors" @@ -68,10 +70,10 @@ func (c tarballCompressor) CompressSpecificFilesInDir(dir string, files []string return bosherr.WrapError(err, "Resovling relative tar path") } - if fi.IsDir() { - relPath = relPath + "/" + header.Name = relPath + if runtime.GOOS == "windows" { + header.Name = strings.ReplaceAll(relPath, "\\", "/") } - header.Name = filepath.FromSlash(relPath) if err := tw.WriteHeader(header); err != nil { return bosherr.WrapError(err, "Writing tar header") diff --git a/vendor/modules.txt b/vendor/modules.txt index 783f0ed2e..c4b535cc3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2,7 +2,7 @@ ## explicit; go 1.22.0 code.cloudfoundry.org/clock code.cloudfoundry.org/clock/fakeclock -# code.cloudfoundry.org/tlsconfig v0.9.0 +# code.cloudfoundry.org/tlsconfig v0.10.0 ## explicit; go 1.22 code.cloudfoundry.org/tlsconfig # github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 @@ -77,7 +77,7 @@ github.com/cloudfoundry/bosh-cli/v7/release/manifest 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.502 +# github.com/cloudfoundry/bosh-utils v0.0.503 ## explicit; go 1.22.0 github.com/cloudfoundry/bosh-utils/assert github.com/cloudfoundry/bosh-utils/blobstore