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.

Sign up for GitHub

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

r/aws_elasticsearch_domain: export kibana endpoint #2804

Merged
merged 2 commits into from
Jan 10, 2018
Merged

r/aws_elasticsearch_domain: export kibana endpoint #2804

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c01d629
r/aws_elasticsearch_domain: export kibana endpoint
Dec 29, 2017
7fbe25a
add testacc to check kibana_endpoint;
Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions aws/resource_aws_elasticsearch_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ func resourceAwsElasticSearchDomain() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"kibana_endpoint": {
Type: schema.TypeString,
Computed: true,
},
"ebs_options": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -480,12 +484,14 @@ func resourceAwsElasticSearchDomainRead(d *schema.ResourceData, meta interface{}
if err != nil {
return err
}
d.Set("kibana_endpoint", endpoints["vpc"].(string)+"/_plugin/kibana/")
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we make use of a function that build this endpoint for us here and below?

if ds.Endpoint != nil {
return fmt.Errorf("%q: Elasticsearch domain in VPC expected to have null Endpoint value", d.Id())
}
} else {
if ds.Endpoint != nil {
d.Set("endpoint", *ds.Endpoint)
d.Set("kibana_endpoint", *ds.Endpoint+"/_plugin/kibana/")
}
if ds.Endpoints != nil {
return fmt.Errorf("%q: Elasticsearch domain not in VPC expected to have null Endpoints value", d.Id())
Expand Down