Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sourcebundle/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,11 @@ func packagePrepareWalkFn(root string, ignoreRules *ignorefiles.Ruleset) filepat
if err != nil {
return fmt.Errorf("failed to remove ignored file %s: %s", relPath, err)
}
// Account for .terraformignore file rulesets that remove entire subtrees
// in order to skip additional reads.
if info.IsDir() {
return filepath.SkipDir
}
return nil
}

Expand Down
6 changes: 6 additions & 0 deletions sourcebundle/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,12 @@ func TestBuilderTerraformIgnore(t *testing.T) {
} else if !errors.Is(err, fs.ErrNotExist) {
t.Errorf("excluded file exists but is not readable; should have been removed altogether")
}

if _, err := os.Lstat(filepath.Join(localPkgDir, ".excluded")); err == nil {
t.Errorf(".excluded dir exists; should have been removed")
} else if !errors.Is(err, fs.ErrNotExist) {
t.Errorf(".excluded dir exists but is not readable; should have been removed altogether")
}
}

func TestBuilderCoalescePackages(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
excluded content
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
excluded
excluded-dir/
.excluded