Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import test refactor for athena named queries #10609

Merged
merged 1 commit into from
Oct 29, 2019
Merged

Import test refactor for athena named queries #10609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 23 additions & 30 deletions aws/resource_aws_athena_named_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
)

func TestAccAWSAthenaNamedQuery_basic(t *testing.T) {
resourceName := "aws_athena_named_query.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand All @@ -20,14 +22,21 @@ func TestAccAWSAthenaNamedQuery_basic(t *testing.T) {
{
Config: testAccAthenaNamedQueryConfig(acctest.RandInt(), acctest.RandString(5)),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSAthenaNamedQueryExists("aws_athena_named_query.foo"),
testAccCheckAWSAthenaNamedQueryExists(resourceName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSAthenaNamedQuery_withWorkGroup(t *testing.T) {
resourceName := "aws_athena_named_query.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand All @@ -36,25 +45,9 @@ func TestAccAWSAthenaNamedQuery_withWorkGroup(t *testing.T) {
{
Config: testAccAthenaNamedWorkGroupQueryConfig(acctest.RandInt(), acctest.RandString(5)),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSAthenaNamedQueryExists("aws_athena_named_query.bar"),
testAccCheckAWSAthenaNamedQueryExists(resourceName),
),
},
},
})
}

func TestAccAWSAthenaNamedQuery_import(t *testing.T) {
resourceName := "aws_athena_named_query.foo"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAthenaNamedQueryDestroy,
Steps: []resource.TestStep{
{
Config: testAccAthenaNamedQueryConfig(acctest.RandInt(), acctest.RandString(5)),
},

{
ResourceName: resourceName,
ImportState: true,
Expand Down Expand Up @@ -109,28 +102,28 @@ func testAccCheckAWSAthenaNamedQueryExists(name string) resource.TestCheckFunc {

func testAccAthenaNamedQueryConfig(rInt int, rName string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "hoge" {
resource "aws_s3_bucket" "test" {
bucket = "tf-athena-db-%s-%d"
force_destroy = true
}

resource "aws_athena_database" "hoge" {
resource "aws_athena_database" "test" {
name = "%s"
bucket = "${aws_s3_bucket.hoge.bucket}"
bucket = "${aws_s3_bucket.test.bucket}"
}

resource "aws_athena_named_query" "foo" {
resource "aws_athena_named_query" "test" {
name = "tf-athena-named-query-%s"
database = "${aws_athena_database.hoge.name}"
query = "SELECT * FROM ${aws_athena_database.hoge.name} limit 10;"
database = "${aws_athena_database.test.name}"
query = "SELECT * FROM ${aws_athena_database.test.name} limit 10;"
description = "tf test"
}
`, rName, rInt, rName, rName)
}

func testAccAthenaNamedWorkGroupQueryConfig(rInt int, rName string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "hoge" {
resource "aws_s3_bucket" "test" {
bucket = "tf-athena-db-%s-%d"
force_destroy = true
}
Expand All @@ -139,16 +132,16 @@ resource "aws_athena_workgroup" "test" {
name = "tf-athena-workgroup-%s-%d"
}

resource "aws_athena_database" "hoge" {
resource "aws_athena_database" "test" {
name = "%s"
bucket = "${aws_s3_bucket.hoge.bucket}"
bucket = "${aws_s3_bucket.test.bucket}"
}

resource "aws_athena_named_query" "bar" {
resource "aws_athena_named_query" "test" {
name = "tf-athena-named-query-%s"
workgroup = "${aws_athena_workgroup.test.id}"
database = "${aws_athena_database.hoge.name}"
query = "SELECT * FROM ${aws_athena_database.hoge.name} limit 10;"
database = "${aws_athena_database.test.name}"
query = "SELECT * FROM ${aws_athena_database.test.name} limit 10;"
description = "tf test"
}
`, rName, rInt, rName, rInt, rName, rName)
Expand Down