iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
Matthew Hooker 2017-10-30 14:34:16 -07:00
parent c65fa8490d
commit 0e4ea7420b
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builder/amazon/common/access_config.go
View File

@ -80,8 +80,7 @@ func (c *AccessConfig) Session() (*session.Session, error) {
return c.session, nil return c.session, nil
} }
// Region returns the aws.Region object for access to AWS services, requesting // region returns either the region from config or region from metadata service
// the region from the instance metadata if possible.
func (c *AccessConfig) region() (string, error) { func (c *AccessConfig) region() (string, error) {
if c.RawRegion != "" { if c.RawRegion != "" {
if !c.SkipValidation { if !c.SkipValidation {

17
builder/amazon/common/ami_config.go
View File

@ -41,20 +41,21 @@ func stringInSlice(s []string, searchstr string) bool {
func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error { func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error {
var errs []error var errs []error
session, err := accessConfig.Session() if accessConfig != nil {
if err != nil { session, err := accessConfig.Session()
errs = append(errs, err) if err != nil {
errs = append(errs, err)
}
region := *session.Config.Region
if stringInSlice(c.AMIRegions, region) {
errs = append(errs, fmt.Errorf("Cannot copy AMI to AWS session region '%s', please remove it from `ami_regions`.", region))
}
} }
region := *session.Config.Region
if c.AMIName == "" { if c.AMIName == "" {
errs = append(errs, fmt.Errorf("ami_name must be specified")) errs = append(errs, fmt.Errorf("ami_name must be specified"))
} }
if stringInSlice(c.AMIRegions, region) {
errs = append(errs, fmt.Errorf("Cannot copy AMI to AWS session region '%s', please remove it from `ami_regions`.", region))
}
if len(c.AMIRegions) > 0 { if len(c.AMIRegions) > 0 {
regionSet := make(map[string]struct{}) regionSet := make(map[string]struct{})
regions := make([]string, 0, len(c.AMIRegions)) regions := make([]string, 0, len(c.AMIRegions))

40
builder/amazon/common/ami_config_test.go
View File

@ -13,12 +13,12 @@ func testAMIConfig() *AMIConfig {
func TestAMIConfigPrepare_name(t *testing.T) { func TestAMIConfigPrepare_name(t *testing.T) {
c := testAMIConfig() c := testAMIConfig()
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatalf("shouldn't have err: %s", err) t.Fatalf("shouldn't have err: %s", err)
} }
c.AMIName = "" c.AMIName = ""
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("should have error") t.Fatal("should have error")
} }
} }
@ -26,22 +26,22 @@ func TestAMIConfigPrepare_name(t *testing.T) {
func TestAMIConfigPrepare_regions(t *testing.T) { func TestAMIConfigPrepare_regions(t *testing.T) {
c := testAMIConfig() c := testAMIConfig()
c.AMIRegions = nil c.AMIRegions = nil
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatalf("shouldn't have err: %s", err) t.Fatalf("shouldn't have err: %s", err)
} }
c.AMIRegions = listEC2Regions() c.AMIRegions = listEC2Regions()
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatalf("shouldn't have err: %s", err) t.Fatalf("shouldn't have err: %s", err)
} }
c.AMIRegions = []string{"foo"} c.AMIRegions = []string{"foo"}
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("should have error") t.Fatal("should have error")
} }
c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-1"} c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-1"}
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatalf("bad: %s", err) t.Fatalf("bad: %s", err)
} }
@ -52,7 +52,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
c.AMIRegions = []string{"custom"} c.AMIRegions = []string{"custom"}
c.AMISkipRegionValidation = true c.AMISkipRegionValidation = true
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatal("shouldn't have error") t.Fatal("shouldn't have error")
} }
c.AMISkipRegionValidation = false c.AMISkipRegionValidation = false
@ -63,7 +63,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
"us-west-1": "789-012-3456", "us-west-1": "789-012-3456",
"us-east-2": "456-789-0123", "us-east-2": "456-789-0123",
} }
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatal("shouldn't have error") t.Fatal("shouldn't have error")
} }
@ -73,7 +73,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
"us-west-1": "789-012-3456", "us-west-1": "789-012-3456",
"us-east-2": "", "us-east-2": "",
} }
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatal("should have passed; we are able to use default KMS key if not sharing") t.Fatal("should have passed; we are able to use default KMS key if not sharing")
} }
@ -84,7 +84,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
"us-west-1": "789-012-3456", "us-west-1": "789-012-3456",
"us-east-2": "", "us-east-2": "",
} }
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("should have an error b/c can't use default KMS key if sharing") t.Fatal("should have an error b/c can't use default KMS key if sharing")
} }
@ -94,7 +94,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
"us-west-1": "789-012-3456", "us-west-1": "789-012-3456",
"us-east-2": "456-789-0123", "us-east-2": "456-789-0123",
} }
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("should have error b/c theres a region in the key map that isn't in ami_regions") t.Fatal("should have error b/c theres a region in the key map that isn't in ami_regions")
} }
@ -103,7 +103,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
"us-east-1": "123-456-7890", "us-east-1": "123-456-7890",
"us-west-1": "789-012-3456", "us-west-1": "789-012-3456",
} }
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map") t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map")
} }
@ -115,7 +115,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
"us-east-1": "123-456-7890", "us-east-1": "123-456-7890",
"us-west-1": "", "us-west-1": "",
} }
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map") t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map")
} }
} }
@ -126,12 +126,12 @@ func TestAMIConfigPrepare_Share_EncryptedBoot(t *testing.T) {
c.AMIEncryptBootVolume = true c.AMIEncryptBootVolume = true
c.AMIKmsKeyId = "" c.AMIKmsKeyId = ""
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("shouldn't be able to share ami with encrypted boot volume") t.Fatal("shouldn't be able to share ami with encrypted boot volume")
} }
c.AMIKmsKeyId = "89c3fb9a-de87-4f2a-aedc-fddc5138193c" c.AMIKmsKeyId = "89c3fb9a-de87-4f2a-aedc-fddc5138193c"
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("shouldn't be able to share ami with encrypted boot volume") t.Fatal("shouldn't be able to share ami with encrypted boot volume")
} }
} }
@ -140,7 +140,7 @@ func TestAMINameValidation(t *testing.T) {
c := testAMIConfig() c := testAMIConfig()
c.AMIName = "aa" c.AMIName = "aa"
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("shouldn't be able to have an ami name with less than 3 characters") t.Fatal("shouldn't be able to have an ami name with less than 3 characters")
} }
@ -149,22 +149,22 @@ func TestAMINameValidation(t *testing.T) {
longAmiName += "a" longAmiName += "a"
} }
c.AMIName = longAmiName c.AMIName = longAmiName
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("shouldn't be able to have an ami name with great than 128 characters") t.Fatal("shouldn't be able to have an ami name with great than 128 characters")
} }
c.AMIName = "+aaa" c.AMIName = "+aaa"
if err := c.Prepare(nil); err == nil { if err := c.Prepare(nil, nil); err == nil {
t.Fatal("shouldn't be able to have an ami name with invalid characters") t.Fatal("shouldn't be able to have an ami name with invalid characters")
} }
c.AMIName = "fooBAR1()[] ./-'@_" c.AMIName = "fooBAR1()[] ./-'@_"
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatal("should be able to use all of the allowed AMI characters") t.Fatal("should be able to use all of the allowed AMI characters")
} }
c.AMIName = `xyz-base-2017-04-05-1934` c.AMIName = `xyz-base-2017-04-05-1934`
if err := c.Prepare(nil); err != nil { if err := c.Prepare(nil, nil); err != nil {
t.Fatalf("expected `xyz-base-2017-04-05-1934` to pass validation.") t.Fatalf("expected `xyz-base-2017-04-05-1934` to pass validation.")
} }