docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract const for simple errors 

Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
This commit is contained in:
Jean-Laurent de Morlhon 2016-01-14 09:44:14 +01:00
parent 6940dc33ca
commit c4e3480c74
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/amazonec2/amazonec2.go
View File

@ -47,8 +47,11 @@ const (
) )
var ( var (
dockerPort = 2376 dockerPort = 2376
swarmPort = 3376 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 { type Driver struct {
@ -282,22 +285,22 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.SetSwarmConfigFromFlags(flags) d.SetSwarmConfigFromFlags(flags)
if d.AccessKey == "" { if d.AccessKey == "" {
return fmt.Errorf("amazonec2 driver requires the --amazonec2-access-key option") return errorMissingAccessKeyOption
} }
if d.SecretKey == "" { if d.SecretKey == "" {
return fmt.Errorf("amazonec2 driver requires the --amazonec2-secret-key option") return errorMissingSecretKeyOption
} }
if d.VpcId == "" { if d.VpcId == "" {
d.VpcId, err = d.getDefaultVPCId() d.VpcId, err = d.getDefaultVPCId()
if err != nil { 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 == "" { 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 != "" { if d.SubnetId != "" && d.VpcId != "" {