synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-23 21:32:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(provisionersdk): allow .terraform.lock.hcl files to be archived (#7604)

Browse Source
This commit is contained in:
Colin Adler
2023-05-19 13:22:59 -04:00
committed by GitHub
parent a29c4c543d
commit ef2411ef17
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
provisionersdk/archive.go
View File

@ -73,7 +73,9 @@ func Tar(w io.Writer, directory string, limit int64) error {
if err != nil {
return err
}
if strings.HasPrefix(rel, ".") || strings.HasPrefix(filepath.Base(rel), ".") {
// We want to allow .terraform.lock.hcl files to be archived. This
// allows provider plugins to be cached.
if (strings.HasPrefix(rel, ".") || strings.HasPrefix(filepath.Base(rel), ".")) && filepath.Base(rel) != ".terraform.lock.hcl" {
if fileInfo.IsDir() && rel != "." {
// Don't archive hidden files!
return filepath.SkipDir

71
provisionersdk/archive_test.go
View File

@ -5,6 +5,7 @@ import (
"io"
"os"
"path/filepath"
"strings"
"testing"
"github.com/stretchr/testify/require"
@ -39,25 +40,39 @@ func TestTar(t *testing.T) {
Name string
Archives bool
}
files := []*file{{
Name: "*.tf",
Archives: true,
}, {
Name: ".*",
Archives: false,
}, {
Name: "./testing/.test/*.tf",
Archives: false,
}, {
Name: "./testing/asd.*",
Archives: true,
}, {
Name: ".terraform/.*",
Archives: false,
}, {
Name: "example/.terraform/*",
Archives: false,
}}
files := []*file{
{
Name: "*.tf",
Archives: true,
}, {
Name: ".*",
Archives: false,
}, {
Name: "./testing/.test/*.tf",
Archives: false,
}, {
Name: "./testing/asd.*",
Archives: true,
}, {
Name: ".terraform/.*",
Archives: false,
}, {
Name: "example/.terraform/*",
Archives: false,
}, {
Name: ".terraform.lock.hcl",
Archives: true,
}, {
Name: "example/.terraform.lock.hcl",
Archives: true,
}, {
Name: ".terraform/.terraform.lock.hcl",
Archives: false,
}, {
Name: "terraform.tfstate",
Archives: false,
},
}
for _, file := range files {
newDir := dir
file.Name = filepath.FromSlash(file.Name)
@ -67,11 +82,19 @@ func TestTar(t *testing.T) {
require.NoError(t, err)
file.Name = filepath.Base(file.Name)
}
tmpFile, err := os.CreateTemp(newDir, file.Name)
require.NoError(t, err)
_ = tmpFile.Close()
file.Name, err = filepath.Rel(dir, tmpFile.Name())
require.NoError(t, err)
if strings.Contains(file.Name, "*") {
tmpFile, err := os.CreateTemp(newDir, file.Name)
require.NoError(t, err)
_ = tmpFile.Close()
file.Name, err = filepath.Rel(dir, tmpFile.Name())
require.NoError(t, err)
} else {
name := filepath.Join(newDir, file.Name)
err := os.WriteFile(name, []byte{}, 0o600)
require.NoError(t, err)
file.Name, err = filepath.Rel(dir, name)
require.NoError(t, err)
}
}
archive := new(bytes.Buffer)
err := provisionersdk.Tar(archive, dir, 1024)