Move Required + WriteOnly validations from PlanResourceChange RPC to ValidateResourceConfig RPC

Author: SBGoods

internal/fwserver/attribute_validation.go

@@ -120,10 +120,7 @@ func AttributeValidate(ctx context.Context, a fwschema.Attribute, req ValidateAt
 	// until Terraform CLI versions 0.12 through the release containing the
 	// checks are considered end-of-life.
 	// Reference: https://github.com/hashicorp/terraform/issues/30669
-	//
-	// We don't validate Required + WriteOnly attributes here as that is
-	// done in PlanResourceChange (only on create).
-	if a.IsRequired() && !a.IsWriteOnly() && attributeConfig.IsNull() {
+	if a.IsRequired() && attributeConfig.IsNull() {
 		resp.Diagnostics.AddAttributeError(
 			req.AttributePath,
 			"Missing Configuration for Required Attribute",

internal/fwserver/attribute_validation_test.go

@@ -1752,7 +1752,16 @@ func TestAttributeValidate(t *testing.T) {
 					},
 				},
 			},
-			resp: ValidateAttributeResponse{},
+			resp: ValidateAttributeResponse{
+				Diagnostics: diag.Diagnostics{
+					diag.NewAttributeErrorDiagnostic(
+						path.Root("test"),
+						"Missing Configuration for Required Attribute",
+						"Must set a configuration value for the test attribute as the provider has marked it as required.\n\n"+
+							"Refer to the provider documentation or contact the provider developers for additional information about configurable attributes that are required.",
+					),
+				},
+			},
 		},
 		"write-only-attr-with-optional": {
 			req: ValidateAttributeRequest{

internal/fwserver/server_planresourcechange.go

@@ -72,34 +72,6 @@ func (s *Server) PlanResourceChange(ctx context.Context, req *PlanResourceChange
 		return
 	}
 
-	// If the resource is planned for creation, verify that
-	// WriteOnly + Required attributes have a configuration
-	// value.
-	if req.PriorState.Raw.IsNull() && !req.Config.Raw.IsNull() {
-		var reqWriteOnlyPaths path.Paths
-
-		err := tftypes.Walk(req.Config.Raw, RequiredWriteOnlyNilsAttributePaths(ctx, req.Config.Schema, &reqWriteOnlyPaths))
-		if err != nil {
-			resp.Diagnostics.AddError(
-				"Error Validating Plan",
-				"There was an unexpected error validating the plan. This is always a problem with the provider. Please report the following to the provider developer:\n\n"+err.Error(),
-			)
-			return
-		}
-
-		for _, p := range reqWriteOnlyPaths {
-			resp.Diagnostics.AddAttributeError(
-				p,
-				"Invalid writeOnly attribute plan",
-				"Required + WriteOnly attributes must have a non-null configuration value during Create.",
-			)
-		}
-
-		if resp.Diagnostics.HasError() {
-			return
-		}
-	}
-
 	if resourceWithConfigure, ok := req.Resource.(resource.ResourceWithConfigure); ok {
 		logging.FrameworkTrace(ctx, "Resource implements ResourceWithConfigure")
 

internal/fwserver/server_planresourcechange_test.go

@@ -856,13 +856,6 @@ func TestServerPlanResourceChange(t *testing.T) {
 		},
 	}
 
-	testSchemaTypeWriteOnly := tftypes.Object{
-		AttributeTypes: map[string]tftypes.Type{
-			"test_optional_write_only": tftypes.String,
-			"test_required_write_only": tftypes.String,
-		},
-	}
-
 	testSchema := schema.Schema{
 		Attributes: map[string]schema.Attribute{
 			"test_computed": schema.StringAttribute{
@@ -1367,19 +1360,6 @@ func TestServerPlanResourceChange(t *testing.T) {
 		},
 	}
 
-	testSchemaWriteOnly := schema.Schema{
-		Attributes: map[string]schema.Attribute{
-			"test_optional_write_only": schema.StringAttribute{
-				Optional:  true,
-				WriteOnly: true,
-			},
-			"test_required_write_only": schema.StringAttribute{
-				Required:  true,
-				WriteOnly: true,
-			},
-		},
-	}
-
 	testEmptyPlan := &tfsdk.Plan{
 		Raw:    tftypes.NewValue(testSchemaType, nil),
 		Schema: testSchema,
@@ -3765,36 +3745,6 @@ func TestServerPlanResourceChange(t *testing.T) {
 				PlannedPrivate: testEmptyPrivate,
 			},
 		},
-		"create-required-write-only-null-diag": {
-			server: &fwserver.Server{
-				Provider: &testprovider.Provider{},
-			},
-			request: &fwserver.PlanResourceChangeRequest{
-				Config: &tfsdk.Config{
-					Raw: tftypes.NewValue(testSchemaTypeWriteOnly, map[string]tftypes.Value{
-						"test_optional_write_only": tftypes.NewValue(tftypes.String, "test-config-value"),
-						"test_required_write_only": tftypes.NewValue(tftypes.String, nil),
-					}),
-					Schema: testSchemaWriteOnly,
-				},
-				ProposedNewState: &tfsdk.Plan{
-					Raw: tftypes.NewValue(testSchemaTypeWriteOnly, map[string]tftypes.Value{
-						"test_optional_write_only": tftypes.NewValue(tftypes.String, "test-config-value"),
-						"test_required_write_only": tftypes.NewValue(tftypes.String, nil),
-					}),
-					Schema: testSchemaWriteOnly,
-				},
-				PriorState:     testEmptyState,
-				ResourceSchema: testSchemaWriteOnly,
-				Resource:       &testprovider.Resource{},
-			},
-			expectedResponse: &fwserver.PlanResourceChangeResponse{
-				Diagnostics: diag.Diagnostics{
-					diag.NewAttributeErrorDiagnostic(path.Root("test_required_write_only"),
-						"Invalid writeOnly attribute plan", "Required + WriteOnly attributes must have a non-null configuration value during Create."),
-				},
-			},
-		},
 		"create-resourcewithmodifyplan-attributeplanmodifier-private": {
 			server: &fwserver.Server{
 				Provider: &testprovider.Provider{},