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

tests/transfer: Add ErrorCheck #18291

Merged
merged 4 commits into from
Mar 19, 2021
+23 −6
Merged

tests/transfer: Add ErrorCheck #18291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0e36f6
tests/r/transfer_ssh_key: Add ErrorCheck
YakDriver Mar 19, 2021
c6904d2
tests/r/transfer_user: Add ErrorCheck
YakDriver Mar 19, 2021
ba708be
tests/ds/transfer_server: Add ErrorCheck
YakDriver Mar 19, 2021
01c35a1
tests/r/transfer_server: Add ErrorCheck
YakDriver Mar 19, 2021
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
16 changes: 10 additions & 6 deletions aws/data_source_aws_transfer_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"testing"

"github.com/aws/aws-sdk-go/service/transfer"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)
Expand All @@ -13,8 +14,9 @@ func TestAccDataSourceAwsTransferServer_basic(t *testing.T) {
datasourceName := "data.aws_transfer_server.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccDataSourceAwsTransferServerConfig_basic,
Expand All @@ -35,8 +37,9 @@ func TestAccDataSourceAwsTransferServer_service_managed(t *testing.T) {
datasourceName := "data.aws_transfer_server.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccDataSourceAwsTransferServerConfig_service_managed(rName),
Expand All @@ -57,8 +60,9 @@ func TestAccDataSourceAwsTransferServer_apigateway(t *testing.T) {
datasourceName := "data.aws_transfer_server.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t); testAccAPIGatewayTypeEDGEPreCheck(t) },
Providers: testAccProviders,
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t); testAccAPIGatewayTypeEDGEPreCheck(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccDataSourceAwsTransferServerConfig_apigateway(rName),
Expand Down
7 changes: 7 additions & 0 deletions aws/resource_aws_transfer_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ func TestAccAWSTransferServer_basic(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Expand Down Expand Up @@ -117,6 +118,7 @@ func TestAccAWSTransferServer_Vpc(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Expand Down Expand Up @@ -160,6 +162,7 @@ func TestAccAWSTransferServer_apigateway(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccAPIGatewayTypeEDGEPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Expand Down Expand Up @@ -189,6 +192,7 @@ func TestAccAWSTransferServer_disappears(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Steps: []resource.TestStep{
Expand All @@ -212,6 +216,7 @@ func TestAccAWSTransferServer_forcedestroy(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Expand Down Expand Up @@ -245,6 +250,7 @@ func TestAccAWSTransferServer_vpcEndpointId(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Expand Down Expand Up @@ -274,6 +280,7 @@ func TestAccAWSTransferServer_hostKey(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferServerDestroy,
Expand Down
1 change: 1 addition & 0 deletions aws/resource_aws_transfer_ssh_key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ func TestAccAWSTransferSshKey_basic(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferSshKeyDestroy,
Steps: []resource.TestStep{
Expand Down
5 changes: 5 additions & 0 deletions aws/resource_aws_transfer_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ func TestAccAWSTransferUser_basic(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferUserDestroy,
Expand Down Expand Up @@ -51,6 +52,7 @@ func TestAccAWSTransferUser_modifyWithOptions(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferUserDestroy,
Expand Down Expand Up @@ -110,6 +112,7 @@ func TestAccAWSTransferUser_disappears(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferUserDestroy,
Steps: []resource.TestStep{
Expand All @@ -129,6 +132,7 @@ func TestAccAWSTransferUser_disappears(t *testing.T) {
func TestAccAWSTransferUser_UserName_Validation(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferUserDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -169,6 +173,7 @@ func TestAccAWSTransferUser_homeDirectoryMappings(t *testing.T) {

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSTransfer(t) },
ErrorCheck: testAccErrorCheck(t, transfer.EndpointsID),
IDRefreshName: resourceName,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSTransferUserDestroy,
Expand Down