ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'aws_elasticache_cluster_address' of https://github.com/A-Gordon/terraform into A-Gordon-aws_elasticache_cluster_address

This commit is contained in:
stack72 2016-09-20 17:09:11 +01:00
parent d1296759d8 de8b02e6e5
commit 10cddc8153
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/aws/resource_aws_elasticache_cluster.go
View File

@ -170,6 +170,11 @@ func resourceAwsElasticacheCluster() *schema.Resource {
Computed: true,
}
resourceSchema["cluster_address"] = &schema.Schema{
Type: schema.TypeString,
Computed: true,
}
resourceSchema["replication_group_id"] = &schema.Schema{
Type: schema.TypeString,
Computed: true,
@ -348,6 +353,7 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{})
if c.ConfigurationEndpoint != nil {
d.Set("port", c.ConfigurationEndpoint.Port)
d.Set("configuration_endpoint", aws.String(fmt.Sprintf("%s:%d", *c.ConfigurationEndpoint.Address, *c.ConfigurationEndpoint.Port)))
d.Set("cluster_address", aws.String(fmt.Sprintf("%s", *c.ConfigurationEndpoint.Address)))
}
if c.ReplicationGroupId != nil {

3
vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go generated vendored
View File

@ -2572,6 +2572,9 @@ type CacheCluster struct {
// node.
ConfigurationEndpoint *Endpoint `type:"structure"`
// The DNS name of the cache cluster without the port appended.
ClusterAddress *string `type:"string"`
// The name of the cache engine (memcached or redis) to be used for this cache
// cluster.
Engine *string `type:"string"`