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

Merge pull request #13942 from hashicorp/p-aws-glacier-vault-test 

Randomizes glacier vault name
This commit is contained in:
Matthew Frahry 2017-04-25 13:44:52 -06:00 committed by GitHub
parent 5c946a747d 7130755d8b
commit 9c42866887
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/import_aws_glacier_vault_test.go
View File

@ -3,11 +3,13 @@ package aws
import (
"testing"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)
func TestAccAWSGlacierVault_importBasic(t *testing.T) {
resourceName := "aws_glacier_vault.full"
rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
@ -15,7 +17,7 @@ func TestAccAWSGlacierVault_importBasic(t *testing.T) {
CheckDestroy: testAccCheckGlacierVaultDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccGlacierVault_full,
Config: testAccGlacierVault_full(rInt),
},
resource.TestStep{

40
builtin/providers/aws/resource_aws_glacier_vault_test.go
View File

@ -9,18 +9,20 @@ import (
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/glacier"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
func TestAccAWSGlacierVault_basic(t *testing.T) {
rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckGlacierVaultDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccGlacierVault_basic,
Config: testAccGlacierVault_basic(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckGlacierVaultExists("aws_glacier_vault.test"),
),
@ -30,13 +32,14 @@ func TestAccAWSGlacierVault_basic(t *testing.T) {
}
func TestAccAWSGlacierVault_full(t *testing.T) {
rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckGlacierVaultDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccGlacierVault_full,
Config: testAccGlacierVault_full(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckGlacierVaultExists("aws_glacier_vault.full"),
),
@ -46,19 +49,20 @@ func TestAccAWSGlacierVault_full(t *testing.T) {
}
func TestAccAWSGlacierVault_RemoveNotifications(t *testing.T) {
rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckGlacierVaultDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccGlacierVault_full,
Config: testAccGlacierVault_full(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckGlacierVaultExists("aws_glacier_vault.full"),
),
},
resource.TestStep{
Config: testAccGlacierVault_withoutNotification,
Config: testAccGlacierVault_withoutNotification(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckGlacierVaultExists("aws_glacier_vault.full"),
testAccCheckVaultNotificationsMissing("aws_glacier_vault.full"),
@ -205,19 +209,22 @@ func testAccCheckGlacierVaultDestroy(s *terraform.State) error {
return nil
}
const testAccGlacierVault_basic = `
func testAccGlacierVault_basic(rInt int) string {
return fmt.Sprintf(`
resource "aws_glacier_vault" "test" {
name = "my_test_vault"
name = "my_test_vault_%d"
}
`, rInt)
}
`
const testAccGlacierVault_full = `
func testAccGlacierVault_full(rInt int) string {
return fmt.Sprintf(`
resource "aws_sns_topic" "aws_sns_topic" {
name = "glacier-sns-topic"
name = "glacier-sns-topic-%d"
}
resource "aws_glacier_vault" "full" {
name = "my_test_vault"
name = "my_test_vault_%d"
notification {
sns_topic = "${aws_sns_topic.aws_sns_topic.arn}"
events = ["ArchiveRetrievalCompleted","InventoryRetrievalCompleted"]
@ -226,17 +233,20 @@ resource "aws_glacier_vault" "full" {
Test="Test1"
}
}
`
`, rInt, rInt)
}
const testAccGlacierVault_withoutNotification = `
func testAccGlacierVault_withoutNotification(rInt int) string {
return fmt.Sprintf(`
resource "aws_sns_topic" "aws_sns_topic" {
name = "glacier-sns-topic"
name = "glacier-sns-topic-%d"
}
resource "aws_glacier_vault" "full" {
name = "my_test_vault"
name = "my_test_vault_%d"
tags {
Test="Test1"
}
}
`
`, rInt, rInt)
}