From 545c0081843d3c131299cc5a3c8f673e7e03fc16 Mon Sep 17 00:00:00 2001
From: Matt Toohey <mtoohey@block.xyz>
Date: Thu, 21 Mar 2024 16:11:38 +1100
Subject: [PATCH] fix rebase

---
 buildengine/discover_test.go                  | 28 +++++++++----------
 .../external/external.go                      |  0
 .../{modules => projects}/external/ftl.toml   |  0
 .../{modules => projects}/external/go.mod     |  0
 .../{modules => projects}/external/go.sum     |  0
 .../externalkotlin/ftl.toml                   |  0
 .../externalkotlin/pom.xml                    |  0
 .../ftl/externalkotlin/ExternalKotlin.kt      |  0
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename buildengine/testdata/{modules => projects}/external/external.go (100%)
 rename buildengine/testdata/{modules => projects}/external/ftl.toml (100%)
 rename buildengine/testdata/{modules => projects}/external/go.mod (100%)
 rename buildengine/testdata/{modules => projects}/external/go.sum (100%)
 rename buildengine/testdata/{modules => projects}/externalkotlin/ftl.toml (100%)
 rename buildengine/testdata/{modules => projects}/externalkotlin/pom.xml (100%)
 rename buildengine/testdata/{modules => projects}/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt (100%)

diff --git a/buildengine/discover_test.go b/buildengine/discover_test.go
index 52a413ea06..67e64bb93a 100644
--- a/buildengine/discover_test.go
+++ b/buildengine/discover_test.go
@@ -63,7 +63,7 @@ func TestDiscoverModules(t *testing.T) {
 		},
 		Module{
 			ModuleConfig: moduleconfig.ModuleConfig{
-				Dir:      "testdata/modules/external",
+				Dir:      "testdata/projects/external",
 				Language: "go",
 				Realm:    "home",
 				Module:   "external",
@@ -82,19 +82,7 @@ func TestDiscoverModules(t *testing.T) {
 		},
 		Module{
 			ModuleConfig: moduleconfig.ModuleConfig{
-				Dir:       "testdata/projects/other",
-				Language:  "go",
-				Realm:     "home",
-				Module:    "other",
-				Deploy:    []string{"main"},
-				DeployDir: "_ftl",
-				Schema:    "schema.pb",
-				Watch:     []string{"**/*.go", "go.mod", "go.sum"},
-			},
-		},
-		Module{
-			ModuleConfig: moduleconfig.ModuleConfig{
-				Dir:      "testdata/modules/externalkotlin",
+				Dir:      "testdata/projects/externalkotlin",
 				Language: "kotlin",
 				Realm:    "home",
 				Module:   "externalkotlin",
@@ -114,6 +102,18 @@ func TestDiscoverModules(t *testing.T) {
 				},
 			},
 		},
+		Module{
+			ModuleConfig: moduleconfig.ModuleConfig{
+				Dir:       "testdata/projects/other",
+				Language:  "go",
+				Realm:     "home",
+				Module:    "other",
+				Deploy:    []string{"main"},
+				DeployDir: "_ftl",
+				Schema:    "schema.pb",
+				Watch:     []string{"**/*.go", "go.mod", "go.sum"},
+			},
+		},
 		ExternalLibrary{
 			Dir:      "testdata/projects/lib",
 			Language: "go",
diff --git a/buildengine/testdata/modules/external/external.go b/buildengine/testdata/projects/external/external.go
similarity index 100%
rename from buildengine/testdata/modules/external/external.go
rename to buildengine/testdata/projects/external/external.go
diff --git a/buildengine/testdata/modules/external/ftl.toml b/buildengine/testdata/projects/external/ftl.toml
similarity index 100%
rename from buildengine/testdata/modules/external/ftl.toml
rename to buildengine/testdata/projects/external/ftl.toml
diff --git a/buildengine/testdata/modules/external/go.mod b/buildengine/testdata/projects/external/go.mod
similarity index 100%
rename from buildengine/testdata/modules/external/go.mod
rename to buildengine/testdata/projects/external/go.mod
diff --git a/buildengine/testdata/modules/external/go.sum b/buildengine/testdata/projects/external/go.sum
similarity index 100%
rename from buildengine/testdata/modules/external/go.sum
rename to buildengine/testdata/projects/external/go.sum
diff --git a/buildengine/testdata/modules/externalkotlin/ftl.toml b/buildengine/testdata/projects/externalkotlin/ftl.toml
similarity index 100%
rename from buildengine/testdata/modules/externalkotlin/ftl.toml
rename to buildengine/testdata/projects/externalkotlin/ftl.toml
diff --git a/buildengine/testdata/modules/externalkotlin/pom.xml b/buildengine/testdata/projects/externalkotlin/pom.xml
similarity index 100%
rename from buildengine/testdata/modules/externalkotlin/pom.xml
rename to buildengine/testdata/projects/externalkotlin/pom.xml
diff --git a/buildengine/testdata/modules/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt b/buildengine/testdata/projects/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt
similarity index 100%
rename from buildengine/testdata/modules/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt
rename to buildengine/testdata/projects/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt