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

Rewrite TypeSet checks with helpers [Part 6] #14067

Merged
merged 15 commits into from
Jul 9, 2020
Merged

Rewrite TypeSet checks with helpers [Part 6] #14067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9b8d14
Rewrite TypeSet checks with helpers
appilon Jul 3, 2020
6d1d896
rewrite typeset checks
anGie44 Jul 7, 2020
8c414e1
order imports
anGie44 Jul 7, 2020
4e71db8
Merge pull request #14081 from terraform-providers/td-remove-set-chec…
anGie44 Jul 7, 2020
31021fc
Update aws/resource_aws_wafv2_web_acl_test.go
appilon Jul 9, 2020
6603107
Update aws/resource_aws_wafv2_web_acl_test.go
appilon Jul 9, 2020
bd329da
Update aws/resource_aws_wafv2_web_acl_test.go
appilon Jul 9, 2020
26743f1
Update aws/resource_aws_instance_test.go
appilon Jul 9, 2020
2384905
Update aws/resource_aws_kms_grant_test.go
appilon Jul 9, 2020
0b8679f
Update aws/resource_aws_lb_listener_rule_test.go
appilon Jul 9, 2020
31cdc3d
Update aws/resource_aws_opsworks_application_test.go
appilon Jul 9, 2020
755aa1f
Update aws/resource_aws_network_acl_test.go
appilon Jul 9, 2020
eb1fc8e
additional typeset re-writes (#14105)
anGie44 Jul 9, 2020
67200c6
fmt
appilon Jul 9, 2020
7b33c29
rewrite typeset checks (#14076)
anGie44 Jul 9, 2020
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
2 changes: 1 addition & 1 deletion aws/resource_aws_autoscaling_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ func TestAccAWSAutoScalingGroup_initialLifecycleHook(t *testing.T) {
"default_result": "CONTINUE",
"name": "launching",
}),
// TODO: TypeSet hash
// TODO: TypeSet check rewrite check to avoid hash reference
testAccCheckAWSAutoScalingGroupInitialLifecycleHookExists(
"aws_autoscaling_group.bar", "initial_lifecycle_hook.391359060.name"),
),
Expand Down
4 changes: 3 additions & 1 deletion aws/resource_aws_autoscaling_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ func TestAccAWSAutoscalingPolicy_basic(t *testing.T) {
testAccCheckScalingPolicyExists("aws_autoscaling_policy.foobar_step", &policy),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "policy_type", "StepScaling"),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "estimated_instance_warmup", "20"),
resource.TestCheckResourceAttr("aws_autoscaling_policy.foobar_step", "step_adjustment.997979330.scaling_adjustment", "10"),
tfawsresource.TestCheckTypeSetElemNestedAttrs("aws_autoscaling_policy.foobar_step", "step_adjustment.*", map[string]string{
"scaling_adjustment": "10",
}),
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", "target_tracking_configuration.#", "1"),
Expand Down
43 changes: 24 additions & 19 deletions aws/resource_aws_cloudfront_distribution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func init() {
Expand Down Expand Up @@ -361,15 +362,17 @@ func TestAccAWSCloudFrontDistribution_noOptionalItemsConfig(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "is_ipv6_enabled", "false"),
resource.TestCheckResourceAttr(resourceName, "logging_config.#", "0"),
resource.TestCheckResourceAttr(resourceName, "origin.#", "1"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_header.#", "0"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.#", "1"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.0.http_port", "80"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.0.https_port", "443"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.0.origin_keepalive_timeout", "5"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.0.origin_protocol_policy", "http-only"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.0.origin_read_timeout", "30"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.custom_origin_config.0.origin_ssl_protocols.#", "2"),
resource.TestCheckResourceAttr(resourceName, "origin.1857972443.domain_name", "www.example.com"),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "origin.*", map[string]string{
"custom_header.#": "0",
"custom_origin_config.#": "1",
"custom_origin_config.0.http_port": "80",
"custom_origin_config.0.https_port": "443",
"custom_origin_config.0.origin_keepalive_timeout": "5",
"custom_origin_config.0.origin_protocol_policy": "http-only",
"custom_origin_config.0.origin_read_timeout": "30",
"custom_origin_config.0.origin_ssl_protocols.#": "2",
"domain_name": "www.example.com",
}),
resource.TestCheckResourceAttr(resourceName, "price_class", "PriceClass_All"),
resource.TestCheckResourceAttr(resourceName, "restrictions.#", "1"),
resource.TestCheckResourceAttr(resourceName, "restrictions.0.geo_restriction.#", "1"),
Expand Down Expand Up @@ -1088,16 +1091,18 @@ func TestAccAWSCloudFrontDistribution_OriginGroups(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckCloudFrontDistributionExists(resourceName, &distribution),
resource.TestCheckResourceAttr(resourceName, "origin_group.#", "1"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.origin_id", "groupS3"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.#", "1"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.#", "4"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.1057413486", "403"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.1883721641", "404"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.2661388106", "502"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.2895637960", "500"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.member.#", "2"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.member.0.origin_id", "primaryS3"),
resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.member.1.origin_id", "failoverS3"),
tfawsresource.TestCheckTypeSetElemNestedAttrs(resourceName, "origin_group.*", map[string]string{
"origin_id": "groupS3",
"failover_criteria.#": "1",
"failover_criteria.0.status_codes.#": "4",
"failover_criteria.0.status_codes.1057413486": "403",
"failover_criteria.0.status_codes.1883721641": "404",
"failover_criteria.0.status_codes.2661388106": "502",
"failover_criteria.0.status_codes.2895637960": "500",
"member.#": "2",
"member.0.origin_id": "primaryS3",
"member.1.origin_id": "failoverS3",
}),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_cognito_user_pool_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func TestAccAWSCognitoUserPoolClient_allFieldsUpdatingOneField(t *testing.T) {
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "callback_urls.*", "https://www.example.com/redirect"),
resource.TestCheckResourceAttr(resourceName, "default_redirect_uri", "https://www.example.com/redirect"),
resource.TestCheckResourceAttr(resourceName, "logout_urls.#", "1"),
resource.TestCheckResourceAttr(resourceName, "logout_urls.2102268273", "https://www.example.com/login"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "logout_urls.*", "https://www.example.com/login"),
resource.TestCheckResourceAttr(resourceName, "prevent_user_existence_errors", "LEGACY"),
),
},
Expand Down
13 changes: 7 additions & 6 deletions aws/resource_aws_dx_hosted_public_virtual_interface_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
)

func TestAccAwsDxHostedPublicVirtualInterface_basic(t *testing.T) {
Expand Down Expand Up @@ -55,8 +56,8 @@ func TestAccAwsDxHostedPublicVirtualInterface_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "customer_address", customerAddress),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.#", "2"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.1752038751", "210.52.109.0/24"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.4290081960", "175.45.176.0/22"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "210.52.109.0/24"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "175.45.176.0/22"),
resource.TestCheckResourceAttr(resourceName, "vlan", strconv.Itoa(vlan)),
// Accepter's attributes:
resource.TestCheckResourceAttrSet(accepterResourceName, "arn"),
Expand Down Expand Up @@ -115,8 +116,8 @@ func TestAccAwsDxHostedPublicVirtualInterface_AccepterTags(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "customer_address", customerAddress),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.#", "2"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.1752038751", "210.52.109.0/24"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.4290081960", "175.45.176.0/22"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "210.52.109.0/24"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "175.45.176.0/22"),
resource.TestCheckResourceAttr(resourceName, "vlan", strconv.Itoa(vlan)),
// Accepter's attributes:
resource.TestCheckResourceAttrSet(accepterResourceName, "arn"),
Expand All @@ -142,8 +143,8 @@ func TestAccAwsDxHostedPublicVirtualInterface_AccepterTags(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "customer_address", customerAddress),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.#", "2"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.1752038751", "210.52.109.0/24"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.4290081960", "175.45.176.0/22"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "210.52.109.0/24"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "175.45.176.0/22"),
resource.TestCheckResourceAttr(resourceName, "vlan", strconv.Itoa(vlan)),
// Accepter's attributes:
resource.TestCheckResourceAttrSet(accepterResourceName, "arn"),
Expand Down
13 changes: 7 additions & 6 deletions aws/resource_aws_dx_public_virtual_interface_test.go
View file
Open in desktop
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 TestAccAwsDxPublicVirtualInterface_basic(t *testing.T) {
Expand Down Expand Up @@ -53,8 +54,8 @@ func TestAccAwsDxPublicVirtualInterface_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "customer_address", customerAddress),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.#", "2"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.1752038751", "210.52.109.0/24"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.4290081960", "175.45.176.0/22"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "210.52.109.0/24"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "175.45.176.0/22"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
resource.TestCheckResourceAttr(resourceName, "vlan", strconv.Itoa(vlan)),
),
Expand Down Expand Up @@ -104,8 +105,8 @@ func TestAccAwsDxPublicVirtualInterface_Tags(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "customer_address", customerAddress),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.#", "2"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.1752038751", "210.52.109.0/24"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.4290081960", "175.45.176.0/22"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "210.52.109.0/24"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "175.45.176.0/22"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "3"),
resource.TestCheckResourceAttr(resourceName, "tags.Name", rName),
resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"),
Expand All @@ -128,8 +129,8 @@ func TestAccAwsDxPublicVirtualInterface_Tags(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "customer_address", customerAddress),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.#", "2"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.1752038751", "210.52.109.0/24"),
resource.TestCheckResourceAttr(resourceName, "route_filter_prefixes.4290081960", "175.45.176.0/22"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "210.52.109.0/24"),
tfawsresource.TestCheckTypeSetElemAttr(resourceName, "route_filter_prefixes.*", "175.45.176.0/22"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "3"),
resource.TestCheckResourceAttr(resourceName, "tags.Name", rName),
resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2b"),
Expand Down
Loading