Merge pull request #959 from Juniper/956-attribute-null_when_not_foun…

…d-is-not-working-and-apply-fails-even-after-setting-it-as-true

Bug #956: honor`null_when_not_found` switch

apstra/blueprint/node_system.go

@@ -3,6 +3,7 @@ package blueprint
 import (
 	"context"
 	"fmt"
+
 	"github.com/Juniper/apstra-go-sdk/apstra"
 	"github.com/Juniper/terraform-provider-apstra/apstra/utils"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
@@ -79,6 +80,10 @@ func (o *NodeTypeSystem) AttributesFromApi(ctx context.Context, client *apstra.C
 	case !o.Id.IsNull():
 		desiredNode, ok = nodeResponse.Nodes[o.Id.ValueString()]
 		if !ok {
+			if o.NullWhenNotFound.ValueBool() {
+				o.Attributes = types.ObjectNull(NodeTypeSystemAttributes{}.AttrTypes())
+				return
+			}
 			diags.AddError("Node not found",
 				fmt.Sprintf("Node with ID %q not found in blueprint %q",
 					o.Id.ValueString(), o.BlueprintId.ValueString()))
@@ -92,6 +97,10 @@ func (o *NodeTypeSystem) AttributesFromApi(ctx context.Context, client *apstra.C
 			}
 		}
 		if !ok {
+			if o.NullWhenNotFound.ValueBool() {
+				o.Attributes = types.ObjectNull(NodeTypeSystemAttributes{}.AttrTypes())
+				return
+			}
 			diags.AddError("Node not found",
 				fmt.Sprintf("Node with Name %q not found in blueprint %q",
 					o.Name.ValueString(), o.BlueprintId.ValueString()))