4f2c599485
Outside of `.pulumiignore` we support a few "default" excludes that try to push folks towards a pit of succes. Previously, there was no way to opt out of these, which would be bad if our huristics caused something youto really care about to be elided. With this change, we add an optional setting in Pulumi.yaml that allows you to opt out of this behavior. As part of the work, I changed .git to be one of these "default" excludes instead of it only happening if you had a .pulumiignore file in a directory
115 lines
3.1 KiB
Go
115 lines
3.1 KiB
Go
// Copyright 2016-2017, Pulumi Corporation. All rights reserved.
|
|
package archive
|
|
|
|
import (
|
|
"archive/zip"
|
|
"bytes"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"path"
|
|
"sort"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/pulumi/pulumi/pkg/util/contract"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestIngoreSimple(t *testing.T) {
|
|
doArchiveTest(t,
|
|
fileContents{name: ".pulumiignore", contents: []byte("node_modules/pulumi/"), shouldRetain: true},
|
|
fileContents{name: "included.txt", shouldRetain: true},
|
|
fileContents{name: "node_modules/included.txt", shouldRetain: true},
|
|
fileContents{name: "node_modules/pulumi/excluded.txt", shouldRetain: false},
|
|
fileContents{name: "node_modules/pulumi/excluded/excluded.txt", shouldRetain: false})
|
|
}
|
|
|
|
func TestIgnoreNegate(t *testing.T) {
|
|
doArchiveTest(t,
|
|
fileContents{name: ".pulumiignore", contents: []byte("/*\n!/foo\n/foo/*\n!/foo/bar"), shouldRetain: false},
|
|
fileContents{name: "excluded.txt", shouldRetain: false},
|
|
fileContents{name: "foo/excluded.txt", shouldRetain: false},
|
|
fileContents{name: "foo/baz/exlcuded.txt", shouldRetain: false},
|
|
fileContents{name: "foo/bar/included.txt", shouldRetain: true})
|
|
}
|
|
|
|
func TestNested(t *testing.T) {
|
|
doArchiveTest(t,
|
|
fileContents{name: ".pulumiignore", contents: []byte("node_modules/pulumi/"), shouldRetain: true},
|
|
fileContents{name: "node_modules/.pulumiignore", contents: []byte("@pulumi/"), shouldRetain: true},
|
|
fileContents{name: "included.txt", shouldRetain: true},
|
|
fileContents{name: "node_modules/included.txt", shouldRetain: true},
|
|
fileContents{name: "node_modules/pulumi/excluded.txt", shouldRetain: false},
|
|
fileContents{name: "node_modules/@pulumi/pulumi-cloud/excluded.txt", shouldRetain: false})
|
|
}
|
|
|
|
func doArchiveTest(t *testing.T, files ...fileContents) {
|
|
archive, err := archiveContents(files...)
|
|
assert.NoError(t, err)
|
|
|
|
fmt.Println(archive.Len())
|
|
|
|
r, err := zip.NewReader(bytes.NewReader(archive.Bytes()), int64(archive.Len()))
|
|
assert.NoError(t, err)
|
|
|
|
checkFiles(t, files, r.File)
|
|
}
|
|
|
|
func archiveContents(files ...fileContents) (*bytes.Buffer, error) {
|
|
dir, err := ioutil.TempDir("", "archive-test")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
defer func() {
|
|
contract.IgnoreError(os.RemoveAll(dir))
|
|
}()
|
|
|
|
for _, file := range files {
|
|
err := os.MkdirAll(path.Dir(path.Join(dir, file.name)), 0755)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = ioutil.WriteFile(path.Join(dir, file.name), file.contents, 0644)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return Process(dir, false)
|
|
}
|
|
|
|
func checkFiles(t *testing.T, expected []fileContents, actual []*zip.File) {
|
|
var expectedFiles []string
|
|
var actualFiles []string
|
|
|
|
for _, f := range expected {
|
|
if f.shouldRetain {
|
|
expectedFiles = append(expectedFiles, f.name)
|
|
}
|
|
}
|
|
|
|
for _, f := range actual {
|
|
|
|
// Ignore any directories (we only care that the files themselves are correct)
|
|
if strings.HasSuffix(f.Name, "/") {
|
|
continue
|
|
}
|
|
|
|
actualFiles = append(actualFiles, f.Name)
|
|
}
|
|
|
|
sort.Strings(expectedFiles)
|
|
sort.Strings(actualFiles)
|
|
|
|
assert.Equal(t, expectedFiles, actualFiles)
|
|
}
|
|
|
|
type fileContents struct {
|
|
name string
|
|
contents []byte
|
|
shouldRetain bool
|
|
}
|