Refactor write_only_nested_attribute_validation.go and write_only_nested_attribute_validation_test.go

Author: SBGoods

internal/fwtype/write_only_nested_attribute_validation.go renamed to internal/fwschema/write_only_nested_attribute_validation.go

@@ -1,59 +1,52 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package fwtype
+package fwschema
 
 import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
-	"github.com/hashicorp/terraform-plugin-framework/provider/metaschema"
 )
 
 // ContainsAllWriteOnlyChildAttributes will return true if all child attributes for the
 // given nested attribute have WriteOnly set to true.
-func ContainsAllWriteOnlyChildAttributes(nestedAttr metaschema.NestedAttribute) bool {
-	if !nestedAttr.IsWriteOnly() {
-		return false
-	}
+func ContainsAllWriteOnlyChildAttributes(nestedAttr NestedAttribute) bool {
 	nestedObjAttrs := nestedAttr.GetNestedObject().GetAttributes()
 
 	for _, childAttr := range nestedObjAttrs {
-		nestedAttribute, ok := childAttr.(metaschema.NestedAttribute)
+		if !childAttr.IsWriteOnly() {
+			return false
+		}
+
+		nestedAttribute, ok := childAttr.(NestedAttribute)
 		if ok {
 			if !ContainsAllWriteOnlyChildAttributes(nestedAttribute) {
 				return false
 			}
 		}
-
-		if !childAttr.IsWriteOnly() {
-			return false
-		}
 	}
 
 	return true
 }
 
 // ContainsAnyWriteOnlyChildAttributes will return true if any child attribute for the
 // given nested attribute has WriteOnly set to true.
-func ContainsAnyWriteOnlyChildAttributes(nestedAttr metaschema.NestedAttribute) bool {
-	if nestedAttr.IsWriteOnly() {
-		return true
-	}
+func ContainsAnyWriteOnlyChildAttributes(nestedAttr NestedAttribute) bool {
 	nestedObjAttrs := nestedAttr.GetNestedObject().GetAttributes()
 
 	for _, childAttr := range nestedObjAttrs {
-		nestedAttribute, ok := childAttr.(metaschema.NestedAttribute)
+		if childAttr.IsWriteOnly() {
+			return true
+		}
+
+		nestedAttribute, ok := childAttr.(NestedAttribute)
 		if ok {
 			if ContainsAnyWriteOnlyChildAttributes(nestedAttribute) {
 				return true
 			}
 		}
-
-		if childAttr.IsWriteOnly() {
-			return true
-		}
 	}
 
 	return false

resource/schema/list_nested_attribute.go

@@ -302,12 +302,12 @@ func (a ListNestedAttribute) ValidateImplementation(ctx context.Context, req fws
 		resp.Diagnostics.Append(fwtype.AttributeCollectionWithDynamicTypeDiag(req.Path))
 	}
 
-	if a.IsWriteOnly() && !fwtype.ContainsAllWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidWriteOnlyNestedAttributeDiag(req.Path))
+	if a.IsWriteOnly() && !fwschema.ContainsAllWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidWriteOnlyNestedAttributeDiag(req.Path))
 	}
 
-	if a.IsComputed() && fwtype.ContainsAnyWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
+	if a.IsComputed() && fwschema.ContainsAnyWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
 	}
 
 	if a.ListDefaultValue() != nil {

resource/schema/map_nested_attribute.go

@@ -302,12 +302,12 @@ func (a MapNestedAttribute) ValidateImplementation(ctx context.Context, req fwsc
 		resp.Diagnostics.Append(fwtype.AttributeCollectionWithDynamicTypeDiag(req.Path))
 	}
 
-	if a.IsWriteOnly() && !fwtype.ContainsAllWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidWriteOnlyNestedAttributeDiag(req.Path))
+	if a.IsWriteOnly() && !fwschema.ContainsAllWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidWriteOnlyNestedAttributeDiag(req.Path))
 	}
 
-	if a.IsComputed() && fwtype.ContainsAnyWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
+	if a.IsComputed() && fwschema.ContainsAnyWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
 	}
 
 	if a.MapDefaultValue() != nil {

resource/schema/set_nested_attribute.go

@@ -297,12 +297,12 @@ func (a SetNestedAttribute) ValidateImplementation(ctx context.Context, req fwsc
 		resp.Diagnostics.Append(fwtype.AttributeCollectionWithDynamicTypeDiag(req.Path))
 	}
 
-	if a.IsWriteOnly() && !fwtype.ContainsAllWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidWriteOnlyNestedAttributeDiag(req.Path))
+	if a.IsWriteOnly() && !fwschema.ContainsAllWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidWriteOnlyNestedAttributeDiag(req.Path))
 	}
 
-	if a.IsComputed() && fwtype.ContainsAnyWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
+	if a.IsComputed() && fwschema.ContainsAnyWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
 	}
 
 	if a.SetDefaultValue() != nil {

resource/schema/single_nested_attribute.go

@@ -12,7 +12,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwschema/fwxschema"
-	"github.com/hashicorp/terraform-plugin-framework/internal/fwtype"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/defaults"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -311,12 +310,12 @@ func (a SingleNestedAttribute) ValidateImplementation(ctx context.Context, req f
 		resp.Diagnostics.Append(nonComputedAttributeWithDefaultDiag(req.Path))
 	}
 
-	if a.IsWriteOnly() && !fwtype.ContainsAllWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidWriteOnlyNestedAttributeDiag(req.Path))
+	if a.IsWriteOnly() && !fwschema.ContainsAllWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidWriteOnlyNestedAttributeDiag(req.Path))
 	}
 
-	if a.IsComputed() && fwtype.ContainsAnyWriteOnlyChildAttributes(a) {
-		resp.Diagnostics.Append(fwtype.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
+	if a.IsComputed() && fwschema.ContainsAnyWriteOnlyChildAttributes(a) {
+		resp.Diagnostics.Append(fwschema.InvalidComputedNestedAttributeWithWriteOnlyDiag(req.Path))
 	}
 
 	if a.ObjectDefaultValue() != nil {