feat: support template bundles as zip archives #11839
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| package coderd | ||
|
|
||
| import ( | ||
| "archive/tar" | ||
| "archive/zip" | ||
| "bytes" | ||
| "errors" | ||
| "io" | ||
| "log" | ||
| ) | ||
|
|
||
| func CreateTarFromZip(zipReader *zip.Reader) ([]byte, error) { | ||
| var tarBuffer bytes.Buffer | ||
| err := writeTarArchive(&tarBuffer, zipReader) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return tarBuffer.Bytes(), nil | ||
| } | ||
|
|
||
| func writeTarArchive(w io.Writer, zipReader *zip.Reader) error { | ||
| tarWriter := tar.NewWriter(w) | ||
| defer tarWriter.Close() | ||
|
|
||
| for _, file := range zipReader.File { | ||
| err := processFileInZipArchive(file, tarWriter) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func processFileInZipArchive(file *zip.File, tarWriter *tar.Writer) error { | ||
| fileReader, err := file.Open() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer fileReader.Close() | ||
|
|
||
| err = tarWriter.WriteHeader(&tar.Header{ | ||
| Name: file.Name, | ||
| Size: file.FileInfo().Size(), | ||
| Mode: 0o644, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| n, err := io.CopyN(tarWriter, fileReader, httpFileMaxBytes) | ||
| log.Println(file.Name, n, err) | ||
| if errors.Is(err, io.EOF) { | ||
| err = nil | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| func CreateZipFromTar(tarReader *tar.Reader) ([]byte, error) { | ||
| var zipBuffer bytes.Buffer | ||
| err := WriteZipArchive(&zipBuffer, tarReader) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return zipBuffer.Bytes(), nil | ||
| } | ||
|
|
||
| func WriteZipArchive(w io.Writer, tarReader *tar.Reader) error { | ||
| zipWriter := zip.NewWriter(w) | ||
| defer zipWriter.Close() | ||
|
|
||
| for { | ||
| tarHeader, err := tarReader.Next() | ||
| if errors.Is(err, io.EOF) { | ||
| break | ||
| } | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| zipHeader, err := zip.FileInfoHeader(tarHeader.FileInfo()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| zipHeader.Name = tarHeader.Name | ||
|
|
||
| zipEntry, err := zipWriter.CreateHeader(zipHeader) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, err = io.CopyN(zipEntry, tarReader, httpFileMaxBytes) | ||
| if errors.Is(err, io.EOF) { | ||
| err = nil | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil // don't need to flush as we call `writer.Close()` | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe no harm to allow explicitly setting ContentTypeTar?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about it, but it would be another place to adjust if we decide to natively support other formats.