Extract const for simple errors

jeanlaurent · jeanlaurent · commit c4e3480c74bb · 2016-01-14T11:44:24.000+01:00
Signed-off-by: Jean-Laurent de Morlhon &lt;jeanlaurent@morlhon.net&gt;
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
@@ -47,8 +47,11 @@ const (
 )
 
 var (
-	dockerPort = 2376
-	swarmPort  = 3376
+	dockerPort                  = 2376
+	swarmPort                   = 3376
+	errorMissingAccessKeyOption = errors.New("amazonec2 driver requires the --amazonec2-access-key option")
+	errorMissingSecretKeyOption = errors.New("amazonec2 driver requires the --amazonec2-secret-key option")
+	errorNoVPCIdFound           = errors.New("amazonec2 driver requires either the --amazonec2-subnet-id or --amazonec2-vpc-id option or an AWS Account with a default vpc-id")
 )
 
 type Driver struct {
@@ -282,22 +285,22 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.SetSwarmConfigFromFlags(flags)
 
 	if d.AccessKey == "" {
-		return fmt.Errorf("amazonec2 driver requires the --amazonec2-access-key option")
+		return errorMissingAccessKeyOption
 	}
 
 	if d.SecretKey == "" {
-		return fmt.Errorf("amazonec2 driver requires the --amazonec2-secret-key option")
+		return errorMissingSecretKeyOption
 	}
 
 	if d.VpcId == "" {
 		d.VpcId, err = d.getDefaultVPCId()
 		if err != nil {
-			log.Errorf("couldn't determine your account Default VPC ID : %q", err)
+			log.Warnf("Couldn't determine your account Default VPC ID : %q", err)
 		}
 	}
 
 	if d.SubnetId == "" && d.VpcId == "" {
-		return fmt.Errorf("amazonec2 driver requires either the --amazonec2-subnet-id or --amazonec2-vpc-id option or an AWS Account with a default vpc-id")
+		return errorNoVPCIdFound
 	}
 
 	if d.SubnetId != "" && d.VpcId != "" {

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,11 @@ const (`
`47`	`47`	`)`
`48`	`48`
`49`	`49`	`var (`
`50`		`- dockerPort = 2376`
`51`		`- swarmPort = 3376`
	`50`	`+ dockerPort = 2376`
	`51`	`+ swarmPort = 3376`
	`52`	`+ errorMissingAccessKeyOption = errors.New("amazonec2 driver requires the --amazonec2-access-key option")`
	`53`	`+ errorMissingSecretKeyOption = errors.New("amazonec2 driver requires the --amazonec2-secret-key option")`
	`54`	`+ errorNoVPCIdFound = errors.New("amazonec2 driver requires either the --amazonec2-subnet-id or --amazonec2-vpc-id option or an AWS Account with a default vpc-id")`
`52`	`55`	`)`
`53`	`56`
`54`	`57`	`type Driver struct {`
`@@ -282,22 +285,22 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {`
`282`	`285`	`d.SetSwarmConfigFromFlags(flags)`
`283`	`286`
`284`	`287`	`if d.AccessKey == "" {`
`285`		`- return fmt.Errorf("amazonec2 driver requires the --amazonec2-access-key option")`
	`288`	`+ return errorMissingAccessKeyOption`
`286`	`289`	`}`
`287`	`290`
`288`	`291`	`if d.SecretKey == "" {`
`289`		`- return fmt.Errorf("amazonec2 driver requires the --amazonec2-secret-key option")`
	`292`	`+ return errorMissingSecretKeyOption`
`290`	`293`	`}`
`291`	`294`
`292`	`295`	`if d.VpcId == "" {`
`293`	`296`	`d.VpcId, err = d.getDefaultVPCId()`
`294`	`297`	`if err != nil {`
`295`		`- log.Errorf("couldn't determine your account Default VPC ID : %q", err)`
	`298`	`+ log.Warnf("Couldn't determine your account Default VPC ID : %q", err)`
`296`	`299`	`}`
`297`	`300`	`}`
`298`	`301`
`299`	`302`	`if d.SubnetId == "" && d.VpcId == "" {`
`300`		`- return fmt.Errorf("amazonec2 driver requires either the --amazonec2-subnet-id or --amazonec2-vpc-id option or an AWS Account with a default vpc-id")`
	`303`	`+ return errorNoVPCIdFound`
`301`	`304`	`}`
`302`	`305`
`303`	`306`	`if d.SubnetId != "" && d.VpcId != "" {`