Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 6f04c36

Browse files
catsbycatsby
committed
provider/aws: Ranomize LB names so tests can run at the same time
1 parent a8de400 commit 6f04c36

3 files changed

Lines changed: 38 additions & 26 deletions

File tree

‎builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,20 @@ import (
88
"github.com/aws/aws-sdk-go/aws/awserr"
99
"github.com/aws/aws-sdk-go/service/elb"
1010

11+
"github.com/hashicorp/terraform/helper/acctest"
1112
"github.com/hashicorp/terraform/helper/resource"
1213
"github.com/hashicorp/terraform/terraform"
1314
)
1415

1516
func TestAccAWSAppCookieStickinessPolicy_basic(t *testing.T) {
17+
lbName := fmt.Sprintf("tf-test-lb-%s", acctest.RandString(5))
1618
resource.Test(t, resource.TestCase{
1719
PreCheck: func() { testAccPreCheck(t) },
1820
Providers: testAccProviders,
1921
CheckDestroy: testAccCheckAppCookieStickinessPolicyDestroy,
2022
Steps: []resource.TestStep{
2123
resource.TestStep{
22-
Config: testAccAppCookieStickinessPolicyConfig,
24+
Config: testAccAppCookieStickinessPolicyConfig(lbName),
2325
Check: resource.ComposeTestCheckFunc(
2426
testAccCheckAppCookieStickinessPolicy(
2527
"aws_elb.lb",
@@ -28,7 +30,7 @@ func TestAccAWSAppCookieStickinessPolicy_basic(t *testing.T) {
2830
),
2931
},
3032
resource.TestStep{
31-
Config: testAccAppCookieStickinessPolicyConfigUpdate,
33+
Config: testAccAppCookieStickinessPolicyConfigUpdate(lbName),
3234
Check: resource.ComposeTestCheckFunc(
3335
testAccCheckAppCookieStickinessPolicy(
3436
"aws_elb.lb",
@@ -100,9 +102,10 @@ func testAccCheckAppCookieStickinessPolicy(elbResource string, policyResource st
100102
}
101103
}
102104

103-
const testAccAppCookieStickinessPolicyConfig = `
105+
func testAccAppCookieStickinessPolicyConfig(rName string) string {
106+
return fmt.Sprintf(`
104107
resource "aws_elb" "lb" {
105-
name = "test-lb"
108+
name = "%s"
106109
availability_zones = ["us-west-2a"]
107110
listener {
108111
instance_port = 8000
@@ -117,13 +120,14 @@ resource "aws_app_cookie_stickiness_policy" "foo" {
117120
load_balancer = "${aws_elb.lb.id}"
118121
lb_port = 80
119122
cookie_name = "MyAppCookie"
123+
}`, rName)
120124
}
121-
`
122125

123126
// Change the cookie_name to "MyOtherAppCookie".
124-
const testAccAppCookieStickinessPolicyConfigUpdate = `
127+
func testAccAppCookieStickinessPolicyConfigUpdate(rName string) string {
128+
return fmt.Sprintf(`
125129
resource "aws_elb" "lb" {
126-
name = "test-lb"
130+
name = "%s"
127131
availability_zones = ["us-west-2a"]
128132
listener {
129133
instance_port = 8000
@@ -138,5 +142,5 @@ resource "aws_app_cookie_stickiness_policy" "foo" {
138142
load_balancer = "${aws_elb.lb.id}"
139143
lb_port = 80
140144
cookie_name = "MyOtherAppCookie"
145+
}`, rName)
141146
}
142-
`

‎builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,20 @@ import (
88
"github.com/aws/aws-sdk-go/aws/awserr"
99
"github.com/aws/aws-sdk-go/service/elb"
1010

11+
"github.com/hashicorp/terraform/helper/acctest"
1112
"github.com/hashicorp/terraform/helper/resource"
1213
"github.com/hashicorp/terraform/terraform"
1314
)
1415

1516
func TestAccAWSLBCookieStickinessPolicy_basic(t *testing.T) {
17+
lbName := fmt.Sprintf("tf-test-lb-%s", acctest.RandString(5))
1618
resource.Test(t, resource.TestCase{
1719
PreCheck: func() { testAccPreCheck(t) },
1820
Providers: testAccProviders,
1921
CheckDestroy: testAccCheckLBCookieStickinessPolicyDestroy,
2022
Steps: []resource.TestStep{
2123
resource.TestStep{
22-
Config: testAccLBCookieStickinessPolicyConfig,
24+
Config: testAccLBCookieStickinessPolicyConfig(lbName),
2325
Check: resource.ComposeTestCheckFunc(
2426
testAccCheckLBCookieStickinessPolicy(
2527
"aws_elb.lb",
@@ -28,7 +30,7 @@ func TestAccAWSLBCookieStickinessPolicy_basic(t *testing.T) {
2830
),
2931
},
3032
resource.TestStep{
31-
Config: testAccLBCookieStickinessPolicyConfigUpdate,
33+
Config: testAccLBCookieStickinessPolicyConfigUpdate(lbName),
3234
Check: resource.ComposeTestCheckFunc(
3335
testAccCheckLBCookieStickinessPolicy(
3436
"aws_elb.lb",
@@ -100,9 +102,10 @@ func testAccCheckLBCookieStickinessPolicy(elbResource string, policyResource str
100102
}
101103
}
102104

103-
const testAccLBCookieStickinessPolicyConfig = `
105+
func testAccLBCookieStickinessPolicyConfig(rName string) string {
106+
return fmt.Sprintf(`
104107
resource "aws_elb" "lb" {
105-
name = "test-lb"
108+
name = "%s"
106109
availability_zones = ["us-west-2a"]
107110
listener {
108111
instance_port = 8000
@@ -116,13 +119,14 @@ resource "aws_lb_cookie_stickiness_policy" "foo" {
116119
name = "foo-policy"
117120
load_balancer = "${aws_elb.lb.id}"
118121
lb_port = 80
122+
}`, rName)
119123
}
120-
`
121124

122125
// Sets the cookie_expiration_period to 300s.
123-
const testAccLBCookieStickinessPolicyConfigUpdate = `
126+
func testAccLBCookieStickinessPolicyConfigUpdate(rName string) string {
127+
return fmt.Sprintf(`
124128
resource "aws_elb" "lb" {
125-
name = "test-lb"
129+
name = "%s"
126130
availability_zones = ["us-west-2a"]
127131
listener {
128132
instance_port = 8000
@@ -137,5 +141,5 @@ resource "aws_lb_cookie_stickiness_policy" "foo" {
137141
load_balancer = "${aws_elb.lb.id}"
138142
lb_port = 80
139143
cookie_expiration_period = 300
144+
}`, rName)
140145
}
141-
`

‎builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,34 @@ import (
66

77
"github.com/aws/aws-sdk-go/aws"
88
"github.com/aws/aws-sdk-go/service/elb"
9+
"github.com/hashicorp/terraform/helper/acctest"
910
"github.com/hashicorp/terraform/helper/resource"
1011
"github.com/hashicorp/terraform/terraform"
1112
)
1213

1314
func TestAccAWSProxyProtocolPolicy_basic(t *testing.T) {
15+
lbName := fmt.Sprintf("tf-test-lb-%s", acctest.RandString(5))
1416
resource.Test(t, resource.TestCase{
1517
PreCheck: func() { testAccPreCheck(t) },
1618
Providers: testAccProviders,
1719
CheckDestroy: testAccCheckProxyProtocolPolicyDestroy,
1820
Steps: []resource.TestStep{
1921
resource.TestStep{
20-
Config: testAccProxyProtocolPolicyConfig,
22+
Config: testAccProxyProtocolPolicyConfig(lbName),
2123
Check: resource.ComposeTestCheckFunc(
2224
resource.TestCheckResourceAttr(
23-
"aws_proxy_protocol_policy.smtp", "load_balancer", "test-lb"),
25+
"aws_proxy_protocol_policy.smtp", "load_balancer", lbName),
2426
resource.TestCheckResourceAttr(
2527
"aws_proxy_protocol_policy.smtp", "instance_ports.#", "1"),
2628
resource.TestCheckResourceAttr(
2729
"aws_proxy_protocol_policy.smtp", "instance_ports.4196041389", "25"),
2830
),
2931
},
3032
resource.TestStep{
31-
Config: testAccProxyProtocolPolicyConfigUpdate,
33+
Config: testAccProxyProtocolPolicyConfigUpdate(lbName),
3234
Check: resource.ComposeTestCheckFunc(
3335
resource.TestCheckResourceAttr(
34-
"aws_proxy_protocol_policy.smtp", "load_balancer", "test-lb"),
36+
"aws_proxy_protocol_policy.smtp", "load_balancer", lbName),
3537
resource.TestCheckResourceAttr(
3638
"aws_proxy_protocol_policy.smtp", "instance_ports.#", "2"),
3739
resource.TestCheckResourceAttr(
@@ -70,9 +72,10 @@ func testAccCheckProxyProtocolPolicyDestroy(s *terraform.State) error {
7072
return nil
7173
}
7274

73-
const testAccProxyProtocolPolicyConfig = `
75+
func testAccProxyProtocolPolicyConfig(rName string) string {
76+
return fmt.Sprintf(`
7477
resource "aws_elb" "lb" {
75-
name = "test-lb"
78+
name = "%s"
7679
availability_zones = ["us-west-2a"]
7780
7881
listener {
@@ -93,12 +96,13 @@ resource "aws_elb" "lb" {
9396
resource "aws_proxy_protocol_policy" "smtp" {
9497
load_balancer = "${aws_elb.lb.name}"
9598
instance_ports = ["25"]
99+
}`, rName)
96100
}
97-
`
98101

99-
const testAccProxyProtocolPolicyConfigUpdate = `
102+
func testAccProxyProtocolPolicyConfigUpdate(rName string) string {
103+
return fmt.Sprintf(`
100104
resource "aws_elb" "lb" {
101-
name = "test-lb"
105+
name = "%s"
102106
availability_zones = ["us-west-2a"]
103107
104108
listener {
@@ -119,5 +123,5 @@ resource "aws_elb" "lb" {
119123
resource "aws_proxy_protocol_policy" "smtp" {
120124
load_balancer = "${aws_elb.lb.name}"
121125
instance_ports = ["25", "587"]
126+
}`, rName)
122127
}
123-
`

0 commit comments

Comments
 (0)