iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-09-30 03:34:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add missing validation and tests for Spot Instance requests

Browse Source
This commit is contained in:
DanHam
2018-05-15 12:25:06 +01:00
parent a9aa9908cd
commit 99e3487795
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/amazon/common/run_config.go
+7
View File
@@ -112,6 +112,13 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
}
}
if c.SpotPriceAutoProduct != "" {
if c.SpotPrice != "auto" {
errs = append(errs, errors.New(
"spot_price should be set to auto when spot_price_auto_product is specified"))
}
}
if c.UserData != "" && c.UserDataFile != "" {
errs = append(errs, fmt.Errorf("Only one of user_data or user_data_file can be specified."))
} else if c.UserDataFile != "" {
builder/amazon/common/run_config_test.go
+7 -1
View File
@@ -118,13 +118,19 @@ func TestRunConfigPrepare_SpotAuto(t *testing.T) {
c := testConfig()
c.SpotPrice = "auto"
if err := c.Prepare(nil); len(err) != 1 {
t.Fatalf("err: %s", err)
t.Fatalf("spot_price_auto_product should be set when spot_price is set to auto")
}
// Good - SpotPrice and SpotPriceAutoProduct are correctly set
c.SpotPriceAutoProduct = "foo"
if err := c.Prepare(nil); len(err) != 0 {
t.Fatalf("err: %s", err)
}
c.SpotPrice = ""
if err := c.Prepare(nil); len(err) != 1 {
t.Fatalf("spot_price should be set to auto when spot_price_auto_product is set")
}
}
func TestRunConfigPrepare_SSHPort(t *testing.T) {