Skip to content

Commit

Permalink
Rewrite TypeSet checks with new helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
@appilon
appilon committed Jun 25, 2020
1 parent eb01e43 commit a5c288f
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 114 deletions.
26 changes: 16 additions & 10 deletions aws/resource_aws_appmesh_virtual_node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func init() {
Expand Down Expand Up @@ -176,10 +177,9 @@ func testAccAwsAppmeshVirtualNode_listenerHealthChecks(t *testing.T) {
vnName := acctest.RandomWithPrefix("tf-acc-test")

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAppmeshVirtualNodeDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAppmeshVirtualNodeDestroy,
Steps: []resource.TestStep{
{
Config: testAccAppmeshVirtualNodeConfig_listenerHealthChecks(meshName, vnName),
Expand All @@ -189,8 +189,10 @@ func testAccAwsAppmeshVirtualNode_listenerHealthChecks(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName),
resource.TestCheckResourceAttr(resourceName, "spec.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.2622272660.virtual_service.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.2622272660.virtual_service.0.virtual_service_name", "servicea.simpleapp.local"),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{
"virtual_service.#": "1",
"virtual_service.0.virtual_service_name": "servicea.simpleapp.local",
}),
resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.health_check.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.health_check.0.healthy_threshold", "3"),
Expand Down Expand Up @@ -220,10 +222,14 @@ func testAccAwsAppmeshVirtualNode_listenerHealthChecks(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName),
resource.TestCheckResourceAttr(resourceName, "spec.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "2"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.2576932631.virtual_service.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.2576932631.virtual_service.0.virtual_service_name", "servicec.simpleapp.local"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.2025248115.virtual_service.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.backend.2025248115.virtual_service.0.virtual_service_name", "serviced.simpleapp.local"),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{
"virtual_service.#": "1",
"virtual_service.0.virtual_service_name": "servicec.simpleapp.local",
}),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{
"virtual_service.#": "1",
"virtual_service.0.virtual_service_name": "serviced.simpleapp.local",
}),
resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.health_check.#", "1"),
resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.health_check.0.healthy_threshold", "4"),
Expand Down
46 changes: 21 additions & 25 deletions aws/resource_aws_autoscaling_group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func init() {
Expand Down Expand Up @@ -86,10 +87,9 @@ func TestAccAWSAutoScalingGroup_basic(t *testing.T) {
randName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10))

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSAutoScalingGroupConfig(randName),
Expand All @@ -98,7 +98,7 @@ func TestAccAWSAutoScalingGroup_basic(t *testing.T) {
testAccCheckAWSAutoScalingGroupHealthyCapacity(&group, 2),
testAccCheckAWSAutoScalingGroupAttributes(&group, randName),
testAccMatchResourceAttrRegionalARN("aws_autoscaling_group.bar", "arn", "autoscaling", regexp.MustCompile(`autoScalingGroup:.+`)),
resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "availability_zones.2487133097", "us-west-2a"),
tfawsresource.TestCheckTypeSetElemAttr("aws_autoscaling_group.bar", "availability_zones.*", "us-west-2a"),
resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "default_cooldown", "300"),
resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "desired_capacity", "4"),
resource.TestCheckResourceAttr("aws_autoscaling_group.bar", "enabled_metrics.#", "0"),
Expand Down Expand Up @@ -381,19 +381,17 @@ func TestAccAWSAutoScalingGroup_VpcUpdates(t *testing.T) {
var group autoscaling.Group

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSAutoScalingGroupConfigWithAZ,
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSAutoScalingGroupExists("aws_autoscaling_group.bar", &group),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "availability_zones.#", "1"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "availability_zones.2487133097", "us-west-2a"),
tfawsresource.TestCheckTypeSetElemAttr("aws_autoscaling_group.bar", "availability_zones.*", "us-west-2a"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "vpc_zone_identifier.#", "0"),
),
Expand All @@ -419,8 +417,7 @@ func TestAccAWSAutoScalingGroup_VpcUpdates(t *testing.T) {
testAccCheckAWSAutoScalingGroupAttributesVPCZoneIdentifier(&group),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "availability_zones.#", "1"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "availability_zones.2487133097", "us-west-2a"),
tfawsresource.TestCheckTypeSetElemAttr("aws_autoscaling_group.bar", "availability_zones.*", "us-west-2a"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "vpc_zone_identifier.#", "1"),
),
Expand Down Expand Up @@ -995,10 +992,9 @@ func TestAccAWSAutoScalingGroup_initialLifecycleHook(t *testing.T) {
randName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10))

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSAutoScalingGroupWithHookConfig(randName),
Expand All @@ -1007,10 +1003,11 @@ func TestAccAWSAutoScalingGroup_initialLifecycleHook(t *testing.T) {
testAccCheckAWSAutoScalingGroupHealthyCapacity(&group, 2),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "initial_lifecycle_hook.#", "1"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "initial_lifecycle_hook.391359060.default_result", "CONTINUE"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "initial_lifecycle_hook.391359060.name", "launching"),
tfawsresource.TestCheckTypeSetElemNestedAttrs("aws_autoscaling_group.bar", "initial_lifecycle_hook.*", map[string]string{
"default_result": "CONTINUE",
"name": "launching",
}),
// TODO: TypeSet hash
testAccCheckAWSAutoScalingGroupInitialLifecycleHookExists(
"aws_autoscaling_group.bar", "initial_lifecycle_hook.391359060.name"),
),
Expand Down Expand Up @@ -2136,10 +2133,9 @@ func TestAccAWSAutoScalingGroup_launchTempPartitionNum(t *testing.T) {
randName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10))

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoScalingGroupDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSAutoScalingGroupPartitionConfig(randName),
Expand Down
12 changes: 7 additions & 5 deletions aws/resource_aws_autoscaling_policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func TestAccAWSAutoscalingPolicy_basic(t *testing.T) {
Expand All @@ -19,10 +20,9 @@ func TestAccAWSAutoscalingPolicy_basic(t *testing.T) {
name := fmt.Sprintf("terraform-testacc-asp-%s", acctest.RandString(5))

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoscalingPolicyDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSAutoscalingPolicyDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSAutoscalingPolicyConfig_basic(name),
Expand All @@ -41,7 +41,9 @@ func TestAccAWSAutoscalingPolicy_basic(t *testing.T) {
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "metric_aggregation_type", "Minimum"),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "estimated_instance_warmup", "200"),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "autoscaling_group_name", name),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "step_adjustment.2042107634.scaling_adjustment", "1"),
tfawsresource.TestCheckTypeSetElemNestedAttrs("aws_autoscaling_policy.foobar_step", "step_adjustment.*", map[string]string{
"scaling_adjustment": "1",
}),
testAccCheckScalingPolicyExists("aws_autoscaling_policy.foobar_target_tracking", &policy),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_target_tracking", "policy_type", "TargetTrackingScaling"),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_target_tracking", "name", name+"-foobar_target_tracking"),
Expand Down
12 changes: 6 additions & 6 deletions aws/resource_aws_cloudformation_stack_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func init() {
Expand Down Expand Up @@ -179,18 +180,17 @@ func TestAccAWSCloudFormationStack_allAttributes(t *testing.T) {
expectedPolicyBody := "{\"Statement\":[{\"Action\":\"Update:*\",\"Effect\":\"Deny\",\"Principal\":\"*\",\"Resource\":\"LogicalResourceId/StaticVPC\"},{\"Action\":\"Update:*\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"*\"}]}"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSCloudFormationDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSCloudFormationDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSCloudFormationStackConfig_allAttributesWithBodies(stackName),
Check: resource.ComposeTestCheckFunc(
testAccCheckCloudFormationStackExists(resourceName, &stack),
resource.TestCheckResourceAttr(resourceName, "name", stackName),
resource.TestCheckResourceAttr(resourceName, "capabilities.#", "1"),
resource.TestCheckResourceAttr(resourceName, "capabilities.1328347040", "CAPABILITY_IAM"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "capabilities.*", "CAPABILITY_IAM"),
resource.TestCheckResourceAttr(resourceName, "disable_rollback", "false"),
resource.TestCheckResourceAttr(resourceName, "notification_arns.#", "1"),
resource.TestCheckResourceAttr(resourceName, "parameters.%", "1"),
Expand All @@ -214,7 +214,7 @@ func TestAccAWSCloudFormationStack_allAttributes(t *testing.T) {
testAccCheckCloudFormationStackExists(resourceName, &stack),
resource.TestCheckResourceAttr(resourceName, "name", stackName),
resource.TestCheckResourceAttr(resourceName, "capabilities.#", "1"),
resource.TestCheckResourceAttr(resourceName, "capabilities.1328347040", "CAPABILITY_IAM"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "capabilities.*", "CAPABILITY_IAM"),
resource.TestCheckResourceAttr(resourceName, "disable_rollback", "false"),
resource.TestCheckResourceAttr(resourceName, "notification_arns.#", "1"),
resource.TestCheckResourceAttr(resourceName, "parameters.%", "1"),
Expand Down
32 changes: 19 additions & 13 deletions aws/resource_aws_cognito_identity_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func TestAccAWSCognitoIdentityPool_basic(t *testing.T) {
Expand Down Expand Up @@ -179,22 +180,25 @@ func TestAccAWSCognitoIdentityPool_cognitoIdentityProviders(t *testing.T) {
resourceName := "aws_cognito_identity_pool.main"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentity(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSCognitoIdentityPoolDestroy,
DisableBinaryDriver: true,
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSCognitoIdentity(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSCognitoIdentityPoolDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSCognitoIdentityPoolConfig_cognitoIdentityProviders(name),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAWSCognitoIdentityPoolExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "identity_pool_name", fmt.Sprintf("identity pool %s", name)),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.66456389.client_id", "7lhlkkfbfb4q5kpp90urffao"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.66456389.provider_name", "cognito-idp.us-east-1.amazonaws.com/us-east-1_Zr231apJu"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.66456389.server_side_token_check", "false"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.3571192419.client_id", "7lhlkkfbfb4q5kpp90urffao"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.3571192419.provider_name", "cognito-idp.us-east-1.amazonaws.com/us-east-1_Ab129faBb"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.3571192419.server_side_token_check", "false"),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "cognito_identity_providers.*", map[string]string{
"client_id": "7lhlkkfbfb4q5kpp90urffao",
"provider_name": "cognito-idp.us-east-1.amazonaws.com/us-east-1_Zr231apJu",
"server_side_token_check": "false",
}),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "cognito_identity_providers.*", map[string]string{
"client_id": "7lhlkkfbfb4q5kpp90urffao",
"provider_name": "cognito-idp.us-east-1.amazonaws.com/us-east-1_Ab129faBb",
"server_side_token_check": "false",
}),
),
},
{
Expand All @@ -207,9 +211,11 @@ func TestAccAWSCognitoIdentityPool_cognitoIdentityProviders(t *testing.T) {
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckAWSCognitoIdentityPoolExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "identity_pool_name", fmt.Sprintf("identity pool %s", name)),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.3661724441.client_id", "6lhlkkfbfb4q5kpp90urffae"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.3661724441.provider_name", "cognito-idp.us-east-1.amazonaws.com/us-east-1_Zr231apJu"),
resource.TestCheckResourceAttr(resourceName, "cognito_identity_providers.3661724441.server_side_token_check", "false"),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "cognito_identity_providers.*", map[string]string{
"client_id": "6lhlkkfbfb4q5kpp90urffae",
"provider_name": "cognito-idp.us-east-1.amazonaws.com/us-east-1_Zr231apJu",
"server_side_token_check": "false",
}),
),
},
{
Expand Down
Loading

0 comments on commit a5c288f

Please sign in to comment.