Merge pull request #4805 from justinsb/toolbox_dump_vpc

Add VPC to kops toolbox dump

pkg/resources/aws/vpc.go

@@ -53,6 +53,13 @@ func DumpVPC(op *resources.DumpOperation, r *resources.Resource) error {
 	data["type"] = ec2.ResourceTypeVpc
 	data["raw"] = r.Obj
 	op.Dump.Resources = append(op.Dump.Resources, data)
+
+	ec2VPC := r.Obj.(*ec2.Vpc)
+	vpc := &resources.VPC{
+		ID: aws.StringValue(ec2VPC.VpcId),
+	}
+	op.Dump.VPC = vpc
+
 	return nil
 }
 

pkg/resources/dumpmodel.go

@@ -29,9 +29,15 @@ type Subnet struct {
 	Zone string `json:"zone,omitempty"`
 }
 
+// VPC is the type for an VPC in a dump
+type VPC struct {
+	ID string `json:"id,omitempty"`
+}
+
 // Dump is the type for a dump result
 type Dump struct {
 	Resources []interface{} `json:"resources,omitempty"`
 	Instances []*Instance   `json:"instances,omitempty"`
 	Subnets   []*Subnet     `json:"subnets,omitempty"`
+	VPC       *VPC          `json:"vpc,omitempty"`
 }