mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-08-13 20:29:35 +00:00
efba9996f6
These are two new Buildah flags that we need to wire into Podman (both local and remote) and document, with the interesting note that one requires the other and a check needed to be added for that. Also: secret parsing was tightened up in Buildah, and was breaking the remote build tests. Rewire it to use the new parser Buildah made, which ends up simplifying the code considerably. Tests are back to passing afterwards. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
61 lines
1.8 KiB
Go
61 lines
1.8 KiB
Go
package remote_build_helpers
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// TempFileManager manages temporary files created during image build.
|
|
// It maintains a list of created temporary files and provides cleanup functionality
|
|
// to ensure proper resource management.
|
|
type TempFileManager struct {
|
|
files []string
|
|
}
|
|
|
|
func NewTempFileManager() *TempFileManager {
|
|
return &TempFileManager{}
|
|
}
|
|
|
|
func (t *TempFileManager) AddFile(filename string) {
|
|
t.files = append(t.files, filename)
|
|
}
|
|
|
|
func (t *TempFileManager) Cleanup() {
|
|
for _, file := range t.files {
|
|
if err := os.Remove(file); err != nil && !errors.Is(err, os.ErrNotExist) {
|
|
logrus.Errorf("Failed to remove temp file %s: %v", file, err)
|
|
}
|
|
}
|
|
t.files = t.files[:0] // Reset slice
|
|
}
|
|
|
|
// CreateTempFileFromReader creates a temporary file in the specified destination directory
|
|
// with the given pattern, and copies content from the provided reader into the file.
|
|
// The created temporary file is automatically added to the manager's cleanup list.
|
|
//
|
|
// Parameters:
|
|
// - dest: The directory where the temporary file should be created
|
|
// - pattern: The pattern for naming the temporary file
|
|
// - reader: The io.Reader from which to read content to write into the temporary file
|
|
//
|
|
// Returns:
|
|
// - string: The path to the created temporary file
|
|
// - error: Any error encountered during the operation
|
|
func (t *TempFileManager) CreateTempFileFromReader(dest string, pattern string, reader io.Reader) (string, error) {
|
|
tmpFile, err := os.CreateTemp(dest, pattern)
|
|
if err != nil {
|
|
return "", fmt.Errorf("creating temp file: %w", err)
|
|
}
|
|
defer tmpFile.Close()
|
|
|
|
t.AddFile(tmpFile.Name())
|
|
|
|
if _, err := io.Copy(tmpFile, reader); err != nil {
|
|
return "", fmt.Errorf("copying stdin content: %w", err)
|
|
}
|
|
return tmpFile.Name(), nil
|
|
}
|