diff --git a/builtin/providers/aws/resource_aws_elasticsearch_domain.go b/builtin/providers/aws/resource_aws_elasticsearch_domain.go index 45303f6711..683e755794 100644 --- a/builtin/providers/aws/resource_aws_elasticsearch_domain.go +++ b/builtin/providers/aws/resource_aws_elasticsearch_domain.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" elasticsearch "github.com/aws/aws-sdk-go/service/elasticsearchservice" + "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -270,7 +271,10 @@ func resourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{} ds := out.DomainStatus if ds.AccessPolicies != nil && *ds.AccessPolicies != "" { - policies, _ := normalizeJsonString(*ds.AccessPolicies) + policies, err := normalizeJsonString(*ds.AccessPolicies) + if err != nil { + return errwrap.Wrapf("access policies contain an invalid JSON: {{err}}", err) + } d.Set("access_policies", policies) } err = d.Set("advanced_options", pointersMapToStringList(ds.AdvancedOptions))