passes the generated Attribute struct to custom type gen functions so…

… things like Description can be captured (#44)

VERSION

@@ -1 +1 @@
-v2.2.0
+v3.0.0

gen_schema.go

@@ -119,10 +119,6 @@ func NewFieldSchemaGenerator(f *Field, i *Imports) *FieldSchemaGenerator {
 
 // Generate returns field schema
 func (f *FieldSchemaGenerator) Generate() *j.Statement {
-	if f.Kind == CustomKind {
-		return j.Id("GenSchema" + f.Suffix).Call(j.Id("ctx"))
-	}
-
 	d := j.Dict{
 		j.Id("Description"): j.Lit(f.Comment),
 		j.Id("Type"):        f.schemaType(), // nils are automatically omitted
@@ -156,6 +152,10 @@ func (f *FieldSchemaGenerator) Generate() *j.Statement {
 		d[j.Id("PlanModifiers")] = generatePlanModifiers(f.i, f.PlanModifiers)
 	}
 
+	if f.Kind == CustomKind {
+		return j.Id("GenSchema"+f.Suffix).Call(j.Id("ctx"), j.Id(f.i.WithPackage(SDK, "Attribute")).Values(d))
+	}
+
 	return j.Values(d)
 }
 

test/custom_types.go

@@ -24,11 +24,13 @@ func (d Duration) String() string {
 type BoolCustom bool
 
 // GenSchemaBoolSpecial generates custom field schema (bool list)
-func GenSchemaBoolSpecial(_ context.Context) tfsdk.Attribute {
+func GenSchemaBoolSpecial(_ context.Context, attr tfsdk.Attribute) tfsdk.Attribute {
 	return tfsdk.Attribute{
 		Type: types.ListType{
 			ElemType: types.BoolType,
 		},
+		Description: attr.Description,
+		Optional:    attr.Optional,
 	}
 }
 
@@ -84,7 +86,7 @@ func CopyToBoolSpecial(diags diag.Diagnostics, obj []BoolCustom, t attr.Type, v
 // single go string by joining all elements with "/".
 
 // GenSchemaStringCustom returns the StringCustom schema.
-func GenSchemaStringCustom(_ context.Context) tfsdk.Attribute {
+func GenSchemaStringCustom(_ context.Context, _ tfsdk.Attribute) tfsdk.Attribute {
 	return tfsdk.Attribute{
 		Type: types.ListType{
 			ElemType: types.StringType,

test/schema_test.go

@@ -16,4 +16,6 @@ func TestSchema(t *testing.T) {
 	require.True(t, schema.Attributes["id"].Computed)
 	require.Len(t, schema.Attributes["str"].PlanModifiers, 1)
 	require.Len(t, schema.Attributes["str"].Validators, 1)
+	require.Equal(t, "BoolCustomList []bool field", schema.Attributes["bool_custom_list"].Description)
+	require.True(t, schema.Attributes["bool_custom_list"].Optional)
 }