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

Merge pull request #11612 from hashicorp/b-fix-beanstalk-env-acctests 

provider/aws: Fixes aws beanstalk env acc tests
This commit is contained in:
Jake Champlin 2017-02-01 13:22:32 -05:00 committed by GitHub
parent 851cc46548 f7db75da58
commit b51edd6175
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builtin/providers/aws/resource_aws_elastic_beanstalk_environment_test.go
View File

@ -633,7 +633,7 @@ func testAccBeanstalkWorkerEnvConfig(rInt int) string {
} }
resource "aws_elastic_beanstalk_environment" "tfenvtest" { resource "aws_elastic_beanstalk_environment" "tfenvtest" {
name = "tf-test-name" name = "tf-test-name-%d"
application = "${aws_elastic_beanstalk_application.tftest.name}" application = "${aws_elastic_beanstalk_application.tftest.name}"
tier = "Worker" tier = "Worker"
solution_stack_name = "64bit Amazon Linux running Python" solution_stack_name = "64bit Amazon Linux running Python"
@ -643,7 +643,7 @@ func testAccBeanstalkWorkerEnvConfig(rInt int) string {
name = "IamInstanceProfile" name = "IamInstanceProfile"
value = "${aws_iam_instance_profile.tftest.name}" value = "${aws_iam_instance_profile.tftest.name}"
} }
}`, rInt) }`, rInt, rInt)
} }
func testAccBeanstalkEnvCnamePrefixConfig(randString string, rInt int) string { func testAccBeanstalkEnvCnamePrefixConfig(randString string, rInt int) string {
@ -654,12 +654,12 @@ description = "tf-test-desc"
} }
resource "aws_elastic_beanstalk_environment" "tfenvtest" { resource "aws_elastic_beanstalk_environment" "tfenvtest" {
name = "tf-test-name" name = "tf-test-name-%d"
application = "${aws_elastic_beanstalk_application.tftest.name}" application = "${aws_elastic_beanstalk_application.tftest.name}"
cname_prefix = "%s" cname_prefix = "%s"
solution_stack_name = "64bit Amazon Linux running Python" solution_stack_name = "64bit Amazon Linux running Python"
} }
`, rInt, randString) `, rInt, rInt, randString)
} }
func testAccBeanstalkConfigTemplate(rInt int) string { func testAccBeanstalkConfigTemplate(rInt int) string {
@ -670,7 +670,7 @@ func testAccBeanstalkConfigTemplate(rInt int) string {
} }
resource "aws_elastic_beanstalk_environment" "tftest" { resource "aws_elastic_beanstalk_environment" "tftest" {
name = "tf-test-name" name = "tf-test-name-%d"
application = "${aws_elastic_beanstalk_application.tftest.name}" application = "${aws_elastic_beanstalk_application.tftest.name}"
template_name = "${aws_elastic_beanstalk_configuration_template.tftest.name}" template_name = "${aws_elastic_beanstalk_configuration_template.tftest.name}"
} }
@ -686,7 +686,7 @@ func testAccBeanstalkConfigTemplate(rInt int) string {
value = "1" value = "1"
} }
} }
`, rInt) `, rInt, rInt)
} }
func testAccBeanstalkConfigTemplateUpdate(rInt int) string { func testAccBeanstalkConfigTemplateUpdate(rInt int) string {
@ -697,7 +697,7 @@ func testAccBeanstalkConfigTemplateUpdate(rInt int) string {
} }
resource "aws_elastic_beanstalk_environment" "tftest" { resource "aws_elastic_beanstalk_environment" "tftest" {
name = "tf-test-name" name = "tf-test-name-%d"
application = "${aws_elastic_beanstalk_application.tftest.name}" application = "${aws_elastic_beanstalk_application.tftest.name}"
template_name = "${aws_elastic_beanstalk_configuration_template.tftest.name}" template_name = "${aws_elastic_beanstalk_configuration_template.tftest.name}"
} }
@ -713,7 +713,7 @@ func testAccBeanstalkConfigTemplateUpdate(rInt int) string {
value = "2" value = "2"
} }
} }
`, rInt) `, rInt, rInt)
} }
func testAccBeanstalkResourceOptionSetting(rInt int) string { func testAccBeanstalkResourceOptionSetting(rInt int) string {
@ -724,7 +724,7 @@ resource "aws_elastic_beanstalk_application" "tftest" {
} }
resource "aws_elastic_beanstalk_environment" "tfenvtest" { resource "aws_elastic_beanstalk_environment" "tfenvtest" {
name = "tf-test-name" name = "tf-test-name-%d"
application = "${aws_elastic_beanstalk_application.tftest.name}" application = "${aws_elastic_beanstalk_application.tftest.name}"
solution_stack_name = "64bit Amazon Linux running Python" solution_stack_name = "64bit Amazon Linux running Python"
@ -748,7 +748,7 @@ resource "aws_elastic_beanstalk_environment" "tfenvtest" {
name = "Recurrence" name = "Recurrence"
value = "0 8 * * *" value = "0 8 * * *"
} }
}`, rInt) }`, rInt, rInt)
} }
func testAccBeanstalkEnv_VPC(name string, rInt int) string { func testAccBeanstalkEnv_VPC(name string, rInt int) string {
@ -783,7 +783,7 @@ resource "aws_elastic_beanstalk_application" "default" {
} }
resource "aws_elastic_beanstalk_environment" "default" { resource "aws_elastic_beanstalk_environment" "default" {
name = "tf-test-name" name = "tf-test-name-%d"
application = "${aws_elastic_beanstalk_application.default.name}" application = "${aws_elastic_beanstalk_application.default.name}"
solution_stack_name = "64bit Amazon Linux running Python" solution_stack_name = "64bit Amazon Linux running Python"
@ -811,7 +811,7 @@ resource "aws_elastic_beanstalk_environment" "default" {
value = "${aws_security_group.default.id}" value = "${aws_security_group.default.id}"
} }
} }
`, name, rInt) `, name, rInt, rInt)
} }
func testAccBeanstalkEnv_TemplateChange_stack(r int) string { func testAccBeanstalkEnv_TemplateChange_stack(r int) string {