provider/aws: Support aws_elasticsearch_domain upgrades to elasticsearch_version 2.3
#7860
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Depends on #7857 |
| d.Set("domain_id", *ds.DomainId) | ||
| d.Set("domain_name", *ds.DomainName) | ||
| d.Set("domain_id", ds.DomainId) | ||
| d.Set("do main_name", ds.DomainName) |
There was a problem hiding this comment.
I think there might be a space here in the property name.
radeksimko
added
the
waiting-response
|
Crying out for a pull here... |
|
@radeksimko over to you sir :) |
| @@ -207,7 +215,11 @@ func resourceAwsElasticSearchDomainCreate(d *schema.ResourceData, meta interface | |||
| d.SetId(*out.DomainStatus.ARN) | |||
|
|
|||
| log.Printf("[DEBUG] Waiting for ElasticSearch domain %q to be created", d.Id()) | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Looks like you forgot some merge conflicts here
There was a problem hiding this comment.
Good spot - would have been good if i had actually pushed the changes :)
`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
stack72
removed
the
waiting-response
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func TestAccAWSElasticSearchDomain_basic(t *testing.T) { | ||
| var domain elasticsearch.ElasticsearchDomainStatus | ||
| ri := acctest.RandInt() |
|
LGTM |
|
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
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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