Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provider/aws: Add JSON validation to the aws_elasticsearch_domain resource. #8898

Conversation

kwilczynski
Copy link
Contributor

This commit adds support for new helper function which is used to
normalise and validate JSON string.

Signed-off-by: Krzysztof Wilczynski [email protected]

@kwilczynski
Copy link
Contributor Author

Part of work which began in #8028.

@kwilczynski kwilczynski changed the title Add JSON validation to the aws_elasticsearch_domain resource. provider/aws: Add JSON validation to the aws_elasticsearch_domain resource. Sep 17, 2016
@kwilczynski
Copy link
Contributor Author

Acceptance test is passing:

$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSElasticSearchDomain_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/09/17 23:00:25 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSElasticSearchDomain_ -timeout 120m
=== RUN   TestAccAWSElasticSearchDomain_basic
--- PASS: TestAccAWSElasticSearchDomain_basic (2162.51s)
=== RUN   TestAccAWSElasticSearchDomain_v23
--- PASS: TestAccAWSElasticSearchDomain_v23 (1980.72s)
=== RUN   TestAccAWSElasticSearchDomain_complex
--- PASS: TestAccAWSElasticSearchDomain_complex (2074.76s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    6218.016s

@@ -269,7 +270,8 @@ func resourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{}
ds := out.DomainStatus

if ds.AccessPolicies != nil && *ds.AccessPolicies != "" {
d.Set("access_policies", normalizeJson(*ds.AccessPolicies))
policies, _ := normalizeJsonString(*ds.AccessPolicies)
Copy link
Contributor

@stack72 stack72 Sep 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to check for errors here ;)

@kwilczynski kwilczynski force-pushed the feature/json-validation-aws_elasticsearch_domain branch from 63bc2f2 to 663cd78 Compare September 21, 2016 18:35
@kwilczynski kwilczynski changed the title provider/aws: Add JSON validation to the aws_elasticsearch_domain resource. [WIP] provider/aws: Add JSON validation to the aws_elasticsearch_domain resource. Sep 21, 2016
This commit adds support for new helper function which is used to
normalise and validate JSON string.

Signed-off-by: Krzysztof Wilczynski <[email protected]>
@kwilczynski kwilczynski force-pushed the feature/json-validation-aws_elasticsearch_domain branch from 663cd78 to dd1d41d Compare September 22, 2016 07:53
@kwilczynski kwilczynski changed the title [WIP] provider/aws: Add JSON validation to the aws_elasticsearch_domain resource. provider/aws: Add JSON validation to the aws_elasticsearch_domain resource. Sep 22, 2016
@stack72
Copy link
Contributor

stack72 commented Sep 22, 2016

LGTM! Thanks for the work here :)

@stack72 stack72 merged commit f13e020 into hashicorp:master Sep 22, 2016
@ghost
Copy link

ghost commented Apr 22, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked and limited conversation to collaborators Apr 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants