Fix it

Author: YakDriver

internal/provider/framework/action_test.go

@@ -65,16 +65,16 @@ func (t *testAction) ValidateModel(ctx context.Context, schema *schema.UnlinkedS
 
 // Ensure testAction implements required interfaces
 var (
-	_ action.Action                  = (*testAction)(nil)
-	_ framework.ActionValidateModel  = (*testAction)(nil)
+	_ action.Action                 = (*testAction)(nil)
+	_ framework.ActionValidateModel = (*testAction)(nil)
 )
 
 func TestWrappedAction_Basic(t *testing.T) {
 	ctx := context.Background()
-	
+
 	// Create test action
 	inner := &testAction{}
-	
+
 	// Create wrapped action with minimal options
 	opts := wrappedActionOptions{
 		bootstrapContext: func(ctx context.Context, getAttribute getAttributeFunc, c *conns.AWSClient) (context.Context, diag.Diagnostics) {
@@ -83,29 +83,29 @@ func TestWrappedAction_Basic(t *testing.T) {
 		interceptors: interceptorInvocations{},
 		typeName:     "aws_test_action",
 	}
-	
+
 	wrapped := newWrappedAction(inner, opts)
-	
+
 	// Test Metadata
 	metaReq := action.MetadataRequest{
 		ProviderTypeName: "aws",
 	}
 	var metaResp action.MetadataResponse
 	wrapped.Metadata(ctx, metaReq, &metaResp)
-	
+
 	if metaResp.TypeName != "aws_test_action" {
 		t.Errorf("Expected TypeName 'aws_test_action', got '%s'", metaResp.TypeName)
 	}
-	
+
 	// Test Schema
 	schemaReq := action.SchemaRequest{}
 	var schemaResp action.SchemaResponse
 	wrapped.Schema(ctx, schemaReq, &schemaResp)
-	
+
 	if schemaResp.Diagnostics.HasError() {
 		t.Errorf("Schema method returned errors: %v", schemaResp.Diagnostics)
 	}
-	
+
 	if unlinkedSchema, ok := schemaResp.Schema.(schema.UnlinkedSchema); ok {
 		if _, exists := unlinkedSchema.Attributes["test_param"]; !exists {
 			t.Error("Expected 'test_param' attribute in schema")
@@ -117,10 +117,10 @@ func TestWrappedAction_Basic(t *testing.T) {
 
 func TestActionInterceptors_RegionInjection(t *testing.T) {
 	ctx := context.Background()
-	
+
 	// Create test action
 	inner := &testAction{}
-	
+
 	// Create wrapped action with region interceptor
 	opts := wrappedActionOptions{
 		bootstrapContext: func(ctx context.Context, getAttribute getAttributeFunc, c *conns.AWSClient) (context.Context, diag.Diagnostics) {
@@ -131,18 +131,18 @@ func TestActionInterceptors_RegionInjection(t *testing.T) {
 		},
 		typeName: "aws_test_action",
 	}
-	
+
 	wrapped := newWrappedAction(inner, opts)
-	
+
 	// Test Schema with region injection
 	schemaReq := action.SchemaRequest{}
 	var schemaResp action.SchemaResponse
 	wrapped.Schema(ctx, schemaReq, &schemaResp)
-	
+
 	if schemaResp.Diagnostics.HasError() {
 		t.Errorf("Schema method returned errors: %v", schemaResp.Diagnostics)
 	}
-	
+
 	if unlinkedSchema, ok := schemaResp.Schema.(schema.UnlinkedSchema); ok {
 		if _, exists := unlinkedSchema.Attributes["region"]; !exists {
 			t.Error("Expected 'region' attribute to be injected into schema")

internal/provider/framework/intercept.go

@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/hashicorp/terraform-plugin-framework/action"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
-	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/ephemeral"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"

internal/provider/framework/wrap.go

@@ -516,119 +516,6 @@ func (w *wrappedAction) ValidateConfig(ctx context.Context, request action.Valid
 	}
 }
 
-type wrappedActionOptions struct {
-	// bootstrapContext is run on all wrapped methods before any interceptors.
-	bootstrapContext contextFunc
-	interceptors     interceptorInvocations
-	typeName         string
-}
-
-// wrappedAction represents an interceptor dispatcher for a Plugin Framework action.
-type wrappedAction struct {
-	inner action.ActionWithConfigure
-	meta  *conns.AWSClient
-	opts  wrappedActionOptions
-}
-
-func newWrappedAction(inner action.ActionWithConfigure, opts wrappedActionOptions) action.ActionWithConfigure {
-	return &wrappedAction{
-		inner: inner,
-		opts:  opts,
-	}
-}
-
-func (w *wrappedAction) Metadata(ctx context.Context, request action.MetadataRequest, response *action.MetadataResponse) {
-	// This method does not call down to the inner action.
-	response.TypeName = w.opts.typeName
-}
-
-func (w *wrappedAction) Schema(ctx context.Context, request action.SchemaRequest, response *action.SchemaResponse) {
-	ctx, diags := w.opts.bootstrapContext(ctx, nil, w.meta)
-	response.Diagnostics.Append(diags...)
-	if response.Diagnostics.HasError() {
-		return
-	}
-
-	f := func(ctx context.Context, request *action.SchemaRequest, response *action.SchemaResponse) diag.Diagnostics {
-		w.inner.Schema(ctx, *request, response)
-		return response.Diagnostics
-	}
-	response.Diagnostics.Append(interceptedHandler(w.opts.interceptors.actionSchema(), f, w.meta)(ctx, &request, response)...)
-
-	// Validate the action's model against the schema.
-	if v, ok := w.inner.(framework.ActionValidateModel); ok {
-		if schema, ok := response.Schema.(aschema.UnlinkedSchema); ok {
-			response.Diagnostics.Append(v.ValidateModel(ctx, &schema)...)
-			if response.Diagnostics.HasError() {
-				response.Diagnostics.AddError("action model validation error", w.opts.typeName)
-				return
-			}
-		} else {
-			response.Diagnostics.AddError("unsupported action schema type", w.opts.typeName)
-		}
-	} else {
-		response.Diagnostics.AddError("missing framework.ActionValidateModel", w.opts.typeName)
-	}
-}
-
-func (w *wrappedAction) Invoke(ctx context.Context, request action.InvokeRequest, response *action.InvokeResponse) {
-	ctx, diags := w.opts.bootstrapContext(ctx, request.Config.GetAttribute, w.meta)
-	response.Diagnostics.Append(diags...)
-	if response.Diagnostics.HasError() {
-		return
-	}
-
-	f := func(ctx context.Context, request *action.InvokeRequest, response *action.InvokeResponse) diag.Diagnostics {
-		w.inner.Invoke(ctx, *request, response)
-		return response.Diagnostics
-	}
-	response.Diagnostics.Append(interceptedHandler(w.opts.interceptors.actionInvoke(), f, w.meta)(ctx, &request, response)...)
-}
-
-func (w *wrappedAction) Configure(ctx context.Context, request action.ConfigureRequest, response *action.ConfigureResponse) {
-	if v, ok := request.ProviderData.(*conns.AWSClient); ok {
-		w.meta = v
-	}
-
-	ctx, diags := w.opts.bootstrapContext(ctx, nil, w.meta)
-	response.Diagnostics.Append(diags...)
-	if response.Diagnostics.HasError() {
-		return
-	}
-
-	w.inner.Configure(ctx, request, response)
-}
-
-func (w *wrappedAction) ConfigValidators(ctx context.Context) []action.ConfigValidator {
-	if v, ok := w.inner.(action.ActionWithConfigValidators); ok {
-		ctx, diags := w.opts.bootstrapContext(ctx, nil, w.meta)
-		if diags.HasError() {
-			tflog.Warn(ctx, "wrapping ConfigValidators", map[string]any{
-				"action":                 w.opts.typeName,
-				"bootstrapContext error": fwdiag.DiagnosticsString(diags),
-			})
-
-			return nil
-		}
-
-		return v.ConfigValidators(ctx)
-	}
-
-	return nil
-}
-
-func (w *wrappedAction) ValidateConfig(ctx context.Context, request action.ValidateConfigRequest, response *action.ValidateConfigResponse) {
-	if v, ok := w.inner.(action.ActionWithValidateConfig); ok {
-		ctx, diags := w.opts.bootstrapContext(ctx, request.Config.GetAttribute, w.meta)
-		response.Diagnostics.Append(diags...)
-		if response.Diagnostics.HasError() {
-			return
-		}
-
-		v.ValidateConfig(ctx, request, response)
-	}
-}
-
 type wrappedResourceOptions struct {
 	// bootstrapContext is run on all wrapped methods before any interceptors.
 	bootstrapContext contextFunc