GNSE-246: fix(sourcebundle): skip removed file paths in walk func (#110)

Author: mjyocca

sourcebundle/builder.go

@@ -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
 		}
 

sourcebundle/builder_test.go

@@ -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) {

sourcebundle/testdata/pkgs/terraformignore/.excluded/file.txt

@@ -0,0 +1 @@
+excluded content

sourcebundle/testdata/pkgs/terraformignore/.terraformignore

@@ -1,2 +1,3 @@
 excluded
 excluded-dir/
+.excluded