Download additional files on way up from workspace to root dir

mrnugget · mrnugget · commit af602c692db9 · 2021-02-11T15:57:04.000+01:00
diff --git a/internal/campaigns/executor_test.go b/internal/campaigns/executor_test.go
@@ -299,10 +299,12 @@ repository_name=github.com/sourcegraph/src-cli`,
 					".gitignore":      "node_modules",
 					"message.txt":     "root-dir",
 					"a/message.txt":   "a-dir",
+					"a/.gitignore":    "node_modules-in-a",
 					"a/b/message.txt": "b-dir",
 				}},
 				{repo: srcCLIRepo, path: "a", files: map[string]string{
 					"a/message.txt":   "a-dir",
+					"a/.gitignore":    "node_modules-in-a",
 					"a/b/message.txt": "b-dir",
 				}},
 				{repo: srcCLIRepo, path: "a/b", files: map[string]string{
@@ -311,7 +313,8 @@ repository_name=github.com/sourcegraph/src-cli`,
 			},
 			additionalFiles: []mockRepoAdditionalFiles{
 				{repo: srcCLIRepo, additionalFiles: map[string]string{
-					".gitignore": "node_modules",
+					".gitignore":   "node_modules",
+					"a/.gitignore": "node_modules-in-a",
 				}},
 			},
 			steps: []Step{
@@ -332,10 +335,15 @@ repository_name=github.com/sourcegraph/src-cli`,
 					Run:       `if [[ $(basename $(pwd)) == "a" && -f "../.gitignore" ]]; then echo "yes" >> gitignore-exists; fi`,
 					Container: "doesntmatter:13",
 				},
+				// In `a/b` we want the `.gitignore` file in the root folder and in `a` to be fetched:
 				{
 					Run:       `if [[ $(basename $(pwd)) == "b" && -f "../../.gitignore" ]]; then echo "yes" >> gitignore-exists; fi`,
 					Container: "doesntmatter:13",
 				},
+				{
+					Run:       `if [[ $(basename $(pwd)) == "b" && -f "../.gitignore" ]]; then echo "yes" >> gitignore-exists-in-a; fi`,
+					Container: "doesntmatter:13",
+				},
 			},
 			tasks: []*Task{
 				{
@@ -361,7 +369,7 @@ repository_name=github.com/sourcegraph/src-cli`,
 				srcCLIRepo.ID: filesByBranch{
 					"workspace-root-dir": []string{"hello.txt", "gitignore-exists"},
 					"workspace-a-dir":    []string{"a/hello.txt", "a/gitignore-exists"},
-					"workspace-b-dir":    []string{"a/b/hello.txt", "a/b/gitignore-exists"},
+					"workspace-b-dir":    []string{"a/b/hello.txt", "a/b/gitignore-exists", "a/b/gitignore-exists-in-a"},
 				},
 			},
 		},
diff --git a/internal/campaigns/repo_fetcher.go b/internal/campaigns/repo_fetcher.go
@@ -73,12 +73,37 @@ func (rf *repoFetcher) zipFor(repo *graphql.Repository, path string) *repoZip {
 		}
 
 		if path != "" {
-			for _, name := range []string{".gitignore", ".gitattributes"} {
-				zip.additionalFiles = append(zip.additionalFiles, &additionalFile{
-					filename:  name,
-					localPath: filepath.Join(rf.dir, slug+"-"+name),
-					fetched:   false,
-				})
+			// We're doing another loop here to catch all
+			// AdditionalWorkspaceFiles on the way *up* from the workspace to the
+			// root.
+			//
+			// Example: path = /examples/cool/project3
+			//
+			// Then we want to fetch the following files:
+			//
+			// /.gitignore
+			// /.gitattributes
+			// /examples/.gitignore
+			// /examples/.gitattributes
+			// /examples/cool/.gitignore
+			// /examples/cool/.gitattributes
+
+			pathComponents := strings.Split(path, string(os.PathSeparator))
+
+			var currentPath string
+			for _, component := range pathComponents {
+				for _, name := range []string{".gitignore", ".gitattributes"} {
+					filename := filepath.Join(currentPath, name)
+					localPath := filepath.Join(rf.dir, repo.SlugForPath(filename))
+
+					zip.additionalFiles = append(zip.additionalFiles, &additionalFile{
+						filename:  filename,
+						localPath: localPath,
+						fetched:   false,
+					})
+				}
+
+				currentPath = filepath.Join(currentPath, component)
 			}
 		}
 
