mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
feat: show better error on invalid template upload (#3847)
* feat: show better error on invalid template upload * Fix tests
This commit is contained in:
@@ -16,12 +16,47 @@ const (
|
||||
TemplateArchiveLimit = 1 << 20
|
||||
)
|
||||
|
||||
// Tar archives a directory.
|
||||
func dirHasExt(dir string, ext string) (bool, error) {
|
||||
dirEnts, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
for _, fi := range dirEnts {
|
||||
if strings.HasSuffix(fi.Name(), ext) {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
|
||||
return false, nil
|
||||
}
|
||||
|
||||
// Tar archives a Terraform directory.
|
||||
func Tar(directory string, limit int64) ([]byte, error) {
|
||||
var buffer bytes.Buffer
|
||||
tarWriter := tar.NewWriter(&buffer)
|
||||
totalSize := int64(0)
|
||||
err := filepath.Walk(directory, func(file string, fileInfo os.FileInfo, err error) error {
|
||||
|
||||
const tfExt = ".tf"
|
||||
hasTf, err := dirHasExt(directory, tfExt)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !hasTf {
|
||||
absPath, err := filepath.Abs(directory)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Show absolute path to aid in debugging. E.g. showing "." is
|
||||
// useless.
|
||||
return nil, xerrors.Errorf(
|
||||
"%s is not a valid template since it has no %s files",
|
||||
absPath, tfExt,
|
||||
)
|
||||
}
|
||||
|
||||
err = filepath.Walk(directory, func(file string, fileInfo os.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -12,18 +12,30 @@ import (
|
||||
|
||||
func TestTar(t *testing.T) {
|
||||
t.Parallel()
|
||||
dir := t.TempDir()
|
||||
file, err := os.CreateTemp(dir, "")
|
||||
require.NoError(t, err)
|
||||
_ = file.Close()
|
||||
_, err = provisionersdk.Tar(dir, 1024)
|
||||
require.NoError(t, err)
|
||||
t.Run("NoTF", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
dir := t.TempDir()
|
||||
file, err := os.CreateTemp(dir, "")
|
||||
require.NoError(t, err)
|
||||
_ = file.Close()
|
||||
_, err = provisionersdk.Tar(dir, 1024)
|
||||
require.Error(t, err)
|
||||
})
|
||||
t.Run("Valid", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
dir := t.TempDir()
|
||||
file, err := os.CreateTemp(dir, "*.tf")
|
||||
require.NoError(t, err)
|
||||
_ = file.Close()
|
||||
_, err = provisionersdk.Tar(dir, 1024)
|
||||
require.NoError(t, err)
|
||||
})
|
||||
}
|
||||
|
||||
func TestUntar(t *testing.T) {
|
||||
t.Parallel()
|
||||
dir := t.TempDir()
|
||||
file, err := os.CreateTemp(dir, "")
|
||||
file, err := os.CreateTemp(dir, "*.tf")
|
||||
require.NoError(t, err)
|
||||
_ = file.Close()
|
||||
archive, err := provisionersdk.Tar(dir, 1024)
|
||||
|
||||
Reference in New Issue
Block a user