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

Merge pull request #1792 from ctiwald/ct/fix-acc-tests 

Fix four acceptance tests so they now run successfully
This commit is contained in:
Mitchell Hashimoto 2015-05-04 09:59:31 -07:00
parent cc7f4edd27 4727260987
commit 92c55162f4
5 changed files with 63 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go
View File

@ -6,6 +6,7 @@ import (
"github.com/awslabs/aws-sdk-go/aws" "github.com/awslabs/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/service/elb" "github.com/awslabs/aws-sdk-go/service/elb"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
@ -30,7 +31,7 @@ func TestAccAWSAppCookieStickinessPolicy(t *testing.T) {
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAppCookieStickinessPolicy( testAccCheckAppCookieStickinessPolicy(
"aws_elb.lb", "aws_elb.lb",
"aws_app_cookie_stickiness_policy.bar", "aws_app_cookie_stickiness_policy.foo",
), ),
), ),
}, },
@ -80,7 +81,7 @@ func testAccCheckAppCookieStickinessPolicy(elbResource string, policyResource st
const testAccAppCookieStickinessPolicyConfig = ` const testAccAppCookieStickinessPolicyConfig = `
resource "aws_elb" "lb" { resource "aws_elb" "lb" {
name = "test-lb" name = "test-lb"
availability_zones = ["us-east-1a"] availability_zones = ["us-west-2a"]
listener { listener {
instance_port = 8000 instance_port = 8000
instance_protocol = "http" instance_protocol = "http"
@ -90,17 +91,18 @@ resource "aws_elb" "lb" {
} }
resource "aws_app_cookie_stickiness_policy" "foo" { resource "aws_app_cookie_stickiness_policy" "foo" {
name = "foo_policy" name = "foo-policy"
load_balancer = "${aws_elb.lb}" load_balancer = "${aws_elb.lb.id}"
lb_port = 80 lb_port = 80
cookie_name = "MyAppCookie" cookie_name = "MyAppCookie"
} }
` `
// Change the cookie_name to "MyOtherAppCookie".
const testAccAppCookieStickinessPolicyConfigUpdate = ` const testAccAppCookieStickinessPolicyConfigUpdate = `
resource "aws_elb" "lb" { resource "aws_elb" "lb" {
name = "test-lb" name = "test-lb"
availability_zones = ["us-east-1a"] availability_zones = ["us-west-2a"]
listener { listener {
instance_port = 8000 instance_port = 8000
instance_protocol = "http" instance_protocol = "http"
@ -110,16 +112,9 @@ resource "aws_elb" "lb" {
} }
resource "aws_app_cookie_stickiness_policy" "foo" { resource "aws_app_cookie_stickiness_policy" "foo" {
name = "foo_policy" name = "foo-policy"
load_balancer = "${aws_elb.lb}" load_balancer = "${aws_elb.lb.id}"
lb_port = 80 lb_port = 80
cookie_name = "MyAppCookie" cookie_name = "MyOtherAppCookie"
}
resource "aws_app_cookie_stickiness_policy" "bar" {
name = "bar_policy"
load_balancer = "${aws_elb.lb}"
lb_port = 80
cookie_name = "MyAppCookie"
} }
` `

43
builtin/providers/aws/resource_aws_customer_gateway_test.go
View File

@ -6,6 +6,7 @@ import (
"github.com/awslabs/aws-sdk-go/aws" "github.com/awslabs/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/service/ec2" "github.com/awslabs/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
@ -25,10 +26,18 @@ func TestAccCustomerGateway(t *testing.T) {
), ),
}, },
resource.TestStep{ resource.TestStep{
Config: testAccCustomerGatewayUpdate, Config: testAccCustomerGatewayConfigUpdateTags,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckCustomerGateway( testAccCheckCustomerGateway(
"aws_customer_gateway.bar", "aws_customer_gateway.foo",
),
),
},
resource.TestStep{
Config: testAccCustomerGatewayConfigForceReplace,
Check: resource.ComposeTestCheckFunc(
testAccCheckCustomerGateway(
"aws_customer_gateway.foo",
), ),
), ),
}, },
@ -82,29 +91,35 @@ const testAccCustomerGatewayConfig = `
resource "aws_customer_gateway" "foo" { resource "aws_customer_gateway" "foo" {
bgp_asn = 60000 bgp_asn = 60000
ip_address = "172.0.0.1" ip_address = "172.0.0.1"
type = ipsec.1 type = "ipsec.1"
tags { tags {
Name = "foo-gateway" Name = "foo-gateway"
} }
} }
` `
const testAccCustomerGatewayUpdate = ` // Add the Another: "tag" tag.
const testAccCustomerGatewayConfigUpdateTags = `
resource "aws_customer_gateway" "foo" { resource "aws_customer_gateway" "foo" {
bgp_asn = 60000 bgp_asn = 60000
ip_address = "172.0.0.1" ip_address = "172.0.0.1"
type = ipsec.1 type = "ipsec.1"
tags {
Name = "foo-gateway"
}
}
resource "aws_customer_gateway" "bar" {
bgp_asn = 60000
ip_address = "172.0.0.1"
type = ipsec.1
tags { tags {
Name = "foo-gateway" Name = "foo-gateway"
Another = "tag"
}
}
`
// Change the ip_address.
const testAccCustomerGatewayConfigForceReplace = `
resource "aws_customer_gateway" "foo" {
bgp_asn = 60000
ip_address = "172.10.10.1"
type = "ipsec.1"
tags {
Name = "foo-gateway"
Another = "tag"
} }
} }
` `

27
builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go
View File

@ -6,11 +6,12 @@ import (
"github.com/awslabs/aws-sdk-go/aws" "github.com/awslabs/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/service/elb" "github.com/awslabs/aws-sdk-go/service/elb"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccAWSLBCookieStickinessPolicy(t *testing.T) { func TestAccAwsLBCookieStickinessPolicy(t *testing.T) {
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
@ -30,7 +31,7 @@ func TestAccAWSLBCookieStickinessPolicy(t *testing.T) {
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckLBCookieStickinessPolicy( testAccCheckLBCookieStickinessPolicy(
"aws_elb.lb", "aws_elb.lb",
"aws_lb_cookie_stickiness_policy.bar", "aws_lb_cookie_stickiness_policy.foo",
), ),
), ),
}, },
@ -80,7 +81,7 @@ func testAccCheckLBCookieStickinessPolicy(elbResource string, policyResource str
const testAccLBCookieStickinessPolicyConfig = ` const testAccLBCookieStickinessPolicyConfig = `
resource "aws_elb" "lb" { resource "aws_elb" "lb" {
name = "test-lb" name = "test-lb"
availability_zones = ["us-east-1a"] availability_zones = ["us-west-2a"]
listener { listener {
instance_port = 8000 instance_port = 8000
instance_protocol = "http" instance_protocol = "http"
@ -90,17 +91,18 @@ resource "aws_elb" "lb" {
} }
resource "aws_lb_cookie_stickiness_policy" "foo" { resource "aws_lb_cookie_stickiness_policy" "foo" {
name = "foo_policy" name = "foo-policy"
load_balancer = "${aws_elb.lb}" load_balancer = "${aws_elb.lb.id}"
lb_port = 80 lb_port = 80
cookie_expiration_period = 600 cookie_expiration_period = 600
} }
` `
// Sets the cookie_expiration_period to 300s.
const testAccLBCookieStickinessPolicyConfigUpdate = ` const testAccLBCookieStickinessPolicyConfigUpdate = `
resource "aws_elb" "lb" { resource "aws_elb" "lb" {
name = "test-lb" name = "test-lb"
availability_zones = ["us-east-1a"] availability_zones = ["us-west-2a"]
listener { listener {
instance_port = 8000 instance_port = 8000
instance_protocol = "http" instance_protocol = "http"
@ -110,16 +112,9 @@ resource "aws_elb" "lb" {
} }
resource "aws_lb_cookie_stickiness_policy" "foo" { resource "aws_lb_cookie_stickiness_policy" "foo" {
name = "foo_policy" name = "foo-policy"
load_balancer = "${aws_elb.lb}" load_balancer = "${aws_elb.lb.id}"
lb_port = 80 lb_port = 80
cookie_expiration_period = 600 cookie_expiration_period = 300
}
resource "aws_lb_cookie_stickiness_policy" "bar" {
name = "bar_policy"
load_balancer = "${aws_elb.lb}"
lb_port = 80
cookie_expiration_period = 600
} }
` `

34
builtin/providers/aws/resource_aws_vpn_connection_test.go
View File

@ -35,7 +35,7 @@ func TestAccAwsVpnConnection(t *testing.T) {
"aws_vpc.vpc", "aws_vpc.vpc",
"aws_vpn_gateway.vpn_gateway", "aws_vpn_gateway.vpn_gateway",
"aws_customer_gateway.customer_gateway", "aws_customer_gateway.customer_gateway",
"aws_vpn_connection.bar", "aws_vpn_connection.foo",
), ),
), ),
}, },
@ -85,18 +85,16 @@ func testAccAwsVpnConnection(
} }
const testAccAwsVpnConnectionConfig = ` const testAccAwsVpnConnectionConfig = `
resource "aws_vpc" "vpc" {
cidr_block = "10.0.0.0/16"
}
resource "aws_vpn_gateway" "vpn_gateway" { resource "aws_vpn_gateway" "vpn_gateway" {
vpc_id = "${aws_vpc.vpc.id}" tags {
Name = "vpn_gateway"
}
} }
resource "aws_customer_gateway" "customer_gateway" { resource "aws_customer_gateway" "customer_gateway" {
bgp_asn = 60000 bgp_asn = 60000
ip_address = "172.0.0.1" ip_address = "178.0.0.1"
type = ipsec.1 type = "ipsec.1"
} }
resource "aws_vpn_connection" "foo" { resource "aws_vpn_connection" "foo" {
@ -107,29 +105,21 @@ resource "aws_vpn_connection" "foo" {
} }
` `
// Change static_routes_only to be false, forcing a refresh.
const testAccAwsVpnConnectionConfigUpdate = ` const testAccAwsVpnConnectionConfigUpdate = `
resource "aws_vpc" "vpc" {
cidr_block = "10.0.0.0/16"
}
resource "aws_vpn_gateway" "vpn_gateway" { resource "aws_vpn_gateway" "vpn_gateway" {
vpc_id = "${aws_vpc.vpc.id}" tags {
Name = "vpn_gateway"
}
} }
resource "aws_customer_gateway" "customer_gateway" { resource "aws_customer_gateway" "customer_gateway" {
bgp_asn = 60000 bgp_asn = 60000
ip_address = "172.0.0.1" ip_address = "178.0.0.1"
type = ipsec.1 type = "ipsec.1"
} }
resource "aws_vpn_connection" "foo" { resource "aws_vpn_connection" "foo" {
vpn_gateway_id = "${aws_vpn_gateway.vpn_gateway.id}"
customer_gateway_id = "${aws_customer_gateway.customer_gateway.id}"
type = "ipsec.1"
static_routes_only = true
}
resource "aws_vpn_connection" "bar" {
vpn_gateway_id = "${aws_vpn_gateway.vpn_gateway.id}" vpn_gateway_id = "${aws_vpn_gateway.vpn_gateway.id}"
customer_gateway_id = "${aws_customer_gateway.customer_gateway.id}" customer_gateway_id = "${aws_customer_gateway.customer_gateway.id}"
type = "ipsec.1" type = "ipsec.1"

2
website/source/docs/providers/aws/r/vpn_connection.html.markdown
View File

@ -1,7 +1,7 @@
--- ---
layout: "aws" layout: "aws"
page_title: "AWS: aws_vpn_connection" page_title: "AWS: aws_vpn_connection"
sidebar_current: "docs-aws-vpn-connection" sidebar_current: "docs-aws-resource-vpn-connection"
description: |- description: |-
Provides a VPN connection connected to a VPC. These objects can be connected to customer gateways, and allow you to establish tunnels between your network and the VPC. Provides a VPN connection connected to a VPC. These objects can be connected to customer gateways, and allow you to establish tunnels between your network and the VPC.
--- ---