Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions fileutil/fileutil_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,12 @@ func localCopyFSForGo122(dir string, fsys fs.FS) error {
var _ = BeforeEach(func() {
assetsDirFS := os.DirFS(filepath.Join(".", "test_assets"))

testAssetsDir = GinkgoT().TempDir()
var err error
testAssetsDir, err = filepath.EvalSymlinks(GinkgoT().TempDir())
Expect(err).ToNot(HaveOccurred())

// TODO: use `os.CopyFS` instead of `localCopyFSForGo122` once we upgrade Golang versions
err := localCopyFSForGo122(testAssetsDir, assetsDirFS)
err = localCopyFSForGo122(testAssetsDir, assetsDirFS)
Expect(err).NotTo(HaveOccurred())

testAssetsFixtureDir = filepath.Join(testAssetsDir, "fixture_dir")
Expand Down
8 changes: 6 additions & 2 deletions fileutil/tarball_compressor.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,19 @@ func (c tarballCompressor) DecompressFileToDir(tarballPath string, dir string, o
sameOwnerOption = "--same-owner"
}

args := []string{sameOwnerOption, "-xzf", tarballPath, "-C", dir}
resolvedTarballPath, err := c.fs.ReadAndFollowLink(tarballPath)
if err != nil {
return bosherr.WrapError(err, "Resolving tarball path")
}
args := []string{sameOwnerOption, "-xzf", resolvedTarballPath, "-C", dir}
if options.StripComponents != 0 {
args = append(args, fmt.Sprintf("--strip-components=%d", options.StripComponents))
}

if options.PathInArchive != "" {
args = append(args, options.PathInArchive)
}
_, _, _, err := c.cmdRunner.RunCommand("tar", args...)
_, _, _, err = c.cmdRunner.RunCommand("tar", args...)
if err != nil {
return bosherr.WrapError(err, "Shelling out to tar")
}
Expand Down
4 changes: 3 additions & 1 deletion fileutil/tarball_compressor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ var _ = Describe("tarballCompressor", func() {
cmdRunner = boshsys.NewExecCmdRunner(logger)
fs = boshsys.NewOsFileSystem(logger)

dstDir = GinkgoT().TempDir()
var err error
dstDir, err = filepath.EvalSymlinks(GinkgoT().TempDir())
Expect(err).ToNot(HaveOccurred())
compressor = NewTarballCompressor(cmdRunner, fs)

fixtureSrcTgz = filepath.Join(testAssetsDir, "compressor-decompress-file-to-dir.tgz")
Expand Down
2 changes: 1 addition & 1 deletion system/os_file_system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var _ = Describe("OS FileSystem", func() {
Expect(err).ToNot(HaveOccurred())

// If a regular user, the home directory will end with the username
expDir := fmt.Sprintf(`\%s`, filepath.Base(currentUser.Name))
expDir := fmt.Sprintf(`\%s`, filepath.Base(currentUser.Username))

// If a System or LocalSystem user, the home directory will be different
// ref: https://learn.microsoft.com/en-us/windows-server/identity/ad-ds/manage/understand-security-identifiers
Expand Down
Loading