Merge pull request #51 from hashicorp/liamcervante/sourcebundle/skip-…

…deleted-directories Skip processing deleted directories during sourcebundle.Build
hashicorp · Nov 28, 2023 · bc4aefe · bc4aefe
2 parents ffdd023 + fb32e28
commit bc4aefe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/sourcebundle/builder.go b/sourcebundle/builder.go
@@ -13,10 +13,11 @@ import (
 	"sync"
 
 	"github.com/apparentlymart/go-versions/versions"
-	"github.com/hashicorp/go-slug/internal/ignorefiles"
-	"github.com/hashicorp/go-slug/sourceaddrs"
 	regaddr "github.com/hashicorp/terraform-registry-address"
 	"golang.org/x/mod/sumdb/dirhash"
+
+	"github.com/hashicorp/go-slug/internal/ignorefiles"
+	"github.com/hashicorp/go-slug/sourceaddrs"
 )
 
 // Builder deals with the process of gathering source code
@@ -651,7 +652,7 @@ func packagePrepareWalkFn(root string, ignoreRules *ignorefiles.Ruleset) filepat
 				if err != nil {
 					return fmt.Errorf("failed to remove ignored file %s: %s", relPath, err)
 				}
-				return nil
+				return filepath.SkipDir
 			}
 		}
 

diff --git a/sourcebundle/testdata/pkgs/terraformignore/.terraformignore b/sourcebundle/testdata/pkgs/terraformignore/.terraformignore
@@ -1 +1,2 @@
 excluded
+excluded-dir/
diff --git a/sourcebundle/testdata/pkgs/terraformignore/excluded-dir/excluded b/sourcebundle/testdata/pkgs/terraformignore/excluded-dir/excluded