implement delete_on_create_timeout

Author: oarbusi

internal/common/cleanup/handle_timeout.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
 )
@@ -99,3 +100,14 @@ func ResolveTimeout(ctx context.Context, t *timeouts.Value, operationName string
 	}
 	return timeoutDuration
 }
+
+// ResolveDeleteOnCreateTimeout returns true if delete_on_create_timeout should be enabled.
+// Default behavior is true when not explicitly set to false.
+func ResolveDeleteOnCreateTimeout(deleteOnCreateTimeout types.Bool) bool {
+	// If null or unknown, default to true
+	if deleteOnCreateTimeout.IsNull() || deleteOnCreateTimeout.IsUnknown() {
+		return true
+	}
+	// Otherwise use the explicit value
+	return deleteOnCreateTimeout.ValueBool()
+}

internal/service/encryptionatrestprivateendpoint/resource.go

@@ -70,12 +70,22 @@ func (r *encryptionAtRestPrivateEndpointRS) Create(ctx context.Context, req reso
 	}
 
 	finalResp, err := waitStateTransition(ctx, projectID, cloudProvider, createResp.GetId(), connV2.EncryptionAtRestUsingCustomerKeyManagementApi, createTimeout)
+	err = cleanup.HandleCreateTimeout(cleanup.ResolveDeleteOnCreateTimeout(earPrivateEndpointPlan.DeleteOnCreateTimeout), err, func(ctxCleanup context.Context) error {
+		cleanResp, cleanErr := connV2.EncryptionAtRestUsingCustomerKeyManagementApi.RequestEncryptionAtRestPrivateEndpointDeletion(ctxCleanup, projectID, cloudProvider, createResp.GetId()).Execute()
+		if validate.StatusNotFound(cleanResp) {
+			return nil
+		}
+		return cleanErr
+	})
+
 	if err != nil {
 		resp.Diagnostics.AddError("error when waiting for status transition in creation", err.Error())
 		return
 	}
 
 	privateEndpointModel := NewTFEarPrivateEndpoint(*finalResp, projectID)
+	privateEndpointModel.Timeouts = earPrivateEndpointPlan.Timeouts
+	privateEndpointModel.DeleteOnCreateTimeout = earPrivateEndpointPlan.DeleteOnCreateTimeout
 	resp.Diagnostics.Append(resp.State.Set(ctx, privateEndpointModel)...)
 
 	diags := CheckErrorMessageAndStatus(finalResp)
@@ -104,7 +114,10 @@ func (r *encryptionAtRestPrivateEndpointRS) Read(ctx context.Context, req resour
 		return
 	}
 
-	resp.Diagnostics.Append(resp.State.Set(ctx, NewTFEarPrivateEndpoint(*endpointModel, projectID))...)
+	privateEndpointModel := NewTFEarPrivateEndpoint(*endpointModel, projectID)
+	privateEndpointModel.Timeouts = earPrivateEndpointState.Timeouts
+	privateEndpointModel.DeleteOnCreateTimeout = earPrivateEndpointState.DeleteOnCreateTimeout
+	resp.Diagnostics.Append(resp.State.Set(ctx, privateEndpointModel)...)
 
 	diags := CheckErrorMessageAndStatus(endpointModel)
 	resp.Diagnostics.Append(diags...)

internal/service/encryptionatrestprivateendpoint/resource_schema.go

@@ -5,7 +5,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/customplanmodifier"
 )
 
 func ResourceSchema(ctx context.Context) schema.Schema {
@@ -43,6 +45,13 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 				Create: true,
 				Delete: true,
 			}),
+			"delete_on_create_timeout": schema.BoolAttribute{
+				Optional: true,
+				PlanModifiers: []planmodifier.Bool{
+					customplanmodifier.CreateOnlyBoolPlanModifier(),
+				},
+				MarkdownDescription: "Indicates whether to delete the created resource if a timeout is reached when waiting for completion. When set to `true` and timeout occurs, it triggers the cleanup and returns immediately without waiting for deletion to complete. When set to `false`, the timeout will not trigger resource deletion. If you suspect a transient error when the value is `true`, wait before retrying to allow resource deletion to finish. Default is `true`.",
+			},
 		},
 	}
 }
@@ -56,4 +65,5 @@ type TFEarPrivateEndpointModel struct {
 	RegionName                    types.String   `tfsdk:"region_name"`
 	Status                        types.String   `tfsdk:"status"`
 	Timeouts                      timeouts.Value `tfsdk:"timeouts"`
+	DeleteOnCreateTimeout         types.Bool     `tfsdk:"delete_on_create_timeout"`
 }

internal/service/flexcluster/resource.go

@@ -80,7 +80,7 @@ func (r *rs) Create(ctx context.Context, req resource.CreateRequest, resp *resou
 	flexClusterResp, err := CreateFlexCluster(ctx, projectID, clusterName, flexClusterReq, connV2.FlexClustersApi, &createTimeout)
 
 	// Handle timeout with cleanup logic
-	deleteOnCreateTimeout := resolveDeleteOnCreateTimeout(tfModel.DeleteOnCreateTimeout)
+	deleteOnCreateTimeout := cleanup.ResolveDeleteOnCreateTimeout(tfModel.DeleteOnCreateTimeout)
 	err = cleanup.HandleCreateTimeout(deleteOnCreateTimeout, err, func(ctxCleanup context.Context) error {
 		cleanResp, cleanErr := r.Client.AtlasV2.FlexClustersApi.DeleteFlexCluster(ctxCleanup, projectID, clusterName).Execute()
 		if validate.StatusNotFound(cleanResp) {
@@ -241,17 +241,6 @@ func splitFlexClusterImportID(id string) (projectID, clusterName *string, err er
 	return
 }
 
-// resolveDeleteOnCreateTimeout returns true if delete_on_create_timeout should be enabled.
-// Default behavior is true when not explicitly set to false.
-func resolveDeleteOnCreateTimeout(deleteOnCreateTimeout types.Bool) bool {
-	// If null or unknown, default to true
-	if deleteOnCreateTimeout.IsNull() || deleteOnCreateTimeout.IsUnknown() {
-		return true
-	}
-	// Otherwise use the explicit value
-	return deleteOnCreateTimeout.ValueBool()
-}
-
 func CreateFlexCluster(ctx context.Context, projectID, clusterName string, flexClusterReq *admin.FlexClusterDescriptionCreate20241113, client admin.FlexClustersApi, timeout *time.Duration) (*admin.FlexClusterDescription20241113, error) {
 	_, _, err := client.CreateFlexCluster(ctx, projectID, flexClusterReq).Execute()
 	if err != nil {