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

Acceptance test import refactor for redshift resources #9984

Merged
merged 2 commits into from
Sep 24, 2019
Merged

Acceptance test import refactor for redshift resources #9984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce2454d
Acceptance test import refactor for redshift resources
ryndaniels Sep 4, 2019
50b603a
Fix aws region for teamcity
ryndaniels Sep 6, 2019
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
65 changes: 42 additions & 23 deletions aws/resource_aws_redshift_parameter_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (
"github.com/hashicorp/terraform/terraform"
)

func TestAccAWSRedshiftParameterGroup_importBasic(t *testing.T) {
resourceName := "aws_redshift_parameter_group.bar"
func TestAccAWSRedshiftParameterGroup_basic(t *testing.T) {
var v redshift.ClusterParameterGroup
resourceName := "aws_redshift_parameter_group.test"
rInt := acctest.RandInt()

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -23,8 +24,10 @@ func TestAccAWSRedshiftParameterGroup_importBasic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccAWSRedshiftParameterGroupConfig(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRedshiftParameterGroupExists(resourceName, &v),
),
},

{
ResourceName: resourceName,
ImportState: true,
Expand All @@ -37,6 +40,7 @@ func TestAccAWSRedshiftParameterGroup_importBasic(t *testing.T) {
func TestAccAWSRedshiftParameterGroup_withParameters(t *testing.T) {
var v redshift.ClusterParameterGroup
rInt := acctest.RandInt()
resourceName := "aws_redshift_parameter_group.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -46,34 +50,40 @@ func TestAccAWSRedshiftParameterGroup_withParameters(t *testing.T) {
{
Config: testAccAWSRedshiftParameterGroupConfig(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRedshiftParameterGroupExists("aws_redshift_parameter_group.bar", &v),
testAccCheckAWSRedshiftParameterGroupExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "name", fmt.Sprintf("test-terraform-%d", rInt)),
resourceName, "name", fmt.Sprintf("test-terraform-%d", rInt)),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "family", "redshift-1.0"),
resourceName, "family", "redshift-1.0"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "description", "Managed by Terraform"),
resourceName, "description", "Managed by Terraform"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "parameter.490804664.name", "require_ssl"),
resourceName, "parameter.490804664.name", "require_ssl"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "parameter.490804664.value", "true"),
resourceName, "parameter.490804664.value", "true"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "parameter.2036118857.name", "query_group"),
resourceName, "parameter.2036118857.name", "query_group"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "parameter.2036118857.value", "example"),
resourceName, "parameter.2036118857.value", "example"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "parameter.484080973.name", "enable_user_activity_logging"),
resourceName, "parameter.484080973.name", "enable_user_activity_logging"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "parameter.484080973.value", "true"),
resourceName, "parameter.484080973.value", "true"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSRedshiftParameterGroup_withoutParameters(t *testing.T) {
var v redshift.ClusterParameterGroup
rInt := acctest.RandInt()
resourceName := "aws_redshift_parameter_group.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -83,24 +93,28 @@ func TestAccAWSRedshiftParameterGroup_withoutParameters(t *testing.T) {
{
Config: testAccAWSRedshiftParameterGroupOnlyConfig(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRedshiftParameterGroupExists("aws_redshift_parameter_group.bar", &v),
testAccCheckAWSRedshiftParameterGroupExists(resourceName, &v),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "name", fmt.Sprintf("test-terraform-%d", rInt)),
resourceName, "name", fmt.Sprintf("test-terraform-%d", rInt)),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "family", "redshift-1.0"),
resourceName, "family", "redshift-1.0"),
resource.TestCheckResourceAttr(
"aws_redshift_parameter_group.bar", "description", "Test parameter group for terraform"),
resourceName, "description", "Test parameter group for terraform"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAWSRedshiftParameterGroup_withTags(t *testing.T) {
var v redshift.ClusterParameterGroup

rInt := acctest.RandInt()
resourceName := "aws_redshift_parameter_group.default"
resourceName := "aws_redshift_parameter_group.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -118,6 +132,11 @@ func TestAccAWSRedshiftParameterGroup_withTags(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "tags.description", fmt.Sprintf("Test parameter group for terraform %s", "aaa")),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAWSRedshiftParameterGroupConfigWithTags(rInt, "bbb"),
Check: resource.ComposeTestCheckFunc(
Expand Down Expand Up @@ -250,7 +269,7 @@ func testAccCheckAWSRedshiftParameterGroupExists(n string, v *redshift.ClusterPa

func testAccAWSRedshiftParameterGroupOnlyConfig(rInt int) string {
return fmt.Sprintf(`
resource "aws_redshift_parameter_group" "bar" {
resource "aws_redshift_parameter_group" "test" {
name = "test-terraform-%d"
family = "redshift-1.0"
description = "Test parameter group for terraform"
Expand All @@ -260,7 +279,7 @@ resource "aws_redshift_parameter_group" "bar" {

func testAccAWSRedshiftParameterGroupConfig(rInt int) string {
return fmt.Sprintf(`
resource "aws_redshift_parameter_group" "bar" {
resource "aws_redshift_parameter_group" "test" {
name = "test-terraform-%d"
family = "redshift-1.0"

Expand All @@ -284,7 +303,7 @@ resource "aws_redshift_parameter_group" "bar" {

func testAccAWSRedshiftParameterGroupConfigWithTags(rInt int, rString string) string {
return fmt.Sprintf(`
resource "aws_redshift_parameter_group" "default" {
resource "aws_redshift_parameter_group" "test" {
name = "test-terraform-%[1]d"
family = "redshift-1.0"
description = "Test parameter group for terraform"
Expand All @@ -300,7 +319,7 @@ resource "aws_redshift_parameter_group" "default" {

func testAccAWSRedshiftParameterGroupConfigWithTagsUpdate(rInt int) string {
return fmt.Sprintf(`
resource "aws_redshift_parameter_group" "default" {
resource "aws_redshift_parameter_group" "test" {
name = "test-terraform-%[1]d"
family = "redshift-1.0"
description = "Test parameter group for terraform"
Expand Down
Loading