From 469a6b51fefc1562634f670e9b79bb91721e72a0 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dagger.io>
Date: Fri, 5 Jun 2026 13:57:54 -0700
Subject: [PATCH 1/2] Setup for dagger 1.0.0-beta.3

Signed-off-by: Solomon Hykes <solomon@dagger.io>
---
 .dagger/migration-report.md            | 19 +++++++++++++++++++
 .dagger/modules/e2e/dagger-module.toml |  9 +++++++++
 .dagger/modules/e2e/dagger.json        | 13 -------------
 dagger.toml                            | 10 ++++++++++
 4 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 .dagger/migration-report.md
 create mode 100644 .dagger/modules/e2e/dagger-module.toml
 delete mode 100644 .dagger/modules/e2e/dagger.json
 create mode 100644 dagger.toml

diff --git a/.dagger/migration-report.md b/.dagger/migration-report.md
new file mode 100644
index 0000000..513620b
--- /dev/null
+++ b/.dagger/migration-report.md
@@ -0,0 +1,19 @@
+# Migration Report
+
+## .dagger/modules/e2e requires explicit loading
+
+The module at `.dagger/modules/e2e` is still valid, but it must be loaded explicitly.
+
+- **This works**: `dagger -m .dagger/modules/e2e call --help`
+- **This no longer works**: `cd .dagger/modules/e2e; dagger call --help`
+
+ACTION: If your scripts rely on implicit loading of `.dagger/modules/e2e`, change them to use explicit loading.
+
+## Root module requires explicit loading
+
+The root module is still valid, but it must be loaded explicitly.
+
+- **This works**: `dagger -m . call --help`
+- **This no longer works**: `dagger call --help`
+
+ACTION: If your scripts rely on implicit loading of the root module, change them to use explicit loading.
diff --git a/.dagger/modules/e2e/dagger-module.toml b/.dagger/modules/e2e/dagger-module.toml
new file mode 100644
index 0000000..79cf559
--- /dev/null
+++ b/.dagger/modules/e2e/dagger-module.toml
@@ -0,0 +1,9 @@
+name = "e2e"
+engineVersion = "v0.20.6"
+
+[runtime]
+  source = "dang"
+
+[[dependencies]]
+  name = "go"
+  source = "../../.."
diff --git a/.dagger/modules/e2e/dagger.json b/.dagger/modules/e2e/dagger.json
deleted file mode 100644
index db776b5..0000000
--- a/.dagger/modules/e2e/dagger.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "e2e",
-  "engineVersion": "v0.20.6",
-  "sdk": {
-    "source": "dang"
-  },
-  "dependencies": [
-    {
-      "name": "go",
-      "source": "../../.."
-    }
-  ]
-}
diff --git a/dagger.toml b/dagger.toml
new file mode 100644
index 0000000..9159eb6
--- /dev/null
+++ b/dagger.toml
@@ -0,0 +1,10 @@
+# Dagger workspace configuration
+# Install modules with: dagger mod install <module>
+# Example:
+#   dagger mod install github.com/dagger/dagger/modules/wolfi
+
+[modules.dang-sdk]
+source = "github.com/dagger/dang-sdk"
+
+[modules.e2e]
+source = ".dagger/modules/e2e"

From 73652a1023ff7bca0d1b471997c196e1122ba3a8 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dagger.io>
Date: Fri, 5 Jun 2026 16:52:08 -0700
Subject: [PATCH 2/2] testdata: query Workspace.cwd instead of removed path
 field

Dagger v1.0.0-beta.3 renamed Workspace.path to cwd and switched it to
return absolute workspace paths (rooted at "/") instead of relative ones.
The nested go test in testdata/go-module-with-testdata was still querying
the old field, causing single-module-check to fail with a GraphQL
validation error.

Signed-off-by: Solomon Hykes <solomon@dagger.io>
---
 testdata/go-module-with-testdata/nesting_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testdata/go-module-with-testdata/nesting_test.go b/testdata/go-module-with-testdata/nesting_test.go
index 9081d2f..0ed3295 100644
--- a/testdata/go-module-with-testdata/nesting_test.go
+++ b/testdata/go-module-with-testdata/nesting_test.go
@@ -28,7 +28,7 @@ func TestDaggerSessionAvailableFromGoTest(t *testing.T) {
 				directory(path: %q) { entries }
 			}
 			currentWorkspace {
-				path
+				cwd
 				directory(path: "/", include: ["LICENSE"]) { entries }
 			}
 		}`, wd),
@@ -70,7 +70,7 @@ func TestDaggerSessionAvailableFromGoTest(t *testing.T) {
 				} `json:"directory"`
 			} `json:"host"`
 			CurrentWorkspace struct {
-				Path      string `json:"path"`
+				Cwd       string `json:"cwd"`
 				Directory struct {
 					Entries []string `json:"entries"`
 				} `json:"directory"`
@@ -90,8 +90,8 @@ func TestDaggerSessionAvailableFromGoTest(t *testing.T) {
 		t.Fatalf("unexpected nested Dagger host directory entries: %v", entries)
 	}
 
-	if result.Data.CurrentWorkspace.Path != "testdata/go-module-with-testdata" {
-		t.Fatalf("unexpected nested Dagger workspace path: %q", result.Data.CurrentWorkspace.Path)
+	if result.Data.CurrentWorkspace.Cwd != "/testdata/go-module-with-testdata" {
+		t.Fatalf("unexpected nested Dagger workspace cwd: %q", result.Data.CurrentWorkspace.Cwd)
 	}
 	if !contains(result.Data.CurrentWorkspace.Directory.Entries, "LICENSE") {
 		t.Fatalf("unexpected nested Dagger workspace entries: %v", result.Data.CurrentWorkspace.Directory.Entries)