Control the exact type name and not prefix

Author: t0yv0

pkg/tfbridge/info/info.go

@@ -509,11 +509,13 @@ type Schema struct {
 	// whether or not to treat this property as secret
 	Secret *bool
 
-	// If specified, resets the type name prefix for any types that Pulumi needs to generate to represent the schema
-	// of the current property. Normally the names for helper object types are built from concatenating fragments
-	// representing the path to the type in the schema. The default strategy can lead to unacceptably long type
-	// names, reducing the SDK usability. Using TypePrefixOverride allows the maintainer to get shorter type names.
-	TypePrefixOverride *string
+	// Specifies the exact name to use for the generated type.
+	//
+	// When generating types for properties, by default Pulumi picks reasonable names based on the property path
+	// prefix and the name of the property. Use [TypeName] to override this decision when the default names for
+	// nested properties are too long or otherwise undesirable. The choice will further affect the automatically
+	// generated names for any properties nested under the current one.
+	TypeName *string
 }
 
 // Config represents a synthetic configuration variable that is Pulumi-only, and not passed to Terraform.

pkg/tfgen/generate.go

@@ -343,7 +343,7 @@ type propertyType struct {
 	altTypes   []tokens.Type
 	asset      *tfbridge.AssetTranslation
 
-	typePrefixOverride *string
+	typeName *string
 }
 
 func (g *Generator) Sink() diag.Sink {
@@ -356,7 +356,7 @@ func (g *Generator) makePropertyType(typePath paths.TypePath,
 
 	t := &propertyType{}
 	if info != nil {
-		t.typePrefixOverride = info.TypePrefixOverride
+		t.typeName = info.TypeName
 	}
 
 	var elemInfo *tfbridge.SchemaInfo
@@ -472,7 +472,7 @@ func (g *Generator) makeObjectPropertyType(typePath paths.TypePath,
 	}
 
 	if info != nil {
-		t.typePrefixOverride = info.TypePrefixOverride
+		t.typeName = info.TypeName
 	}
 
 	if info != nil {
@@ -565,12 +565,12 @@ func (t *propertyType) equals(other *propertyType) bool {
 		return false
 	}
 	switch {
-	case t.typePrefixOverride != nil && other.typePrefixOverride == nil:
+	case t.typeName != nil && other.typeName == nil:
 		return false
-	case t.typePrefixOverride == nil && other.typePrefixOverride != nil:
+	case t.typeName == nil && other.typeName != nil:
 		return false
-	case t.typePrefixOverride != nil && other.typePrefixOverride != nil &&
-		*t.typePrefixOverride != *other.typePrefixOverride:
+	case t.typeName != nil && other.typeName != nil &&
+		*t.typeName != *other.typeName:
 		return false
 	}
 	for i, p := range t.properties {

pkg/tfgen/generate_schema.go

@@ -119,12 +119,16 @@ type declarer interface {
 func (nt *schemaNestedTypes) declareType(typePath paths.TypePath, declarer declarer, namePrefix, name string,
 	typ *propertyType, isInput bool) string {
 
-	if typ.typePrefixOverride != nil {
-		namePrefix = *typ.typePrefixOverride
-	}
-
 	// Generate a name for this nested type.
-	typeName := namePrefix + cases.Title(language.Und, cases.NoLower).String(name)
+	var typeName string
+
+	if typ.typeName != nil {
+		// Use an explicit name if provided.
+		typeName = *typ.typeName
+	} else {
+		// Otherwise build one based on the current property name and prefix.
+		typeName = namePrefix + cases.Title(language.Und, cases.NoLower).String(name)
+	}
 
 	// Override the nested type name, if necessary.
 	if typ.nestedType.Name().String() != "" {

pkg/tfgen/generate_schema_test.go

@@ -124,7 +124,7 @@ func TestCSharpMiniRandom(t *testing.T) {
 // Test the ability to force type sharing. Some of the upstream providers generate very large concrete schemata by in
 // Go, with TF not being materially affected. The example is inspired by QuickSight types in AWS. In Pulumi the default
 // projection is going to generate named types for every instance of the shared schema. This may lead to SDK bloat. Test
-// the ability of the provider author to curb the bloat and force an explit sharing.
+// the ability of the provider author to curb the bloat and force an explicit sharing.
 func TestTypeSharing(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skipf("Skipping on Windows due to a test setup issue")
@@ -224,7 +224,7 @@ func TestTypeSharing(t *testing.T) {
 							Fields: map[string]*info.Schema{
 								"visuals": {
 									Elem: &info.Schema{
-										TypePrefixOverride: tfbridge.StringRef(""),
+										TypeName: tfbridge.StringRef("Visual"),
 									},
 								},
 							},