Skip to content

fix: truncate template files while pulling #16474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2025
Merged

fix: truncate template files while pulling #16474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c999041
fix: truncate template files while pulling
mtojek Feb 6, 2025
1640e0c
fmt
mtojek Feb 6, 2025
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
Next Next commit
fix: truncate template files while pulling
  • Loading branch information
@mtojek
mtojek committed Feb 6, 2025
commit c999041d85474cc050dfc585f36e347c9996eb34
2 changes: 1 addition & 1 deletion provisionersdk/archive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func Untar(directory string, r io.Reader) error {
if err != nil {
return err
}
file, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
file, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR|os.O_TRUNC, os.FileMode(header.Mode))
if err != nil {
return err
}
Expand Down
78 changes: 65 additions & 13 deletions provisionersdk/archive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,18 +184,70 @@ func TestTar(t *testing.T) {

func TestUntar(t *testing.T) {
t.Parallel()
log := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})

dir := t.TempDir()
file, err := os.CreateTemp(dir, "*.tf")
require.NoError(t, err)
_ = file.Close()
archive := new(bytes.Buffer)
err = provisionersdk.Tar(archive, log, dir, 1024)
require.NoError(t, err)
dir = t.TempDir()
err = provisionersdk.Untar(dir, archive)
require.NoError(t, err)
_, err = os.Stat(filepath.Join(dir, filepath.Base(file.Name())))
require.NoError(t, err)
t.Run("Basic", func(t *testing.T) {
t.Parallel()

log := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})

dir := t.TempDir()
file, err := os.CreateTemp(dir, "*.tf")
require.NoError(t, err)
_ = file.Close()

archive := new(bytes.Buffer)
err = provisionersdk.Tar(archive, log, dir, 1024)
require.NoError(t, err)

dir = t.TempDir()
err = provisionersdk.Untar(dir, archive)
require.NoError(t, err)

_, err = os.Stat(filepath.Join(dir, filepath.Base(file.Name())))
require.NoError(t, err)
})

t.Run("Overwrite", func(t *testing.T) {
t.Parallel()

log := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})

dir1 := t.TempDir()
dir2 := t.TempDir()

// 1. Create directory with .tf file.
file, err := os.CreateTemp(dir1, "*.tf")
require.NoError(t, err)
_ = file.Close()

err = os.WriteFile(file.Name(), []byte("# ab"), 0600)
require.NoError(t, err)

archive := new(bytes.Buffer)

// 2. Build tar archive.
err = provisionersdk.Tar(archive, log, dir1, 4096)
require.NoError(t, err)

// 3. Untar to the second location.
err = provisionersdk.Untar(dir2, archive)
require.NoError(t, err)

// 4. Modify the .tf file
err = os.WriteFile(file.Name(), []byte("# c"), 0600)
require.NoError(t, err)

// 5. Build tar archive with modified .tf file
err = provisionersdk.Tar(archive, log, dir1, 4096)
require.NoError(t, err)

// 6. Untar to a second location.
err = provisionersdk.Untar(dir2, archive)
require.NoError(t, err)

// Verify if the file has been fully overwritten
content, err := os.ReadFile(filepath.Join(dir2, filepath.Base(file.Name())))
require.NoError(t, err)
require.Equal(t, "# c", string(content))
})
}
Loading