Merge pull request #25245 from fontis/b-aws_api_gateway_model-schema-…

…diff-fix r/aws_api_gateway_model: suppress schema whitespace differences
hashicorp · Jun 22, 2022 · 502e8ee · 502e8ee · melissarh57 · Jun 27, 2022
2 parents 3de1135 + 1197cee
commit 502e8ee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.changelog/25245.txt b/.changelog/25245.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_api_gateway_model: Surpress whitespace differences between model schemas
+```
diff --git a/internal/service/apigateway/model.go b/internal/service/apigateway/model.go
@@ -9,7 +9,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/apigateway"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 )
 
 func ResourceModel() *schema.Resource {
@@ -67,6 +70,15 @@ func ResourceModel() *schema.Resource {
 			"schema": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ValidateFunc: validation.All(
+					validation.StringLenBetween(0, 32768),
+					validation.StringIsJSON,
+				),
+				DiffSuppressFunc: verify.SuppressEquivalentJSONDiffs,
+				StateFunc: func(v interface{}) string {
+					json, _ := structure.NormalizeJsonString(v)
+					return json
+				},
 			},
 
 			"content_type": {