/terraform

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: Support `aws_elasticsearch_domain` upgrades to `elasticsearch_version` 2.3 #7860

Merged
merged 1 commit into from Aug 5, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Projects
None yet
Milestone
No milestone
5 participants
@stack72 @Zordrak @radeksimko @kwilczynski @damondoucet
@stack72
Contributor

stack72 commented Jul 29, 2016

Fixes #7836 This will allow ElasticSearch domains to be deployed with
version 2.3 of ElasticSearch

The other slight modifications are to stop dereferencing values before
passing to d.Set in the Read func. It is safer to pass the pointer to d.Set
and allow that to dereference if there is a value

% make testacc TEST=./builtin/providers/aws
TESTARGS='-run=TestAccAWSElasticSearchDomain_'
==> Checking that code complies with gofmt requirements... go generate $(go
list ./... | grep -v /terraform/vendor/) TF_ACC=1 go test
./builtin/providers/aws -v -run=TestAccAWSElasticSearchDomain_ -timeout
120m
=== RUN   TestAccAWSElasticSearchDomain_basic
--- PASS: TestAccAWSElasticSearchDomain_basic (1611.74s)
=== RUN   TestAccAWSElasticSearchDomain_v23
--- PASS: TestAccAWSElasticSearchDomain_v23 (1898.80s)
=== RUN   TestAccAWSElasticSearchDomain_complex
--- PASS: TestAccAWSElasticSearchDomain_complex (1802.44s) PASS ok
github.com/hashicorp/terraform/builtin/providers/aws    5313.006s

@stack72 stack72 added enhancement provider/aws labels Jul 29, 2016

@stack72

This comment has been minimized.

Show comment
Hide comment
@stack72

stack72 Jul 29, 2016

Contributor

Depends on #7857
Contributor

stack72 commented Jul 29, 2016

Depends on #7857
Show outdated Hide outdated builtin/providers/aws/resource_aws_elasticsearch_domain.go

@radeksimko radeksimko added the waiting-response label Jul 29, 2016

@stack72 stack72 referenced this pull request Aug 2, 2016

Closed

Allow Elasticsearch version to be specified #7911

@Zordrak

This comment has been minimized.

Show comment
Hide comment
@Zordrak

Zordrak Aug 2, 2016

Crying out for a pull here...

Zordrak commented Aug 2, 2016

Crying out for a pull here...
@radeksimko

This comment has been minimized.

Show comment
Hide comment
@radeksimko

radeksimko Aug 4, 2016

Member

@stack72 would you mind rebasing this + resolving conflicts, so we can get it merged? 😉

I reckon the conflict was caused by #7944 and #7857
Member

radeksimko commented Aug 4, 2016

@stack72 would you mind rebasing this + resolving conflicts, so we can get it merged? 😉

I reckon the conflict was caused by #7944 and #7857
@stack72

This comment has been minimized.

Show comment
Hide comment
@stack72

stack72 Aug 4, 2016

Contributor

@radeksimko over to you sir :)
Contributor

stack72 commented Aug 4, 2016

@radeksimko over to you sir :)
Show outdated Hide outdated builtin/providers/aws/resource_aws_elasticsearch_domain.go
Show outdated Hide outdated builtin/providers/aws/resource_aws_elasticsearch_domain.go
@stack72
provider/aws: Support `aws_elasticsearch_domain` upgrades to 
`elasticsearch_version` 2.3

Fixes #7836
This will allow ElasticSearch domains to be deployed with version 2.3 of
ElasticSearch

The other slight modifications are to stop dereferencing values before
passing to d.Set in the Read func. It is safer to pass the pointer to
d.Set and allow that to dereference if there is a value

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSElasticSearchDomain_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSElasticSearchDomain_ -timeout 120m
=== RUN   TestAccAWSElasticSearchDomain_basic
--- PASS: TestAccAWSElasticSearchDomain_basic (1611.74s)
=== RUN   TestAccAWSElasticSearchDomain_v23
--- PASS: TestAccAWSElasticSearchDomain_v23 (1898.80s)
=== RUN   TestAccAWSElasticSearchDomain_complex
--- PASS: TestAccAWSElasticSearchDomain_complex (1802.44s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	5313.006s
```

Update resource_aws_elasticsearch_domain.go
Verified
This commit was signed with a verified signature.
@stack72 stack72 Paul Stack
GPG key ID: 8619A619B085CB16 Learn about signing commits
f17bc6b

@stack72 stack72 removed the waiting-response label Aug 5, 2016

builtin/providers/aws/resource_aws_elasticsearch_domain_test.go
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
func TestAccAWSElasticSearchDomain_basic(t *testing.T) {
var domain elasticsearch.ElasticsearchDomainStatus
ri := acctest.RandInt()

This comment has been minimized.

Show comment
Hide comment
@radeksimko

radeksimko Aug 5, 2016

Member

👍
Copy link
@radeksimko

radeksimko Aug 5, 2016

Member

👍
@radeksimko

This comment has been minimized.

Show comment
Hide comment
@radeksimko

radeksimko Aug 5, 2016

Member

LGTM

$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSElasticSearchDomain_'

TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSElasticSearchDomain_ -timeout 120m
=== RUN   TestAccAWSElasticSearchDomain_basic
--- PASS: TestAccAWSElasticSearchDomain_basic (1609.44s)
=== RUN   TestAccAWSElasticSearchDomain_v23
--- PASS: TestAccAWSElasticSearchDomain_v23 (1597.24s)
=== RUN   TestAccAWSElasticSearchDomain_complex
--- PASS: TestAccAWSElasticSearchDomain_complex (1819.84s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    5026.551s
Member

radeksimko commented Aug 5, 2016

LGTM

$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSElasticSearchDomain_'

TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSElasticSearchDomain_ -timeout 120m
=== RUN   TestAccAWSElasticSearchDomain_basic
--- PASS: TestAccAWSElasticSearchDomain_basic (1609.44s)
=== RUN   TestAccAWSElasticSearchDomain_v23
--- PASS: TestAccAWSElasticSearchDomain_v23 (1597.24s)
=== RUN   TestAccAWSElasticSearchDomain_complex
--- PASS: TestAccAWSElasticSearchDomain_complex (1819.84s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    5026.551s

@radeksimko radeksimko merged commit 744b266 into master Aug 5, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@radeksimko radeksimko deleted the aws-es-2.3 branch Aug 5, 2016

@kwilczynski kwilczynski referenced this pull request Aug 17, 2016

Closed

Add support for AWS elasticsearch service version #8246

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment