Move toproto5/6 Deferred conversion handling to its own files

Author: SBGoods

internal/toproto5/deferred.go

@@ -0,0 +1,29 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package toproto5
+
+import (
+	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+
+	"github.com/hashicorp/terraform-plugin-framework/datasource"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+)
+
+func DataSourceDeferred(fw *datasource.Deferred) *tfprotov5.Deferred {
+	if fw == nil {
+		return nil
+	}
+	return &tfprotov5.Deferred{
+		Reason: tfprotov5.DeferredReason(fw.Reason),
+	}
+}
+
+func ResourceDeferred(fw *resource.Deferred) *tfprotov5.Deferred {
+	if fw == nil {
+		return nil
+	}
+	return &tfprotov5.Deferred{
+		Reason: tfprotov5.DeferredReason(fw.Reason),
+	}
+}

internal/toproto5/importresourcestate.go

@@ -19,6 +19,7 @@ func ImportResourceStateResponse(ctx context.Context, fw *fwserver.ImportResourc
 	}
 
 	proto5 := &tfprotov5.ImportResourceStateResponse{
+		Deferred:    ResourceDeferred(fw.Deferred),
 		Diagnostics: Diagnostics(ctx, fw.Diagnostics),
 	}
 
@@ -34,11 +35,5 @@ func ImportResourceStateResponse(ctx context.Context, fw *fwserver.ImportResourc
 		proto5.ImportedResources = append(proto5.ImportedResources, proto5ImportedResource)
 	}
 
-	if fw.Deferred != nil {
-		proto5.Deferred = &tfprotov5.Deferred{
-			Reason: tfprotov5.DeferredReason(fw.Deferred.Reason),
-		}
-	}
-
 	return proto5
 }

internal/toproto5/planresourcechange.go

@@ -20,6 +20,7 @@ func PlanResourceChangeResponse(ctx context.Context, fw *fwserver.PlanResourceCh
 	}
 
 	proto5 := &tfprotov5.PlanResourceChangeResponse{
+		Deferred:    ResourceDeferred(fw.Deferred),
 		Diagnostics: Diagnostics(ctx, fw.Diagnostics),
 	}
 
@@ -38,11 +39,5 @@ func PlanResourceChangeResponse(ctx context.Context, fw *fwserver.PlanResourceCh
 	proto5.Diagnostics = append(proto5.Diagnostics, Diagnostics(ctx, diags)...)
 	proto5.PlannedPrivate = plannedPrivate
 
-	if fw.Deferred != nil {
-		proto5.Deferred = &tfprotov5.Deferred{
-			Reason: tfprotov5.DeferredReason(fw.Deferred.Reason),
-		}
-	}
-
 	return proto5
 }

internal/toproto5/readdatasource.go

@@ -19,6 +19,7 @@ func ReadDataSourceResponse(ctx context.Context, fw *fwserver.ReadDataSourceResp
 	}
 
 	proto5 := &tfprotov5.ReadDataSourceResponse{
+		Deferred:    DataSourceDeferred(fw.Deferred),
 		Diagnostics: Diagnostics(ctx, fw.Diagnostics),
 	}
 
@@ -27,11 +28,5 @@ func ReadDataSourceResponse(ctx context.Context, fw *fwserver.ReadDataSourceResp
 	proto5.Diagnostics = append(proto5.Diagnostics, Diagnostics(ctx, diags)...)
 	proto5.State = state
 
-	if fw.Deferred != nil {
-		proto5.Deferred = &tfprotov5.Deferred{
-			Reason: tfprotov5.DeferredReason(fw.Deferred.Reason),
-		}
-	}
-
 	return proto5
 }

internal/toproto5/readresource.go

@@ -19,6 +19,7 @@ func ReadResourceResponse(ctx context.Context, fw *fwserver.ReadResourceResponse
 	}
 
 	proto5 := &tfprotov5.ReadResourceResponse{
+		Deferred:    ResourceDeferred(fw.Deferred),
 		Diagnostics: Diagnostics(ctx, fw.Diagnostics),
 	}
 
@@ -32,11 +33,5 @@ func ReadResourceResponse(ctx context.Context, fw *fwserver.ReadResourceResponse
 	proto5.Diagnostics = append(proto5.Diagnostics, Diagnostics(ctx, diags)...)
 	proto5.Private = newPrivate
 
-	if fw.Deferred != nil {
-		proto5.Deferred = &tfprotov5.Deferred{
-			Reason: tfprotov5.DeferredReason(fw.Deferred.Reason),
-		}
-	}
-
 	return proto5
 }

internal/toproto6/deferred.go

@@ -0,0 +1,29 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package toproto6
+
+import (
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+
+	"github.com/hashicorp/terraform-plugin-framework/datasource"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+)
+
+func DataSourceDeferred(fw *datasource.Deferred) *tfprotov6.Deferred {
+	if fw == nil {
+		return nil
+	}
+	return &tfprotov6.Deferred{
+		Reason: tfprotov6.DeferredReason(fw.Reason),
+	}
+}
+
+func ResourceDeferred(fw *resource.Deferred) *tfprotov6.Deferred {
+	if fw == nil {
+		return nil
+	}
+	return &tfprotov6.Deferred{
+		Reason: tfprotov6.DeferredReason(fw.Reason),
+	}
+}