fix: change go module name to match dagger module name

.changes/unreleased/Fixed-20240304-100555.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Dagger go modules default to the module name instead of "main"
+time: 2024-03-04T10:05:55.625933343Z
+custom:
+  Author: jedevc
+  PR: "6774"

cmd/codegen/generator/go/generator.go

@@ -198,7 +198,7 @@ func (g *GoGenerator) bootstrapMod(ctx context.Context, mfs *memfs.FS) (*Package
 
 			// bootstrap go.mod using dependencies from the embedded Go SDK
 
-			newModName := "main" // use a safe default, not going to be a reserved word. User is free to modify
+			newModName := fmt.Sprintf("dagger/%s", strcase.ToKebab(g.Config.ModuleName))
 
 			newMod.AddModuleStmt(newModName)
 			newMod.AddGoStmt(goVersion.String())
@@ -249,7 +249,7 @@ func generateCode(
 	tmpls := templates.Templates(funcs)
 
 	for k, tmpl := range tmpls {
-		dt, err := renderFile(ctx, cfg, schema, pkgInfo, tmpl)
+		dt, err := renderFile(cfg, schema, pkgInfo, tmpl)
 		if err != nil {
 			return err
 		}
@@ -269,7 +269,6 @@ func generateCode(
 }
 
 func renderFile(
-	ctx context.Context,
 	cfg generator.Config,
 	schema *introspection.Schema,
 	pkgInfo *PackageInfo,

core/integration/module_test.go

@@ -82,7 +82,7 @@ func TestModuleGoInit(t *testing.T) {
 
 		generated, err := modGen.File("go.mod").Contents(ctx)
 		require.NoError(t, err)
-		require.Contains(t, generated, "module main")
+		require.Contains(t, generated, "module dagger/my-module")
 	})
 
 	t.Run("creates go.mod beneath an existing go.mod if context is beneath it", func(t *testing.T) {
@@ -112,7 +112,7 @@ func TestModuleGoInit(t *testing.T) {
 		t.Run("names Go module after Dagger module", func(t *testing.T) {
 			generated, err := modGen.Directory("dagger").File("go.mod").Contents(ctx)
 			require.NoError(t, err)
-			require.Contains(t, generated, "module main")
+			require.Contains(t, generated, "module dagger/beneath-go-mod")
 		})
 	})
 
@@ -192,6 +192,34 @@ func TestModuleGoInit(t *testing.T) {
 		})
 	})
 
+	t.Run("respects go.work for subdir if git dir", func(t *testing.T) {
+		t.Parallel()
+
+		c, ctx := connect(t)
+
+		modGen := goGitBase(t, c).
+			WithMountedFile(testCLIBinPath, daggerCliFile(t, c)).
+			WithWorkdir("/work").
+			WithExec([]string{"go", "mod", "init", "example.com/test"}).
+			WithExec([]string{"go", "work", "init"}).
+			WithExec([]string{"go", "work", "use", "."}).
+			With(daggerExec("init", "--name=hasGoMod", "--sdk=go", "subdir"))
+
+		out, err := modGen.
+			WithWorkdir("./subdir").
+			With(daggerQuery(`{hasGoMod{containerEcho(stringArg:"hello"){stdout}}}`)).
+			Stdout(ctx)
+		require.NoError(t, err)
+		require.JSONEq(t, `{"hasGoMod":{"containerEcho":{"stdout":"hello\n"}}}`, out)
+
+		t.Run("go.work is edited", func(t *testing.T) {
+			generated, err := modGen.File("go.work").Contents(ctx)
+			require.NoError(t, err)
+			require.Contains(t, generated, "\t.\n")
+			require.Contains(t, generated, "\t./subdir/dagger\n")
+		})
+	})
+
 	t.Run("ignores go.work for subdir", func(t *testing.T) {
 		t.Parallel()
 
@@ -394,6 +422,38 @@ func (m *HasNotMainGo) Hello() string { return "Hello, world!" }
 		require.NoError(t, err)
 		require.NotContains(t, sourceRootEnts, "main.go")
 	})
+
+	t.Run("multiple modules in go.work", func(t *testing.T) {
+		t.Parallel()
+
+		c, ctx := connect(t)
+
+		modGen := goGitBase(t, c).
+			WithMountedFile(testCLIBinPath, daggerCliFile(t, c)).
+			WithWorkdir("/work").
+			WithExec([]string{"go", "work", "init"}).
+			With(daggerExec("init", "--sdk=go", "foo")).
+			With(daggerExec("init", "--sdk=go", "bar"))
+
+		generated, err := modGen.File("go.work").Contents(ctx)
+		require.NoError(t, err)
+		require.Contains(t, generated, "\t./foo/dagger\n")
+		require.Contains(t, generated, "\t./bar/dagger\n")
+
+		out, err := modGen.
+			WithWorkdir("./foo").
+			With(daggerQuery(`{foo{containerEcho(stringArg:"hello"){stdout}}}`)).
+			Stdout(ctx)
+		require.NoError(t, err)
+		require.JSONEq(t, `{"foo":{"containerEcho":{"stdout":"hello\n"}}}`, out)
+
+		out, err = modGen.
+			WithWorkdir("./bar").
+			With(daggerQuery(`{bar{containerEcho(stringArg:"hello"){stdout}}}`)).
+			Stdout(ctx)
+		require.NoError(t, err)
+		require.JSONEq(t, `{"bar":{"containerEcho":{"stdout":"hello\n"}}}`, out)
+	})
 }
 
 func TestModuleInitLICENSE(t *testing.T) {
@@ -2962,7 +3022,7 @@ type Test struct{}
 
 func (m *Test) Fn(ctx context.Context) string {
 	resp := &graphql.Response{}
-	err := dag.Client.MakeRequest(ctx, &graphql.Request{
+	err := dag.GraphQLClient().MakeRequest(ctx, &graphql.Request{
 		Query: "{host{unixSocket(path:\"/some/sock\"){id}}}",
 	}, resp)
 	if err != nil {
@@ -3158,7 +3218,7 @@ func TestModuleGoUseDaggerTypesDirect(t *testing.T) {
 		WithNewFile("main.go", dagger.ContainerWithNewFileOpts{
 			Contents: `package main
 
-import "main/internal/dagger"
+import "dagger/minimal/internal/dagger"
 
 type Minimal struct{}
 
@@ -3201,7 +3261,7 @@ func TestModuleGoUtilsPkg(t *testing.T) {
 
 import (
 	"context"
-	"main/utils"
+	"dagger/minimal/utils"
 )
 
 type Minimal struct{}
@@ -3215,7 +3275,7 @@ func (m *Minimal) Hello(ctx context.Context) (string, error) {
 		WithNewFile("utils/util.go", dagger.ContainerWithNewFileOpts{
 			Contents: `package utils
 
-import "main/internal/dagger"
+import "dagger/minimal/internal/dagger"
 
 func Foo() *dagger.Directory {
 	return dagger.Connect().Directory().WithNewFile("/foo", "hello world")