ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #849 from gfloyd/spot-price 

Add spot_price parameter to aws_launch_configuration resource
This commit is contained in:
Sander van Harmelen 2015-01-23 23:48:09 +01:00
parent 4980838802 91378ce0af
commit a3ef8bed68
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/aws/resource_aws_launch_configuration.go
View File

@ -81,6 +81,12 @@ func resourceAwsLaunchConfiguration() *schema.Resource {
Optional: true, Optional: true,
Default: false, Default: false,
}, },
"spot_price": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
}, },
} }
} }
@ -96,6 +102,7 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
createLaunchConfigurationOpts.KeyName = d.Get("key_name").(string) createLaunchConfigurationOpts.KeyName = d.Get("key_name").(string)
createLaunchConfigurationOpts.UserData = d.Get("user_data").(string) createLaunchConfigurationOpts.UserData = d.Get("user_data").(string)
createLaunchConfigurationOpts.AssociatePublicIpAddress = d.Get("associate_public_ip_address").(bool) createLaunchConfigurationOpts.AssociatePublicIpAddress = d.Get("associate_public_ip_address").(bool)
createLaunchConfigurationOpts.SpotPrice = d.Get("spot_price").(string)
if v, ok := d.GetOk("security_groups"); ok { if v, ok := d.GetOk("security_groups"); ok {
createLaunchConfigurationOpts.SecurityGroups = expandStringList( createLaunchConfigurationOpts.SecurityGroups = expandStringList(
@ -150,6 +157,7 @@ func resourceAwsLaunchConfigurationRead(d *schema.ResourceData, meta interface{}
d.Set("instance_type", lc.InstanceType) d.Set("instance_type", lc.InstanceType)
d.Set("name", lc.Name) d.Set("name", lc.Name)
d.Set("security_groups", lc.SecurityGroups) d.Set("security_groups", lc.SecurityGroups)
d.Set("spot_price", lc.SpotPrice)
return nil return nil
} }

23
builtin/providers/aws/resource_aws_launch_configuration_test.go
View File

@ -30,6 +30,18 @@ func TestAccAWSLaunchConfiguration(t *testing.T) {
"aws_launch_configuration.bar", "instance_type", "t1.micro"), "aws_launch_configuration.bar", "instance_type", "t1.micro"),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_launch_configuration.bar", "associate_public_ip_address", "true"), "aws_launch_configuration.bar", "associate_public_ip_address", "true"),
resource.TestCheckResourceAttr(
"aws_launch_configuration.bar", "spot_price", ""),
),
},
resource.TestStep{
Config: TestAccAWSLaunchConfigurationWithSpotPriceConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSLaunchConfigurationExists("aws_launch_configuration.bar", &conf),
testAccCheckAWSLaunchConfigurationAttributes(&conf),
resource.TestCheckResourceAttr(
"aws_launch_configuration.bar", "spot_price", "0.01"),
), ),
}, },
}, },
@ -129,3 +141,14 @@ resource "aws_launch_configuration" "bar" {
associate_public_ip_address = true associate_public_ip_address = true
} }
` `
const TestAccAWSLaunchConfigurationWithSpotPriceConfig = `
resource "aws_launch_configuration" "bar" {
name = "foobar-terraform-test"
image_id = "ami-21f78e11"
instance_type = "t1.micro"
user_data = "foobar-user-data"
associate_public_ip_address = true
spot_price = "0.01"
}
`