Skip to content

Commit c8fc89d

Browse files
authored
Adopt latest bosh-utils version that removes -z flag from tar extraction (#384)
1 parent 5cd119f commit c8fc89d

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

agent/compiler/concrete_compiler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (c concreteCompiler) Compile(pkg Package, deps []boshmodels.Package) (blobI
113113
}
114114
}
115115

116-
tmpPackageTar, err := c.compressor.CompressFilesInDir(installPath)
116+
tmpPackageTar, err := c.compressor.CompressFilesInDir(installPath, boshcmd.CompressorOptions{})
117117
if err != nil {
118118
return "", nil, bosherr.WrapError(err, "Compressing compiled package")
119119
}

agent/logstarprovider/logs_tar_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (l logsTarProvider) Get(logTypes string, filters []string) (string, error)
6464

6565
defer l.copier.CleanUp(tmpDir)
6666

67-
tarball, err := l.compressor.CompressFilesInDir(tmpDir)
67+
tarball, err := l.compressor.CompressFilesInDir(tmpDir, boshcmd.CompressorOptions{})
6868
if err != nil {
6969
return "", bosherr.WrapError(err, "Making logs tarball")
7070
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/charlievieth/fs v0.0.3
1010
github.com/cloudfoundry/bosh-cli/v7 v7.9.13
1111
github.com/cloudfoundry/bosh-davcli v0.0.439
12-
github.com/cloudfoundry/bosh-utils v0.0.560
12+
github.com/cloudfoundry/bosh-utils v0.0.562
1313
github.com/cloudfoundry/gosigar v1.3.106
1414
github.com/containerd/cgroups v1.1.0
1515
github.com/coreos/go-iptables v0.8.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/cloudfoundry/bosh-cli/v7 v7.9.13 h1:8NiiRBqL0tVnXstoaAmaUOHn0pjAO6zjX
3434
github.com/cloudfoundry/bosh-cli/v7 v7.9.13/go.mod h1:E+D2bwNH2SHwcMx3q7kas3seKOBqyyKdkwSxABhHu/k=
3535
github.com/cloudfoundry/bosh-davcli v0.0.439 h1:XkRfx2vof+41W1Zh6OD+f6FYBKJQXD620/aq280xXAM=
3636
github.com/cloudfoundry/bosh-davcli v0.0.439/go.mod h1:DARCDn7MWhrmWcF7Y0ciVl+9XP0EH1k0W9QcU11+7Rs=
37-
github.com/cloudfoundry/bosh-utils v0.0.560 h1:4vsa4dbw0gDe0/5AnFSYPrt2L+lrCxKwbJDs3hhdw6M=
38-
github.com/cloudfoundry/bosh-utils v0.0.560/go.mod h1:LNoUi8A9pr1KHF4RjwMKx4eBF6d/jhgFxZY32QVPQGY=
37+
github.com/cloudfoundry/bosh-utils v0.0.562 h1:xwuPbvB4eNQe72GeKLFlHavTUCkXs1K8xvuOafTHMqU=
38+
github.com/cloudfoundry/bosh-utils v0.0.562/go.mod h1:LNoUi8A9pr1KHF4RjwMKx4eBF6d/jhgFxZY32QVPQGY=
3939
github.com/cloudfoundry/go-socks5 v0.0.0-20250423223041-4ad5fea42851 h1:oy59UYcspoP44ggE8DM3kjxl1+sTFd802bbZlBBhBMk=
4040
github.com/cloudfoundry/go-socks5 v0.0.0-20250423223041-4ad5fea42851/go.mod h1:72EEm1oq5oXqGfu9XGtaRPWEcAFYd/P10cMNln0QhA8=
4141
github.com/cloudfoundry/gosigar v1.3.106 h1:va44gJVkCRV90GT6bPSvf/lI6NBNfAxkFaYwjApRnmA=

vendor/github.com/cloudfoundry/bosh-utils/fileutil/compressor_interface.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/bosh-utils/fileutil/fakes/fake_compressor.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ github.com/cloudfoundry/bosh-cli/v7/release/manifest
8080
github.com/cloudfoundry/bosh-davcli/client
8181
github.com/cloudfoundry/bosh-davcli/config
8282
github.com/cloudfoundry/bosh-davcli/signer
83-
# github.com/cloudfoundry/bosh-utils v0.0.560
83+
# github.com/cloudfoundry/bosh-utils v0.0.562
8484
## explicit; go 1.23.0
8585
github.com/cloudfoundry/bosh-utils/assert
8686
github.com/cloudfoundry/bosh-utils/blobstore

0 commit comments

Comments
 (0)