ec2: Add VPC NetworkInterface-related APIs

ec2/ec2.go

 //
 // goamz - Go packages to interact with the Amazon Web Services.
 //
 //   https://wiki.ubuntu.com/goamz
 //
 // Copyright (c) 2011 Canonical Ltd.
 //
 
 package ec2
 
@@ skipping 618 matching lines @@
         XMLName   xml.Name
         RequestId string `xml:"requestId"`
 }
 
 // CreateSecurityGroupResp represents a response to a CreateSecurityGroup request.
 type CreateSecurityGroupResp struct {
         SecurityGroup
         RequestId string `xml:"requestId"`
 }
 
-// CreateSecurityGroup run a CreateSecurityGroup request in EC2, with the provided
-// name and description.
+// CreateSecurityGroup creates a security group with the provided name
+// and description.
 //
 // See http://goo.gl/Eo7Yl for more details.
 func (ec2 *EC2) CreateSecurityGroup(name, description string) (resp *CreateSecurityGroupResp, err error) {
-        params := makeParams("CreateSecurityGroup")
+        return ec2.CreateSecurityGroupVPC("", name, description)
+}
+
+// CreateSecurityGroupVPC creates a security group in EC2, associated
+// with the given VPC ID. If vpcId is empty, this call is equivalent
+// to CreateSecurityGroup.
+//
+// See http://goo.gl/Eo7Yl for more details.
+func (ec2 *EC2) CreateSecurityGroupVPC(vpcId, name, description string) (resp *CreateSecurityGroupResp, err error) {
+        params := makeParamsVPC("CreateSecurityGroup")
         params["GroupName"] = name
         params["GroupDescription"] = description
+        if vpcId != "" {
+                params["VpcId"] = vpcId
+        }
 
         resp = &CreateSecurityGroupResp{}
         err = ec2.query(params, resp)
         if err != nil {
                 return nil, err
         }
         resp.Name = name
         return resp, nil
 }
 
 // SecurityGroupsResp represents a response to a DescribeSecurityGroups
 // request in EC2.
 //
 // See http://goo.gl/k12Uy for more details.
 type SecurityGroupsResp struct {
         RequestId string              `xml:"requestId"`
         Groups    []SecurityGroupInfo `xml:"securityGroupInfo>item"`
 }
 
 // SecurityGroup encapsulates details for a security group in EC2.
 //
 // See http://goo.gl/CIdyP for more details.
 type SecurityGroupInfo struct {
         SecurityGroup
+        VPCId       string   `xml:"vpcId"`
         OwnerId     string   `xml:"ownerId"`
         Description string   `xml:"groupDescription"`
         IPPerms     []IPPerm `xml:"ipPermissions>item"`
 }
 
 // IPPerm represents an allowance within an EC2 security group.
 //
 // See http://goo.gl/4oTxv for more details.
 type IPPerm struct {
         Protocol     string              `xml:"ipProtocol"`
@@ skipping 220 matching lines @@
 func (ec2 *EC2) RebootInstances(ids ...string) (resp *SimpleResp, err error) {
         params := makeParams("RebootInstances")
         addParamsList(params, "InstanceId", ids)
         resp = &SimpleResp{}
         err = ec2.query(params, resp)
         if err != nil {
                 return nil, err
         }
         return resp, nil
 }