From 7949a30a07927f59bfa31306436d3f868d02e7e4 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Thu, 25 Aug 2016 14:40:57 +0100 Subject: [PATCH] provider/aws: Randomize the key_pair used in the (#8472) `aws_spot_fleet_request` acceptance tests --- .../resource_aws_spot_fleet_request_test.go | 120 +++++++++++------- 1 file changed, 74 insertions(+), 46 deletions(-) diff --git a/builtin/providers/aws/resource_aws_spot_fleet_request_test.go b/builtin/providers/aws/resource_aws_spot_fleet_request_test.go index 020fb38fe..41aa0a7b8 100644 --- a/builtin/providers/aws/resource_aws_spot_fleet_request_test.go +++ b/builtin/providers/aws/resource_aws_spot_fleet_request_test.go @@ -7,12 +7,14 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { var before, after ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -20,7 +22,7 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfig, + Config: testAccAWSSpotFleetRequestConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &before), @@ -33,7 +35,7 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { ), }, resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigChangeSpotBidPrice, + Config: testAccAWSSpotFleetRequestConfigChangeSpotBidPrice(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &after), @@ -52,6 +54,7 @@ func TestAccAWSSpotFleetRequest_changePriceForcesNewRequest(t *testing.T) { func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -59,7 +62,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfig, + Config: testAccAWSSpotFleetRequestConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -75,6 +78,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion(t *testing.T) { func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -82,7 +86,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigWithAzs, + Config: testAccAWSSpotFleetRequestConfigWithAzs(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -102,6 +106,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList(t *testing.T) { func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -109,7 +114,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigWithSubnet, + Config: testAccAWSSpotFleetRequestConfigWithSubnet(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -125,6 +130,7 @@ func TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList(t *testing.T) { func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -132,7 +138,7 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameAz, + Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameAz(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -156,6 +162,7 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz(t *testing.T) { func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -163,7 +170,7 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameSubnet, + Config: testAccAWSSpotFleetRequestConfigMultipleInstanceTypesinSameSubnet(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -179,6 +186,7 @@ func TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet(t *testing.T) func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -186,7 +194,7 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigOverridingSpotPrice, + Config: testAccAWSSpotFleetRequestConfigOverridingSpotPrice(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -212,6 +220,7 @@ func TestAccAWSSpotFleetRequest_overriddingSpotPrice(t *testing.T) { func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -219,7 +228,7 @@ func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigDiversifiedAllocation, + Config: testAccAWSSpotFleetRequestConfigDiversifiedAllocation(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -237,6 +246,7 @@ func TestAccAWSSpotFleetRequest_diversifiedAllocation(t *testing.T) { func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { var sfr ec2.SpotFleetRequestConfig + rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -244,7 +254,7 @@ func TestAccAWSSpotFleetRequest_withWeightedCapacity(t *testing.T) { CheckDestroy: testAccCheckAWSSpotFleetRequestDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSSpotFleetRequestConfigWithWeightedCapacity, + Config: testAccAWSSpotFleetRequestConfigWithWeightedCapacity(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAWSSpotFleetRequestExists( "aws_spot_fleet_request.foo", &sfr), @@ -370,9 +380,10 @@ func testAccCheckAWSSpotFleetRequestDestroy(s *terraform.State) error { return nil } -const testAccAWSSpotFleetRequestConfig = ` +func testAccAWSSpotFleetRequestConfig(rName string) string { + return fmt.Sprintf(` resource "aws_key_pair" "debugging" { - key_name = "tmp-key" + key_name = "tmp-key-%s" public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 phodgson@thoughtworks.com" } @@ -383,7 +394,7 @@ resource "aws_iam_policy_attachment" "test-attach" { } resource "aws_iam_role" "test-role" { - name = "test-role" + name = "test-role-%s" assume_role_policy = <