Merge pull request #699 from mdzhigarov/adopt-bosh-utils

rkoster · web-flow · commit e53d6a110eb3 · 2025-11-06T22:54:22.000+01:00
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/cloudfoundry/bosh-davcli v0.0.439
 	github.com/cloudfoundry/bosh-gcscli v0.0.322
 	github.com/cloudfoundry/bosh-s3cli v0.0.382
-	github.com/cloudfoundry/bosh-utils v0.0.560
+	github.com/cloudfoundry/bosh-utils v0.0.562
 	github.com/cloudfoundry/config-server v0.1.257
 	github.com/cloudfoundry/socks5-proxy v0.2.159
 	github.com/cppforlife/go-patch v0.2.0
diff --git a/go.sum b/go.sum
@@ -62,8 +62,8 @@ github.com/cloudfoundry/bosh-gcscli v0.0.322 h1:M4xGSj7x17tHoX062SU2k+KCbIkFp7oi
 github.com/cloudfoundry/bosh-gcscli v0.0.322/go.mod h1:jnUj6GGMwjtlyBNBH6EjaTBL79lZxlTfTsbzN39W67k=
 github.com/cloudfoundry/bosh-s3cli v0.0.382 h1:qGgBRE7GKhKJNgjM5qTn+zH5Zprqd7pjIhLFOl4aLd0=
 github.com/cloudfoundry/bosh-s3cli v0.0.382/go.mod h1:ppC4WZ6VBM+T4Ao35avr5mivSYontZudwfQ2B+T1v4Y=
-github.com/cloudfoundry/bosh-utils v0.0.560 h1:4vsa4dbw0gDe0/5AnFSYPrt2L+lrCxKwbJDs3hhdw6M=
-github.com/cloudfoundry/bosh-utils v0.0.560/go.mod h1:LNoUi8A9pr1KHF4RjwMKx4eBF6d/jhgFxZY32QVPQGY=
+github.com/cloudfoundry/bosh-utils v0.0.562 h1:xwuPbvB4eNQe72GeKLFlHavTUCkXs1K8xvuOafTHMqU=
+github.com/cloudfoundry/bosh-utils v0.0.562/go.mod h1:LNoUi8A9pr1KHF4RjwMKx4eBF6d/jhgFxZY32QVPQGY=
 github.com/cloudfoundry/config-server v0.1.257 h1:fLNwi5nTO0cabp8Hw7xu+Vtw7ZXQhaS3HQex/tYb30o=
 github.com/cloudfoundry/config-server v0.1.257/go.mod h1:wVcZNK7SUhxZ5uswkHJoTlGl4oiWjzH8o3vYi5/3pQg=
 github.com/cloudfoundry/go-socks5 v0.0.0-20250423223041-4ad5fea42851 h1:oy59UYcspoP44ggE8DM3kjxl1+sTFd802bbZlBBhBMk=
diff --git a/installation/job_renderer.go b/installation/job_renderer.go
@@ -98,7 +98,7 @@ func (b *jobRenderer) renderJobTemplates(
 }
 
 func (b *jobRenderer) compressAndUpload(renderedJob bitemplate.RenderedJob) (RenderedJobRef, error) {
-	tarballPath, err := b.compressor.CompressFilesInDir(renderedJob.Path())
+	tarballPath, err := b.compressor.CompressFilesInDir(renderedJob.Path(), boshcmd.CompressorOptions{})
 	if err != nil {
 		return RenderedJobRef{}, bosherr.WrapError(err, "Compressing rendered job templates")
 	}
diff --git a/installation/pkg/compiler.go b/installation/pkg/compiler.go
@@ -111,7 +111,7 @@ func (c *compiler) Compile(pkg birelpkg.Compilable) (bistatepkg.CompiledPackageR
 			return record, isCompiledPackage, bosherr.WrapError(err, "Compiling package")
 		}
 
-		tarball, err = c.compressor.CompressFilesInDir(installDir)
+		tarball, err = c.compressor.CompressFilesInDir(installDir, boshcmd.CompressorOptions{})
 		if err != nil {
 			return record, isCompiledPackage, bosherr.WrapError(err, "Compressing compiled package")
 		}
diff --git a/release/archive_writer.go b/release/archive_writer.go
@@ -81,7 +81,7 @@ func (w ArchiveWriter) Write(release Release, pkgFpsToSkip []string) (string, er
 	w.filesToInclude = w.appendFiles(licenseFiles)
 
 	files := w.filesToInclude
-	path, err := w.compressor.CompressSpecificFilesInDir(stagingDir, files)
+	path, err := w.compressor.CompressSpecificFilesInDir(stagingDir, files, boshcmd.CompressorOptions{})
 
 	if err != nil {
 		return "", bosherr.WrapError(err, "Compressing release")
diff --git a/release/resource/archive.go b/release/resource/archive.go
@@ -90,7 +90,7 @@ func (a ArchiveImpl) Build(expectedFp string) (string, string, error) {
 		return "", "", bosherr.WrapError(err, "Running prep scripts")
 	}
 
-	archivePath, err := a.compressor.CompressFilesInDir(stagingDir)
+	archivePath, err := a.compressor.CompressFilesInDir(stagingDir, boshcmd.CompressorOptions{})
 	if err != nil {
 		return "", "", bosherr.WrapError(err, "Compressing staging directory")
 	}
diff --git a/stemcell/stemcell.go b/stemcell/stemcell.go
@@ -107,7 +107,7 @@ func (s *extractedStemcell) Pack(destinationPath string) error {
 		filenames = append(filenames, filepath.Base(p))
 	}
 
-	intermediateStemcellPath, err := s.compressor.CompressSpecificFilesInDir(s.extractedPath, filenames)
+	intermediateStemcellPath, err := s.compressor.CompressSpecificFilesInDir(s.extractedPath, filenames, boshfu.CompressorOptions{})
 	if err != nil {
 		return err
 	}
diff --git a/templatescompiler/rendered_job_list_compressor.go b/templatescompiler/rendered_job_list_compressor.go
@@ -63,7 +63,7 @@ func (c *renderedJobListCompressor) Compress(list RenderedJobList) (RenderedJobL
 		}
 	}
 
-	archivePath, err := c.compressor.CompressFilesInDir(renderedJobListDir)
+	archivePath, err := c.compressor.CompressFilesInDir(renderedJobListDir, boshcmd.CompressorOptions{})
 	if err != nil {
 		return nil, bosherr.WrapError(err, "Compressing rendered job templates")
 	}
diff --git a/vendor/github.com/cloudfoundry/bosh-utils/fileutil/compressor_interface.go b/vendor/github.com/cloudfoundry/bosh-utils/fileutil/compressor_interface.go
diff --git a/vendor/github.com/cloudfoundry/bosh-utils/fileutil/fakes/fake_compressor.go b/vendor/github.com/cloudfoundry/bosh-utils/fileutil/fakes/fake_compressor.go
diff --git a/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go b/vendor/github.com/cloudfoundry/bosh-utils/fileutil/tarball_compressor.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -167,7 +167,7 @@ github.com/cloudfoundry/bosh-gcscli/config
 ## explicit; go 1.23.0
 github.com/cloudfoundry/bosh-s3cli/client
 github.com/cloudfoundry/bosh-s3cli/config
-# github.com/cloudfoundry/bosh-utils v0.0.560
+# github.com/cloudfoundry/bosh-utils v0.0.562
 ## explicit; go 1.23.0
 github.com/cloudfoundry/bosh-utils/blobstore
 github.com/cloudfoundry/bosh-utils/blobstore/fakes

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (b *jobRenderer) renderJobTemplates(`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`func (b *jobRenderer) compressAndUpload(renderedJob bitemplate.RenderedJob) (RenderedJobRef, error) {`
`101`		`- tarballPath, err := b.compressor.CompressFilesInDir(renderedJob.Path())`
	`101`	`+ tarballPath, err := b.compressor.CompressFilesInDir(renderedJob.Path(), boshcmd.CompressorOptions{})`
`102`	`102`	`if err != nil {`
`103`	`103`	`return RenderedJobRef{}, bosherr.WrapError(err, "Compressing rendered job templates")`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (c *compiler) Compile(pkg birelpkg.Compilable) (bistatepkg.CompiledPackageR`
`111`	`111`	`return record, isCompiledPackage, bosherr.WrapError(err, "Compiling package")`
`112`	`112`	`}`
`113`	`113`
`114`		`- tarball, err = c.compressor.CompressFilesInDir(installDir)`
	`114`	`+ tarball, err = c.compressor.CompressFilesInDir(installDir, boshcmd.CompressorOptions{})`
`115`	`115`	`if err != nil {`
`116`	`116`	`return record, isCompiledPackage, bosherr.WrapError(err, "Compressing compiled package")`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func (a ArchiveImpl) Build(expectedFp string) (string, string, error) {`
`90`	`90`	`return "", "", bosherr.WrapError(err, "Running prep scripts")`
`91`	`91`	`}`
`92`	`92`
`93`		`- archivePath, err := a.compressor.CompressFilesInDir(stagingDir)`
	`93`	`+ archivePath, err := a.compressor.CompressFilesInDir(stagingDir, boshcmd.CompressorOptions{})`
`94`	`94`	`if err != nil {`
`95`	`95`	`return "", "", bosherr.WrapError(err, "Compressing staging directory")`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (s *extractedStemcell) Pack(destinationPath string) error {`
`107`	`107`	`filenames = append(filenames, filepath.Base(p))`
`108`	`108`	`}`
`109`	`109`
`110`		`- intermediateStemcellPath, err := s.compressor.CompressSpecificFilesInDir(s.extractedPath, filenames)`
	`110`	`+ intermediateStemcellPath, err := s.compressor.CompressSpecificFilesInDir(s.extractedPath, filenames, boshfu.CompressorOptions{})`
`111`	`111`	`if err != nil {`
`112`	`112`	`return err`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (c *renderedJobListCompressor) Compress(list RenderedJobList) (RenderedJobL`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- archivePath, err := c.compressor.CompressFilesInDir(renderedJobListDir)`
	`66`	`+ archivePath, err := c.compressor.CompressFilesInDir(renderedJobListDir, boshcmd.CompressorOptions{})`
`67`	`67`	`if err != nil {`
`68`	`68`	`return nil, bosherr.WrapError(err, "Compressing rendered job templates")`
`69`	`69`	`}`