Adding further test coverage for PlanResourceChange() for map, set an…

…d single nested attributes (#668)
hashicorp · Mar 7, 2023 · cc78ea4 · cc78ea4
1 parent d68d931
commit cc78ea4
Show file tree

Hide file tree

Showing 3 changed files with 1,801 additions and 320 deletions.
diff --git a/internal/fwschemadata/data_default.go b/internal/fwschemadata/data_default.go
@@ -56,13 +56,13 @@ func (d *Data) TransformDefaults(ctx context.Context, configRaw tftypes.Value) d
 		if err != nil {
 			if errors.Is(err, fwschema.ErrPathInsideAtomicAttribute) {
 				// ignore attributes/elements inside schema.Attributes, they have no schema of their own
-				logging.FrameworkTrace(ctx, "attribute is a non-schema attribute, not marking unknown")
+				logging.FrameworkTrace(ctx, "attribute is a non-schema attribute, not setting default")
 				return tfTypeValue, nil
 			}
 
 			if errors.Is(err, fwschema.ErrPathIsBlock) {
 				// ignore blocks, they do not have a computed field
-				logging.FrameworkTrace(ctx, "attribute is a block, not marking unknown")
+				logging.FrameworkTrace(ctx, "attribute is a block, not setting default")
 				return tfTypeValue, nil
 			}
 

diff --git a/internal/fwserver/server_planresourcechange.go b/internal/fwserver/server_planresourcechange.go
@@ -109,8 +109,9 @@ func (s *Server) PlanResourceChange(ctx context.Context, req *PlanResourceChange
 	// Set Defaults.
 	//
 	// If the planned state is not null (i.e., not a destroy operation) we traverse the schema,
-	// identifying any attributes which are null, and if the attribute has a default value
-	// specified by the `Default` field on the attribute then the default value is assigned.
+	// identifying any attributes which are null within the configuration, and if the attribute
+	// has a default value specified by the `Default` field on the attribute then the default
+	// value is assigned.
 	if !resp.PlannedState.Raw.IsNull() {
 		data := fwschemadata.Data{
 			Description:    fwschemadata.DataDescriptionState,