Merge pull request #2634 from hashicorp/f-aws-elasticache-redis-s3-snap

provider/aws: Add support for restoring from Redis backup stored in S3
This commit is contained in:
Clint 2015-07-08 11:51:23 -06:00
commit 82d142cc5f
2 changed files with 27 additions and 0 deletions

View File

@ -105,6 +105,22 @@ func resourceAwsElasticacheCluster() *schema.Resource {
}, },
}, },
// A single-element string list containing an Amazon Resource Name (ARN) that
// uniquely identifies a Redis RDB snapshot file stored in Amazon S3. The snapshot
// file will be used to populate the node group.
//
// See also:
// https://github.com/aws/aws-sdk-go/blob/4862a174f7fc92fb523fc39e68f00b87d91d2c3d/service/elasticache/api.go#L2079
"snapshot_arns": &schema.Schema{
Type: schema.TypeSet,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: func(v interface{}) int {
return hashcode.String(v.(string))
},
},
"tags": tagsSchema(), "tags": tagsSchema(),
// apply_immediately is used to determine when the update modifications // apply_immediately is used to determine when the update modifications
@ -154,6 +170,13 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{
req.CacheParameterGroupName = aws.String(v.(string)) req.CacheParameterGroupName = aws.String(v.(string))
} }
snaps := d.Get("snapshot_arns").(*schema.Set).List()
if len(snaps) > 0 {
s := expandStringList(snaps)
req.SnapshotARNs = s
log.Printf("[DEBUG] Restoring Redis cluster from S3 snapshot: %#v", s)
}
_, err := conn.CreateCacheCluster(req) _, err := conn.CreateCacheCluster(req)
if err != nil { if err != nil {
return fmt.Errorf("Error creating Elasticache: %s", err) return fmt.Errorf("Error creating Elasticache: %s", err)

View File

@ -65,6 +65,10 @@ names to associate with this cache cluster
`false`. See [Amazon ElastiCache Documentation for more information.][1] `false`. See [Amazon ElastiCache Documentation for more information.][1]
(Available since v0.6.0) (Available since v0.6.0)
* `snapshot_arns`  (Optional) A single-element string list containing an
Amazon Resource Name (ARN) of a Redis RDB snapshot file stored in Amazon S3.
Example: `arn:aws:s3:::my_bucket/snapshot1.rdb`
* `tags` - (Optional) A mapping of tags to assign to the resource. * `tags` - (Optional) A mapping of tags to assign to the resource.