Skip to content

feat: support template bundles as zip archives #11839

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 7 commits into from
Jan 31, 2024
Merged

feat: support template bundles as zip archives #11839

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11fd552
feat: support template bundles as zip archives
mtojek Jan 26, 2024
bc9a555
WIP
mtojek Jan 26, 2024
af8a0d5
Buffer
mtojek Jan 26, 2024
db12fda
Merge branch 'main' into 11687-accept-zip
mtojek Jan 30, 2024
b20a483
Zip Tar
mtojek Jan 30, 2024
fd86896
WIP
mtojek Jan 30, 2024
8f631ef
Implement backend
mtojek Jan 31, 2024
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
Prev Previous commit
Next Next commit
Buffer
  • Loading branch information
@mtojek
mtojek committed Jan 26, 2024
commit af8a0d55c08abbfb08066f429d2013bc0064124e
14 changes: 11 additions & 3 deletions coderd/fileszip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import (
"archive/tar"
"archive/zip"
"bytes"
"errors"
"io"
)

const zipCopyBufferSize = 4096

func createTarFromZip(zipReader *zip.Reader) ([]byte, error) {
var tarBuffer bytes.Buffer

Expand Down Expand Up @@ -40,9 +43,14 @@ func processFileInZipArchive(zipFile *zip.File, tarWriter *tar.Writer) error {
return err
}

_, err = io.Copy(tarWriter, zipFileReader)
if err != nil {
return err
for {
_, err := io.CopyN(tarWriter, zipFileReader, zipCopyBufferSize)
if err != nil {
if errors.Is(err, io.EOF) {
break
}
return err
}
}
return nil
}