-
Notifications
You must be signed in to change notification settings - Fork 9.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
resource/aws_efs_access_point: Refactor waiter to separate package (#…
…15265) Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAWSEFSAccessPoint_basic (37.59s) --- PASS: TestAccAWSEFSAccessPoint_root_directory (47.35s) --- PASS: TestAccAWSEFSAccessPoint_posix_user_secondary_gids (51.50s) --- PASS: TestAccAWSEFSAccessPoint_tags (56.90s) --- PASS: TestAccAWSEFSAccessPoint_disappears (70.55s) --- PASS: TestAccAWSEFSAccessPoint_posix_user (73.11s) --- PASS: TestAccAWSEFSAccessPoint_root_directory_creation_info (80.01s) ``` Output from acceptance testing in AWS GovCloud (US): ``` --- PASS: TestAccAWSEFSAccessPoint_basic (41.39s) --- PASS: TestAccAWSEFSAccessPoint_posix_user (45.24s) --- PASS: TestAccAWSEFSAccessPoint_root_directory_creation_info (50.31s) --- PASS: TestAccAWSEFSAccessPoint_posix_user_secondary_gids (52.55s) --- PASS: TestAccAWSEFSAccessPoint_tags (83.77s) --- PASS: TestAccAWSEFSAccessPoint_disappears (84.26s) --- PASS: TestAccAWSEFSAccessPoint_root_directory (92.01s) ```
- Loading branch information
Showing
4 changed files
with
108 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package waiter | ||
|
||
import ( | ||
"github.com/aws/aws-sdk-go/aws" | ||
"github.com/aws/aws-sdk-go/service/efs" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
) | ||
|
||
// AccessPointLifeCycleState fetches the Access Point and its LifecycleState | ||
func AccessPointLifeCycleState(conn *efs.EFS, accessPointId string) resource.StateRefreshFunc { | ||
return func() (interface{}, string, error) { | ||
input := &efs.DescribeAccessPointsInput{ | ||
AccessPointId: aws.String(accessPointId), | ||
} | ||
|
||
output, err := conn.DescribeAccessPoints(input) | ||
|
||
if err != nil { | ||
return nil, "", err | ||
} | ||
|
||
if output == nil || len(output.AccessPoints) == 0 || output.AccessPoints[0] == nil { | ||
return nil, "", nil | ||
} | ||
|
||
mt := output.AccessPoints[0] | ||
|
||
return mt, aws.StringValue(mt.LifeCycleState), nil | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package waiter | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/aws/aws-sdk-go/service/efs" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
) | ||
|
||
const ( | ||
// Maximum amount of time to wait for an Operation to return Success | ||
AccessPointCreatedTimeout = 10 * time.Minute | ||
AccessPointDeletedTimeout = 10 * time.Minute | ||
) | ||
|
||
// AccessPointCreated waits for an Operation to return Success | ||
func AccessPointCreated(conn *efs.EFS, accessPointId string) (*efs.AccessPointDescription, error) { | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{efs.LifeCycleStateCreating}, | ||
Target: []string{efs.LifeCycleStateAvailable}, | ||
Refresh: AccessPointLifeCycleState(conn, accessPointId), | ||
Timeout: AccessPointCreatedTimeout, | ||
} | ||
|
||
outputRaw, err := stateConf.WaitForState() | ||
|
||
if output, ok := outputRaw.(*efs.AccessPointDescription); ok { | ||
return output, err | ||
} | ||
|
||
return nil, err | ||
} | ||
|
||
// AccessPointDelete waits for an Access Point to return Deleted | ||
func AccessPointDeleted(conn *efs.EFS, accessPointId string) (*efs.AccessPointDescription, error) { | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{efs.LifeCycleStateAvailable, efs.LifeCycleStateDeleting, efs.LifeCycleStateDeleted}, | ||
Target: []string{}, | ||
Refresh: AccessPointLifeCycleState(conn, accessPointId), | ||
Timeout: AccessPointDeletedTimeout, | ||
} | ||
|
||
outputRaw, err := stateConf.WaitForState() | ||
|
||
if output, ok := outputRaw.(*efs.AccessPointDescription); ok { | ||
return output, err | ||
} | ||
|
||
return nil, err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters