sorting

mtojek · mtojek · commit 86761b0da485 · 2025-02-28T15:05:29.000+01:00
diff --git a/site/src/pages/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx b/site/src/pages/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx
@@ -510,6 +510,28 @@ describe("Find entrypoint", () => {
 			},
 		};
 
+		const mainFile = findEntrypointFile(ft);
+		expect(mainFile).toBe("aaa-dir/main.tf");
+	});
+	it("with dirs, multiple main.tf, unordered file tree", () => {
+		const ft: FileTree = {
+			"ccc-dir": {
+				"aaa.tf": "hello",
+				"bbb.tf": "world",
+				"main.tf": "foobar",
+			},
+			"aaa-dir": {
+				"aaa.tf": "hello",
+				"bbb.tf": "world",
+				"main.tf": "foobar",
+			},
+			"zzz-dir": {
+				"aaa.tf": "hello",
+				"bbb.tf": "world",
+				"main.tf": "foobar",
+			},
+		};
+
 		const mainFile = findEntrypointFile(ft);
 		expect(mainFile).toBe("aaa-dir/main.tf");
 	});
diff --git a/site/src/utils/filetree.test.ts b/site/src/utils/filetree.test.ts
@@ -122,6 +122,6 @@ test("traverse() go trough all the file tree files", () => {
 	traverse(fileTree, (_content, _filename, fullPath) => {
 		filePaths.push(fullPath);
 	});
-	const expectedFilePaths = ["main.tf", "images", "images/java.Dockerfile"];
+	const expectedFilePaths = ["images", "images/java.Dockerfile", "main.tf"];
 	expect(filePaths).toEqual(expectedFilePaths);
 });
diff --git a/site/src/utils/filetree.ts b/site/src/utils/filetree.ts
@@ -96,7 +96,9 @@ export const traverse = (
 	) => void,
 	parent?: string,
 ) => {
-	for (const [filename, content] of Object.entries(fileTree)) {
+	for (const [filename, content] of Object.entries(fileTree).sort(([a], [b]) =>
+		a.localeCompare(b),
+	)) {
 		const fullPath = parent ? `${parent}/${filename}` : filename;
 		callback(content, filename, fullPath);
 		if (typeof content === "object") {
