resolve PR comments

SBGoods · SBGoods · commit 1b972ed93a1b · 2025-09-15T18:04:19.000-04:00
diff --git a/action/action.go b/action/action.go
@@ -12,9 +12,8 @@ type Action interface {
 	// Metadata should return the full name of the action, such as examplecloud_do_thing.
 	Metadata(context.Context, MetadataRequest, *MetadataResponse)
 
-	// Invoke is called to run the logic of the action and update linked resources if applicable.
-	// Config, linked resource planned state, and linked resource prior state values should
-	// be read from the InvokeRequest and new linked resource state values set on the InvokeResponse.
+	// Invoke is called to run the logic of the action. Config values should be read from the InvokeRequest
+	// and potential diagnostics set in InvokeResponse.
 	//
 	// The [InvokeResponse.SendProgress] function can be called in the Invoke method to immediately
 	// report progress events related to the invocation of the action to Terraform.
diff --git a/action/invoke.go b/action/invoke.go
@@ -26,8 +26,6 @@ type InvokeResponse struct {
 
 	// SendProgress will immediately send a progress update to Terraform core during action invocation.
 	// This function is provided by the framework and can be called multiple times while action logic is running.
-	//
-	// TODO:Actions: More documentation about when you should use this / when you shouldn't
 	SendProgress func(event InvokeProgressEvent)
 }
 
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.24.2
 
 require (
 	github.com/google/go-cmp v0.7.0
-	github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915191812-03e996589dc2
+	github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915194700-c3810b1245c0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 )
 
diff --git a/go.sum b/go.sum
@@ -25,6 +25,8 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/C
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915191812-03e996589dc2 h1:pIsyFp21b3YVOSd/94yiQI1MWXsBWTsSZ6Qj8/gkMc8=
 github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915191812-03e996589dc2/go.mod h1:vYZbIyvxyy0FWSmDHChCqKvI40cFTDGSb3D8D70i9GM=
+github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915194700-c3810b1245c0 h1:4dh8RXeFIH1v4mOgv70OvrbZWC5vDEWiEXIRFIA63S0=
+github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915194700-c3810b1245c0/go.mod h1:vYZbIyvxyy0FWSmDHChCqKvI40cFTDGSb3D8D70i9GM=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
 github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
 github.com/hashicorp/terraform-registry-address v0.4.0 h1:S1yCGomj30Sao4l5BMPjTGZmCNzuv7/GDTDX99E9gTk=
diff --git a/internal/fromproto5/invokeaction.go b/internal/fromproto5/invokeaction.go
@@ -47,7 +47,5 @@ func InvokeActionRequest(ctx context.Context, proto5 *tfprotov5.InvokeActionRequ
 
 	fw.Config = config
 
-	// TODO:Actions: Add linked resources when new action schema types are introduced
-
 	return fw, diags
 }
diff --git a/internal/fromproto5/planaction.go b/internal/fromproto5/planaction.go
@@ -48,7 +48,5 @@ func PlanActionRequest(ctx context.Context, proto5 *tfprotov5.PlanActionRequest,
 
 	fw.Config = config
 
-	// TODO:Actions: Add linked resources when new action schema types are introduced
-
 	return fw, diags
 }
diff --git a/internal/fromproto5/validateactionconfig.go b/internal/fromproto5/validateactionconfig.go
@@ -6,11 +6,12 @@ package fromproto5
 import (
 	"context"
 
+	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+
 	"github.com/hashicorp/terraform-plugin-framework/action"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 )
 
 // ValidateActionConfigRequest returns the *fwserver.ValidateActionConfigRequest
@@ -27,7 +28,5 @@ func ValidateActionConfigRequest(ctx context.Context, proto5 *tfprotov5.Validate
 	fw.Config = config
 	fw.Action = reqAction
 
-	// TODO:Actions: Add linked resource configs when new action schema types are introduced
-
 	return fw, diags
 }
diff --git a/internal/fromproto6/invokeaction.go b/internal/fromproto6/invokeaction.go
@@ -47,7 +47,5 @@ func InvokeActionRequest(ctx context.Context, proto6 *tfprotov6.InvokeActionRequ
 
 	fw.Config = config
 
-	// TODO:Actions: Add linked resources when new action schema types are introduced
-
 	return fw, diags
 }
diff --git a/internal/fromproto6/planaction.go b/internal/fromproto6/planaction.go
@@ -48,7 +48,5 @@ func PlanActionRequest(ctx context.Context, proto6 *tfprotov6.PlanActionRequest,
 
 	fw.Config = config
 
-	// TODO:Actions: Add linked resources when new action schema types are introduced
-
 	return fw, diags
 }
diff --git a/internal/fromproto6/validateactionconfig.go b/internal/fromproto6/validateactionconfig.go
@@ -6,11 +6,12 @@ package fromproto6
 import (
 	"context"
 
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+
 	"github.com/hashicorp/terraform-plugin-framework/action"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 )
 
 // ValidateActionConfigRequest returns the *fwserver.ValidateActionConfigRequest
@@ -27,7 +28,5 @@ func ValidateActionConfigRequest(ctx context.Context, proto6 *tfprotov6.Validate
 	fw.Config = config
 	fw.Action = reqAction
 
-	// TODO:Actions: Add linked resource configs when new action schema types are introduced
-
 	return fw, diags
 }
diff --git a/internal/toproto5/planaction.go b/internal/toproto5/planaction.go
@@ -22,7 +22,5 @@ func PlanActionResponse(ctx context.Context, fw *fwserver.PlanActionResponse) *t
 		Deferred:    ActionDeferred(fw.Deferred),
 	}
 
-	// TODO:Actions: Add linked resources when new action schema types are introduced
-
 	return proto5
 }
diff --git a/internal/toproto6/action_schema_test.go b/internal/toproto6/action_schema_test.go
@@ -28,7 +28,7 @@ func TestActionSchema(t *testing.T) {
 		"empty": {
 			input: actionschema.Schema{},
 			expected: &tfprotov6.ActionSchema{
-				&tfprotov6.Schema{Block: &tfprotov6.SchemaBlock{}},
+				Schema: &tfprotov6.Schema{Block: &tfprotov6.SchemaBlock{}},
 			},
 		},
 		"valid": {
diff --git a/internal/toproto6/planaction.go b/internal/toproto6/planaction.go
@@ -22,7 +22,5 @@ func PlanActionResponse(ctx context.Context, fw *fwserver.PlanActionResponse) *t
 		Deferred:    ActionDeferred(fw.Deferred),
 	}
 
-	// TODO:Actions: Add linked resources when new action schema types are introduced
-
 	return proto6
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ type InvokeResponse struct {`
`26`	`26`
`27`	`27`	`// SendProgress will immediately send a progress update to Terraform core during action invocation.`
`28`	`28`	`// This function is provided by the framework and can be called multiple times while action logic is running.`
`29`		`- //`
`30`		`- // TODO:Actions: More documentation about when you should use this / when you shouldn't`
`31`	`29`	`SendProgress func(event InvokeProgressEvent)`
`32`	`30`	`}`
`33`	`31`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ toolchain go1.24.2`
`6`	`6`
`7`	`7`	`require (`
`8`	`8`	`github.com/google/go-cmp v0.7.0`
`9`		`- github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915191812-03e996589dc2`
	`9`	`+ github.com/hashicorp/terraform-plugin-go v0.29.0-beta.1.0.20250915194700-c3810b1245c0`
`10`	`10`	`github.com/hashicorp/terraform-plugin-log v0.9.0`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,5 @@ func InvokeActionRequest(ctx context.Context, proto5 *tfprotov5.InvokeActionRequ`
`47`	`47`
`48`	`48`	`fw.Config = config`
`49`	`49`
`50`		`- // TODO:Actions: Add linked resources when new action schema types are introduced`
`51`		`-`
`52`	`50`	`return fw, diags`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,5 @@ func PlanActionRequest(ctx context.Context, proto5 *tfprotov5.PlanActionRequest,`
`48`	`48`
`49`	`49`	`fw.Config = config`
`50`	`50`
`51`		`- // TODO:Actions: Add linked resources when new action schema types are introduced`
`52`		`-`
`53`	`51`	`return fw, diags`
`54`	`52`	`}`