chore: PoC - Support configuration of timeout in schema

tools/codegen/codespec/api_to_provider_spec_mapper_test.go

@@ -337,6 +337,12 @@ func TestConvertToProviderSpec_nested_schemaOverrides(t *testing.T) {
 									},
 								},
 							},
+							{
+								Name: "timeouts",
+								Timeouts: &codespec.TimeoutsAttribute{
+									ConfigurableTimeouts: []codespec.Operation{codespec.Create, codespec.Read, codespec.Update, codespec.Delete},
+								},
+							},
 						},
 					},
 					Name: "test_resource_with_nested_attr_overrides",

tools/codegen/codespec/config.go

@@ -1,6 +1,7 @@
 package codespec
 
 import (
+	"log"
 	"strings"
 
 	"github.com/mongodb/terraform-provider-mongodbatlas/tools/codegen/config"
@@ -33,6 +34,10 @@ func applySchemaOptions(schemaOptions config.SchemaOptions, attributes *Attribut
 		finalAttributes = append(finalAttributes, *attr)
 	}
 
+	if timeoutAttr := applyTimeoutConfig(schemaOptions); parentName == "" && timeoutAttr != nil { // will not run for nested attributes
+		finalAttributes = append(finalAttributes, *timeoutAttr)
+	}
+
 	*attributes = finalAttributes
 }
 
@@ -91,3 +96,28 @@ func processNestedAttributes(attr *Attribute, schemaOptions config.SchemaOptions
 		applySchemaOptions(schemaOptions, &attr.MapNested.NestedObject.Attributes, attrPathName)
 	}
 }
+
+func applyTimeoutConfig(options config.SchemaOptions) *Attribute {
+	var result []Operation
+	for _, op := range options.Timeouts {
+		switch op {
+		case "create":
+			result = append(result, Create)
+		case "read":
+			result = append(result, Read)
+		case "delete":
+			result = append(result, Delete)
+		case "update":
+			result = append(result, Update)
+		default:
+			log.Printf("[WARN] Unknown operation type defined in timeout configuration: %s", op)
+		}
+	}
+	if result != nil {
+		return &Attribute{
+			Name:     "timeouts",
+			Timeouts: &TimeoutsAttribute{ConfigurableTimeouts: result},
+		}
+	}
+	return nil
+}

tools/codegen/codespec/model.go

@@ -44,6 +44,7 @@ type Attribute struct {
 	Set          *SetAttribute
 	Int64        *Int64Attribute
 	SingleNested *SingleNestedAttribute
+	Timeouts     *TimeoutsAttribute
 
 	Description              *string
 	Name                     SnakeCaseString
@@ -99,6 +100,19 @@ type NestedAttributeObject struct {
 	Attributes Attributes
 }
 
+type TimeoutsAttribute struct {
+	ConfigurableTimeouts []Operation
+}
+
+type Operation int
+
+const (
+	Create Operation = iota
+	Update
+	Read
+	Delete
+)
+
 type CustomDefault struct {
 	Definition string
 	Imports    []string

tools/codegen/codespec/testdata/config-nested-schema-overrides.yml

@@ -24,4 +24,5 @@ resources:
         nested_list_array_attr.inner_num_attr_alias:
           description: "Overridden inner_num_attr_alias description"
         outer_object.nested_level1.level_field1_alias:
-          description: "Overridden level_field1_alias description"
+          description: "Overridden level_field1_alias description"
+      timeouts: ["create", "read", "update", "delete"]

tools/codegen/codespec/testdata/config-no-schema-opts.yml

@@ -11,4 +11,4 @@ resources:
       method: PATCH
     delete:
       path: /api/atlas/v2/groups/{groupId}/testResource
-      method: DELETE
+      method: DELETE

tools/codegen/codespec/testdata/config.yml

@@ -33,4 +33,4 @@ resources:
             optional: true
             computed: true
 
-      timeouts: ["create", "read", "delete"]
+      timeouts: ["create", "read", "delete"]

tools/codegen/config.yml

@@ -9,30 +9,27 @@ resources:
     schema:
       aliases:
         group_id: project_id
-
       ignores: ["links"]
+      timeouts: ["create", "update", "delete"]
 
-      overrides:
-        project_id:
-          description: "Unique 24-hexadecimal digit string that identifies your project."
-          plan_modifiers: [{
-              imports: [ "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" ],
-              definition: "stringplanmodifier.RequiresReplace()"
-          }]
-          validators: [{
-            imports: [
-            "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator",
-            "github.com/hashicorp/terraform-plugin-framework/path"
-            ],
-            definition: "stringvalidator.ConflictsWith(path.MatchRoot(\"name\"))"
-          }]
-
-        prefix_path:
-          computability:
-            optional: true
-            computed: true
+      # overrides:
+      #   project_id:
+      #     plan_modifiers: [{
+      #         imports: [ "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" ],
+      #         definition: "stringplanmodifier.RequiresReplace()"
+      #     }]
+      #     validators: [{
+      #       imports: [
+      #       "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator",
+      #       "github.com/hashicorp/terraform-plugin-framework/path"
+      #       ],
+      #       definition: "stringvalidator.ConflictsWith(path.MatchRoot(\"name\"))"
+      #     }]
 
-      timeouts: ["create", "read", "delete"]
+      #   prefix_path:
+      #     computability:
+      #       optional: true
+      #       computed: true
 
   search_deployment:
     read:
@@ -45,4 +42,4 @@ resources:
       aliases:
         group_id: project_id
       ignores: ["links"]
-      timeouts: ["create", "read", "delete"]
+      timeouts: ["create", "update", "delete"]

tools/codegen/schema/schema_attribute.go

@@ -11,7 +11,7 @@ func GenerateSchemaAttributes(attrs codespec.Attributes) CodeStatement {
 	attrsCode := []string{}
 	imports := []string{}
 	for i := range attrs {
-		result := generateAttribute(&attrs[i])
+		result := generator(&attrs[i]).AttributeCode()
 		attrsCode = append(attrsCode, result.Code)
 		imports = append(imports, result.Imports...)
 	}
@@ -22,24 +22,102 @@ func GenerateSchemaAttributes(attrs codespec.Attributes) CodeStatement {
 	}
 }
 
-func generateAttribute(attr *codespec.Attribute) CodeStatement {
-	generator := typeGenerator(attr)
+type attributeGenerator interface {
+	AttributeCode() CodeStatement
+}
 
-	typeDefinition := generator.TypeDefinition()
-	additionalPropertyStatements := generator.TypeSpecificProperties()
+func generator(attr *codespec.Attribute) attributeGenerator {
+	if attr.Int64 != nil {
+		return &Int64AttrGenerator{intModel: *attr.Int64, attr: *attr}
+	}
+	if attr.Float64 != nil {
+		return &Float64AttrGenerator{
+			floatModel: *attr.Float64,
+			attr:       *attr,
+		}
+	}
+	if attr.String != nil {
+		return &StringAttrGenerator{
+			stringModel: *attr.String,
+			attr:        *attr,
+		}
+	}
+	if attr.Bool != nil {
+		return &BoolAttrGenerator{
+			boolModel: *attr.Bool,
+			attr:      *attr,
+		}
+	}
+	if attr.List != nil {
+		return &ListAttrGenerator{
+			listModel: *attr.List,
+			attr:      *attr,
+		}
+	}
+	if attr.ListNested != nil {
+		return &ListNestedAttrGenerator{
+			listNestedModel: *attr.ListNested,
+			attr:            *attr,
+		}
+	}
+	if attr.Map != nil {
+		return &MapAttrGenerator{
+			mapModel: *attr.Map,
+			attr:     *attr,
+		}
+	}
+	if attr.MapNested != nil {
+		return &MapNestedAttrGenerator{
+			mapNestedModel: *attr.MapNested,
+			attr:           *attr,
+		}
+	}
+	if attr.Number != nil {
+		return &NumberAttrGenerator{
+			numberModel: *attr.Number,
+			attr:        *attr,
+		}
+	}
+	if attr.Set != nil {
+		return &SetAttrGenerator{
+			setModel: *attr.Set,
+			attr:     *attr,
+		}
+	}
+	if attr.SetNested != nil {
+		return &SetNestedGenerator{
+			setNestedModel: *attr.SetNested,
+			attr:           *attr,
+		}
+	}
+	if attr.SingleNested != nil {
+		return &SingleNestedAttrGenerator{
+			singleNestedModel: *attr.SingleNested,
+			attr:              *attr,
+		}
+	}
+	if attr.Timeouts != nil {
+		return &timeoutAttributeGenerator{
+			timeouts: *attr.Timeouts,
+		}
+	}
+	panic("Attribute with unknown type defined when generating schema attribute")
+}
 
+// generation of conventional attribute types which have common properties like MarkdownDescription, Computed/Optional/Required, Sensitive
+func commonAttrStructure(attr *codespec.Attribute, typeDef string, specificProperties []CodeStatement) CodeStatement {
 	properties := commonProperties(attr)
-	imports := []string{"github.com/hashicorp/terraform-plugin-framework/resource/schema"}
-	for i := range additionalPropertyStatements {
-		properties = append(properties, additionalPropertyStatements[i].Code)
-		imports = append(imports, additionalPropertyStatements[i].Imports...)
+	imports := []string{}
+	for i := range specificProperties {
+		properties = append(properties, specificProperties[i].Code)
+		imports = append(imports, specificProperties[i].Imports...)
 	}
 
 	name := attr.Name
 	propsResultString := strings.Join(properties, ",\n") + ","
 	code := fmt.Sprintf(`"%s": %s{
 		%s
-	}`, name, typeDefinition, propsResultString)
+	}`, name, typeDef, propsResultString)
 	return CodeStatement{
 		Code:    code,
 		Imports: imports,
@@ -65,48 +143,3 @@ func commonProperties(attr *codespec.Attribute) []string {
 	}
 	return result
 }
-
-type schemaAttributeGenerator interface {
-	TypeDefinition() string
-	TypeSpecificProperties() []CodeStatement
-}
-
-func typeGenerator(attr *codespec.Attribute) schemaAttributeGenerator {
-	if attr.Int64 != nil {
-		return &Int64AttrGenerator{model: *attr.Int64}
-	}
-	if attr.Float64 != nil {
-		return &Float64AttrGenerator{model: *attr.Float64}
-	}
-	if attr.String != nil {
-		return &StringAttrGenerator{model: *attr.String}
-	}
-	if attr.Bool != nil {
-		return &BoolAttrGenerator{model: *attr.Bool}
-	}
-	if attr.List != nil {
-		return &ListAttrGenerator{model: *attr.List}
-	}
-	if attr.ListNested != nil {
-		return &ListNestedAttrGenerator{model: *attr.ListNested}
-	}
-	if attr.Map != nil {
-		return &MapAttrGenerator{model: *attr.Map}
-	}
-	if attr.MapNested != nil {
-		return &MapNestedAttrGenerator{model: *attr.MapNested}
-	}
-	if attr.Number != nil {
-		return &NumberAttrGenerator{model: *attr.Number}
-	}
-	if attr.Set != nil {
-		return &SetAttrGenerator{model: *attr.Set}
-	}
-	if attr.SetNested != nil {
-		return &SetNestedGenerator{model: *attr.SetNested}
-	}
-	if attr.SingleNested != nil {
-		return &SingleNestedAttrGenerator{model: *attr.SingleNested}
-	}
-	panic("Attribute with unknown type defined")
-}