Fix errors in JSON produced not matching service expectations

.changelog/39142.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+data-source/aws_networkmanager_core_network_policy_document: Deprecate `segment_actions.via.with_edge_override.use_edge`. Use `segment_actions.via.with_edge_override.use_edge_location` instead
+```
+
+```release-note:bug
+data-source/aws_networkmanager_core_network_policy_document: Change `segment_actions.via.with_edge_override.use_edge` to be nested set of edges, matching JSON
+```

CHANGELOG.md

@@ -231,7 +231,7 @@ ENHANCEMENTS:
 BUG FIXES:
 
 * data-source/aws_appstream_image: Fix issue where the most recent image is not returned ([#38571](https://github.com/hashicorp/terraform-provider-aws/issues/38571))
-* datasource/aws_networkmanager_core_network_policy_document: Fix `CoreNetworkPolicyException` when putting policy with single wildcard in `when_sent_to` ([#38595](https://github.com/hashicorp/terraform-provider-aws/issues/38595))
+* data-source/aws_networkmanager_core_network_policy_document: Fix `CoreNetworkPolicyException` when putting policy with single wildcard in `when_sent_to` ([#38595](https://github.com/hashicorp/terraform-provider-aws/issues/38595))
 * resource/aws_cloudsearch_domain: Fix `index_name` character length validation ([#38509](https://github.com/hashicorp/terraform-provider-aws/issues/38509))
 * resource/aws_ecs_task_definition: Ensure that JSON keys in `container_definitions` start with a lowercase letter ([#38622](https://github.com/hashicorp/terraform-provider-aws/issues/38622))
 * resource/aws_iot_provisioning_template: Properly send `type` argument on create when configured ([#38640](https://github.com/hashicorp/terraform-provider-aws/issues/38640))

internal/acctest/acctest.go

@@ -55,6 +55,7 @@ import (
 	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/hashicorp/terraform-provider-aws/internal/acctest/jsoncmp"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/envvar"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
@@ -678,6 +679,16 @@ func CheckResourceAttrEquivalentJSON(n, key, expectedJSON string) resource.TestC
 	})
 }
 
+func CheckResourceAttrJSONNoDiff(n, key, expectedJSON string) resource.TestCheckFunc {
+	return resource.TestCheckResourceAttrWith(n, key, func(value string) error {
+		if diff := jsoncmp.Diff(expectedJSON, value); diff != "" {
+			return fmt.Errorf("unexpected diff (+wanted, -got): %s", diff)
+		}
+
+		return nil
+	})
+}
+
 func CheckResourceAttrJMES(name, key, jmesPath, value string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		is, err := PrimaryInstanceState(s, name)

internal/service/networkmanager/core_network_policy_document_data_source.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
@@ -253,11 +254,25 @@ func dataSourceCoreNetworkPolicyDocument() *schema.Resource {
 										Optional: true,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
-												"edge_sets": setOfString,
-												"use_edge": {
+												"edge_sets": {
+													Type: schema.TypeSet,
+													Elem: &schema.Schema{
+														Type: schema.TypeSet,
+														Elem: &schema.Schema{
+															Type: schema.TypeString,
+														},
+													},
+													Optional: true,
+												},
+												"use_edge_location": {
 													Type:     schema.TypeString,
 													Optional: true,
 												},
+												"use_edge": {
+													Type:       schema.TypeString,
+													Optional:   true,
+													Deprecated: "Use use_edge_location",
+												},
 											},
 										},
 									},
@@ -526,11 +541,18 @@ func expandCoreNetworkPolicySegmentActions(tfList []interface{}) ([]*coreNetwork
 						apiObject := &coreNetworkPolicySegmentActionViaEdgeOverride{}
 
 						if v := tfMap["edge_sets"].(*schema.Set).List(); len(v) > 0 {
-							apiObject.EdgeSets = coreNetworkPolicyExpandStringList(v)
+							var edgeSets [][]string
+							for _, esRaw := range v {
+								es := esRaw.(*schema.Set)
+								edgeSets = append(edgeSets, flex.ExpandStringValueSet(es))
+							}
+							apiObject.EdgeSets = edgeSets
 						}
 
-						if v, ok := tfMap["use_edge"]; ok {
-							apiObject.UseEdge = v.(string)
+						if v, ok := tfMap["use_edge_location"]; ok && v != "" {
+							apiObject.UseEdgeLocation = v.(string)
+						} else if v, ok := tfMap["use_edge"]; ok {
+							apiObject.UseEdgeLocation = v.(string)
 						}
 
 						apiObjects = append(apiObjects, apiObject)