Skip to content

Commit

Permalink
tests/provider: Use SDK v2 compliant ExpectError conditions (#14434)
Browse files Browse the repository at this point in the history
The `config is invalid:` prefix is no longer present in Terraform Plugin SDK v2. e.g.

```
TestAccAWSAcmCertificate_root_TrailingPeriod: resource_aws_acm_certificate_test.go:258: Expected an error with pattern, no match on: terraform failed: exit status 1
stderr:
Error: invalid value for domain_name (cannot end with a period)
on config733606703/terraform_plugin_test.tf line 3, in resource "aws_acm_certificate" "cert":
3:   domain_name       = "--OMITTED--"
--- FAIL: TestAccAWSAcmCertificate_root_TrailingPeriod (4.02s)
```

Output from acceptance testing (V1):

```
--- PASS: TestAccAWSAcmCertificate_root_TrailingPeriod (0.85s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Empty (0.85s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Empty (0.94s)
--- PASS: TestAccAWSSESDomainIdentity_trailingPeriod (1.17s)
```
  • Loading branch information
bflad committed Jul 31, 2020
1 parent db21712 commit 53b02f2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion aws/resource_aws_acm_certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func TestAccAWSAcmCertificate_root_TrailingPeriod(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccAcmCertificateConfig(domain, acm.ValidationMethodDns),
ExpectError: regexp.MustCompile(`config is invalid: invalid value for domain_name \(cannot end with a period\)`),
ExpectError: regexp.MustCompile(`invalid value for domain_name \(cannot end with a period\)`),
},
},
})
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_aws_s3_bucket_analytics_configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Empty(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccAWSS3BucketAnalyticsConfigurationWithEmptyFilter(rName, rName),
ExpectError: regexp.MustCompile(`config is invalid:`),
ExpectError: regexp.MustCompile(`one of .* must be specified`),
},
},
})
Expand Down Expand Up @@ -365,7 +365,7 @@ func TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Empty(t *
Steps: []resource.TestStep{
{
Config: testAccAWSS3BucketAnalyticsConfigurationWithEmptyStorageClassAnalysis(rName, rName),
ExpectError: regexp.MustCompile(`config is invalid:`),
ExpectError: regexp.MustCompile(`required field is not set`),
},
},
})
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_s3_bucket_metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func TestAccAWSS3BucketMetric_WithEmptyFilter(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSS3BucketMetricsConfigExists(resourceName, &conf),
),
ExpectError: regexp.MustCompile(`config is invalid`),
ExpectError: regexp.MustCompile(`one of .* must be specified`),
},
},
})
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_ses_domain_identity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestAccAWSSESDomainIdentity_trailingPeriod(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccAwsSESDomainIdentityConfig(domain),
ExpectError: regexp.MustCompile(`config is invalid: invalid value for domain \(cannot end with a period\)`),
ExpectError: regexp.MustCompile(`invalid value for domain \(cannot end with a period\)`),
},
},
})
Expand Down

0 comments on commit 53b02f2

Please sign in to comment.