add StorageType as an RDS option

mitchellh · Jan 23, 2015 · b1cc2d8 · b1cc2d8
1 parent b21af4d
commit b1cc2d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/rds/rds.go b/rds/rds.go
@@ -106,6 +106,7 @@ type DBInstance struct {
 	Port                       int           `xml:"Endpoint>Port"`
 	PreferredBackupWindow      string        `xml:"PreferredBackupWindow"`
 	PreferredMaintenanceWindow string        `xml:"PreferredMaintenanceWindow"`
+	StorageType                string        `xml:"StorageType"`
 	VpcSecurityGroupIds        []string      `xml:"VpcSecurityGroups>VpcSecurityGroupMembership>VpcSecurityGroupId"`
 	DBSecurityGroupNames       []string      `xml:"DBSecurityGroups>DBSecurityGroup>DBSecurityGroupName"`
 	DBSubnetGroup              DBSubnetGroup `xml:"DBSubnetGroup"`
@@ -186,6 +187,7 @@ type CreateDBInstance struct {
 	PreferredBackupWindow      string // hh24:mi-hh24:mi
 	PreferredMaintenanceWindow string // ddd:hh24:mi-ddd:hh24:mi
 	PubliclyAccessible         bool
+	StorageType                string
 	VpcSecurityGroupIds        []string
 	DBSecurityGroupNames       []string
 	DBParameterGroupName       string
@@ -267,6 +269,10 @@ func (rds *Rds) CreateDBInstance(options *CreateDBInstance) (resp *SimpleResp, e
 		params["PubliclyAccessible"] = "true"
 	}
 
+	if options.StorageType != "" {
+		params["StorageType"] = options.StorageType
+	}
+
 	for j, group := range options.VpcSecurityGroupIds {
 		params["VpcSecurityGroupIds.member."+strconv.Itoa(j+1)] = group
 	}
@@ -691,6 +697,7 @@ type RestoreDBInstanceFromDBSnapshot struct {
 	OptionGroupName         string
 	Port                    int
 	PubliclyAccessible      bool
+	StorageType             string
 
 	SetIops bool
 	SetPort bool
@@ -750,6 +757,10 @@ func (rds *Rds) RestoreDBInstanceFromDBSnapshot(options *RestoreDBInstanceFromDB
 		params["PubliclyAccessible"] = "true"
 	}
 
+	if options.StorageType != "" {
+		params["StorageType"] = options.StorageType
+	}
+
 	resp = &SimpleResp{}
 
 	err = rds.query(params, resp)

diff --git a/rds/rds_test.go b/rds/rds_test.go
@@ -48,6 +48,7 @@ func (s *S) Test_CreateDBInstance(c *C) {
 		MasterUserPassword:         "bazbarbaz",
 		DBInstanceClass:            "db.m1.small",
 		DBSecurityGroupNames:       []string{"foo", "bar"},
+		StorageType:                "gp2",
 		DBParameterGroupName:       "default.mysql5.6",
 
 		SetBackupRetentionPeriod: true,
@@ -206,7 +207,7 @@ func (s *S) Test_DescribeDBParameters(c *C) {
 
 	options := rds.DescribeDBParameters{
 		DBParameterGroupName: "mydbparamgroup3",
-		Source: "user",
+		Source:               "user",
 	}
 
 	resp, err := s.rds.DescribeDBParameters(&options)
@@ -379,7 +380,7 @@ func (s *S) Test_ModifyDBParameterGroup(c *C) {
 
 	options := rds.ModifyDBParameterGroup{
 		DBParameterGroupName: "mydbparamgroup3",
-		Parameters:           []rds.Parameter{
+		Parameters: []rds.Parameter{
 			rds.Parameter{
 				ApplyMethod:    "immediate",
 				ParameterName:  "character_set_server",