Fixed bug with describing DB instances that use VPC security groups

rcostanzo · Oct 24, 2014 · 9163423 · 9163423
1 parent 25b6f9e
commit 9163423
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/rds/rds.go b/rds/rds.go
@@ -105,7 +105,7 @@ type DBInstance struct {
 	Port                       int           `xml:"Endpoint>Port"`
 	PreferredBackupWindow      string        `xml:"PreferredBackupWindow"`
 	PreferredMaintenanceWindow string        `xml:"PreferredMaintenanceWindow"`
-	VpcSecurityGroupIds        []string      `xml:"VpcSecurityGroups"`
+	VpcSecurityGroupIds        []string      `xml:"VpcSecurityGroups>VpcSecurityGroupMembership>VpcSecurityGroupId"`
 	DBSecurityGroupNames       []string      `xml:"DBSecurityGroups>DBSecurityGroup>DBSecurityGroupName"`
 	DBSubnetGroup              DBSubnetGroup `xml:"DBSubnetGroup"`
 	DBParameterGroupName       string        `xml:"DBParameterGroups>DBParameterGroup>DBParameterGroupName"`

diff --git a/rds/rds_test.go b/rds/rds_test.go
@@ -138,6 +138,7 @@ func (s *S) Test_DescribeDBInstances(c *C) {
 	c.Assert(resp.RequestId, Equals, "01b2685a-b978-11d3-f272-7cd6cce12cc5")
 	c.Assert(resp.DBInstances[0].DBName, Equals, "mysampledb")
 	c.Assert(resp.DBInstances[0].DBSecurityGroupNames, DeepEquals, []string{"my-db-secgroup"})
+	c.Assert(resp.DBInstances[1].VpcSecurityGroupIds, DeepEquals, []string{"my-vpc-secgroup"})
 }
 
 func (s *S) Test_DescribeDBSecurityGroups(c *C) {

diff --git a/rds/responses_test.go b/rds/responses_test.go
@@ -61,7 +61,12 @@ var DescribeDBInstancesExample = `
         <BackupRetentionPeriod>1</BackupRetentionPeriod>
         <MultiAZ>false</MultiAZ>
         <DBInstanceStatus>available</DBInstanceStatus>
-        <VpcSecurityGroups/>
+        <VpcSecurityGroups>
+          <VpcSecurityGroupMembership>
+            <Status>active</Status>
+            <VpcSecurityGroupId>my-vpc-secgroup</VpcSecurityGroupId>
+          </VpcSecurityGroupMembership>
+        </VpcSecurityGroups>
         <DBInstanceIdentifier>mysqlexampledb-restore</DBInstanceIdentifier>
         <PreferredBackupWindow>10:07-10:37</PreferredBackupWindow>
         <PreferredMaintenanceWindow>sun:06:13-sun:06:43</PreferredMaintenanceWindow>
@@ -88,12 +93,7 @@ var DescribeDBInstancesExample = `
             <Status>in-sync</Status>
           </OptionGroupMembership>
         </OptionGroupMemberships>
-        <DBSecurityGroups>
-          <DBSecurityGroup>
-            <Status>active</Status>
-            <DBSecurityGroupName>default</DBSecurityGroupName>
-          </DBSecurityGroup>
-        </DBSecurityGroups>
+        <DBSecurityGroups/>
         <PubliclyAccessible>true</PubliclyAccessible>
         <DBName>mysampledb</DBName>
         <AutoMinorVersionUpgrade>true</AutoMinorVersionUpgrade>