aws ec2 preqreq check: match error to filter

feuGeneA · shin- · commit dccdee010251 · 2018-09-19T16:38:38.000-07:00
filter to search for a subnet searches by both regionZone and VpcId,
but when no matches were found, the error message neglected to mention
that the VPC ID was part of the search criteria

Signed-off-by: F. Eugene Aumson &lt;feuGeneA@github.com&gt;
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
@@ -503,7 +503,7 @@ func (d *Driver) checkPrereqs() error {
 		}
 
 		if len(subnets.Subnets) == 0 {
-			return fmt.Errorf("unable to find a subnet in the zone: %s", regionZone)
+			return fmt.Errorf("unable to find a subnet that is both in the zone %s and belonging to VPC ID %s", regionZone, d.VpcId)
 		}
 
 		d.SubnetId = *subnets.Subnets[0].SubnetId

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ func (d *Driver) checkPrereqs() error {`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`if len(subnets.Subnets) == 0 {`
`506`		`- return fmt.Errorf("unable to find a subnet in the zone: %s", regionZone)`
	`506`	`+ return fmt.Errorf("unable to find a subnet that is both in the zone %s and belonging to VPC ID %s", regionZone, d.VpcId)`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`d.SubnetId = *subnets.Subnets[0].SubnetId`