Fix no longer being able to place types in top-level modules #1300

pkg/tfgen/generate_schema.go

@@ -1002,14 +1002,15 @@ func modulePlacementForType(pkg tokens.Package, path paths.TypePath) tokens.Modu
 			// root module).
 			return res.Token().Module()
 		}
-		// Supplementary types are defined one level up from
-		// the module defining the resource.
-		return parentModule(res.Token().Module())
+		// Supplementary types are typically defined one level up from the module defining the resource, but may
+		// also be defined in the same module.
+		m := res.Token().Module()
+		return parentModuleOrSelf(m)
 	case *paths.DataSourceMemberPath:
-		dataSourceModule := pp.DataSourcePath.Token().Module()
-		// Supplementary types are defined one level up from
-		// the module defining the data source.
-		return parentModule(dataSourceModule)
+		// Supplementary types are typically defined one level up from the module defining the data source, but
+		// may also be defined in the same module.
+		m := pp.DataSourcePath.Token().Module()
+		return parentModuleOrSelf(m)
 	case *paths.ConfigPath:
 		return tokens.NewModuleToken(pkg, configMod)
 	default:
@@ -1018,8 +1019,18 @@ func modulePlacementForType(pkg tokens.Package, path paths.TypePath) tokens.Modu
 	}
 }
 
-func parentModule(m tokens.Module) tokens.Module {
-	return tokens.NewModuleToken(m.Package(), parentModuleName(m.Name()))
+func parentModuleOrSelf(self tokens.Module) tokens.Module {
+	if m, ok := parentModule(self); ok {
+		return m
+	}
+	return self
+}
+
+func parentModule(m tokens.Module) (tokens.Module, bool) {
+	if !strings.Contains(string(m.Name()), tokens.QNameDelimiter) {
+		return "", false
+	}
+	return tokens.NewModuleToken(m.Package(), parentModuleName(m.Name())), true
 }
 
 func parentModuleName(m tokens.ModuleName) tokens.ModuleName {

pkg/tfgen/generate_test.go

@@ -15,6 +15,7 @@
 package tfgen
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -281,3 +282,85 @@ func Test_ProviderWithObjectTypesInConfigCanGenerateRenames(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, "foo_bar", r.Renames.RenamedProperties["test:index/ProviderProp:ProviderProp"]["fooBar"])
 }
+
+func TestModulePlacementForType(t *testing.T) {
+	t.Parallel()
+
+	type testCase struct {
+		pkg    tokens.Package
+		path   paths.TypePath
+		expect tokens.Module
+	}
+
+	prop := paths.PropertyName{Key: "prop", Name: "prop"}
+
+	testCases := []testCase{
+		// Resource in top-level module mymod is placed to myprov:mymod.
+		{
+			"myprov",
+			paths.NewProperyPath(paths.NewResourcePath(
+				"myprov_myres",
+				"myprov:mymod:MyRes",
+				false, /*isProvider*/
+			).Inputs(), prop),
+			"myprov:mymod",
+		},
+		// Resource in second-level module mymod is placed to parent myprov:mymod.
+		{
+			"myprov",
+			paths.NewProperyPath(paths.NewResourcePath(
+				"myprov_myres",
+				"myprov:mymod/mysubmod:MyRes",
+				false, /*isProvider*/
+			).Inputs(), prop),
+			"myprov:mymod",
+		},
+		// Resource in third-level module mymod is placed to parent myprov:mymod/mysubmod.
+		{
+			"myprov",
+			paths.NewProperyPath(paths.NewResourcePath(
+				"myprov_myres",
+				"myprov:mymod/mysubmod/mysubsubmod:MyRes",
+				false, /*isProvider*/
+			).Inputs(), prop),
+			"myprov:mymod/mysubmod",
+		},
+		// Datasource in top-level module mymod is placed to myprov:mymod.
+		{
+			"myprov",
+			paths.NewProperyPath(paths.NewDataSourcePath(
+				"myprov_myds",
+				"myprov:mymod:MyFn",
+			).Args(), prop),
+			"myprov:mymod",
+		},
+		// Datasource in second-level module mymod is placed to parent myprov:mymod.
+		{
+			"myprov",
+			paths.NewProperyPath(paths.NewDataSourcePath(
+				"myprov_myds",
+				"myprov:mymod/mysubmod:MyFn",
+			).Args(), prop),
+			"myprov:mymod",
+		},
+		// Datasource in third-level module mymod is placed to parent myprov:mymod/mysubmod.
+		{
+			"myprov",
+			paths.NewProperyPath(paths.NewDataSourcePath(
+				"myprov_ds",
+				"myprov:mymod/mysubmod/mysubsubmod:MyFn",
+			).Args(), prop),
+			"myprov:mymod/mysubmod",
+		},
+	}
+
+	for i, tc := range testCases {
+		tc := tc
+		t.Run(fmt.Sprintf("testCase-%d", i), func(t *testing.T) {
+			t.Parallel()
+			mod := modulePlacementForType(tc.pkg, tc.path)
+			assert.Equal(t, tc.expect, mod)
+		})
+	}
+
+}