r/efs_file_system - add attributes + refactor to use waiter package

.changelog/17969.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_efs_file_system: Add `number_of_mount_targets`, `size_in_bytes` and `owner_id` attributes
+```

aws/internal/service/efs/waiter/status.go

@@ -28,3 +28,26 @@ func AccessPointLifeCycleState(conn *efs.EFS, accessPointId string) resource.Sta
 		return mt, aws.StringValue(mt.LifeCycleState), nil
 	}
 }
+
+// FileSystemLifeCycleState fetches the Access Point and its LifecycleState
+func FileSystemLifeCycleState(conn *efs.EFS, fileSystemID string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		input := &efs.DescribeFileSystemsInput{
+			FileSystemId: aws.String(fileSystemID),
+		}
+
+		output, err := conn.DescribeFileSystems(input)
+
+		if err != nil {
+			return nil, "", err
+		}
+
+		if output == nil || len(output.FileSystems) == 0 || output.FileSystems[0] == nil {
+			return nil, "", nil
+		}
+
+		mt := output.FileSystems[0]
+
+		return mt, aws.StringValue(mt.LifeCycleState), nil
+	}
+}

aws/internal/service/efs/waiter/waiter.go

@@ -9,8 +9,14 @@ import (
 
 const (
 	// Maximum amount of time to wait for an Operation to return Success
-	AccessPointCreatedTimeout = 10 * time.Minute
-	AccessPointDeletedTimeout = 10 * time.Minute
+	AccessPointCreatedTimeout       = 10 * time.Minute
+	AccessPointDeletedTimeout       = 10 * time.Minute
+	FileSystemAvailableTimeout      = 10 * time.Minute
+	FileSystemAvailableDelayTimeout = 2 * time.Second
+	FileSystemAvailableMinTimeout   = 3 * time.Second
+	FileSystemDeletedTimeout        = 10 * time.Minute
+	FileSystemDeletedDelayTimeout   = 2 * time.Second
+	FileSystemDeletedMinTimeout     = 3 * time.Second
 )
 
 // AccessPointCreated waits for an Operation to return Success
@@ -48,3 +54,43 @@ func AccessPointDeleted(conn *efs.EFS, accessPointId string) (*efs.AccessPointDe
 
 	return nil, err
 }
+
+// FileSystemAvailable waits for an Operation to return Available
+func FileSystemAvailable(conn *efs.EFS, fileSystemID string) (*efs.FileSystemDescription, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending:    []string{efs.LifeCycleStateCreating, efs.LifeCycleStateUpdating},
+		Target:     []string{efs.LifeCycleStateAvailable},
+		Refresh:    FileSystemLifeCycleState(conn, fileSystemID),
+		Timeout:    FileSystemAvailableTimeout,
+		Delay:      FileSystemAvailableDelayTimeout,
+		MinTimeout: FileSystemAvailableMinTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*efs.FileSystemDescription); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
+// FileSystemDeleted waits for an Operation to return Deleted
+func FileSystemDeleted(conn *efs.EFS, fileSystemID string) (*efs.FileSystemDescription, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending:    []string{efs.LifeCycleStateAvailable, efs.LifeCycleStateDeleting},
+		Target:     []string{},
+		Refresh:    FileSystemLifeCycleState(conn, fileSystemID),
+		Timeout:    FileSystemDeletedTimeout,
+		Delay:      FileSystemDeletedDelayTimeout,
+		MinTimeout: FileSystemDeletedMinTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*efs.FileSystemDescription); ok {
+		return output, err
+	}
+
+	return nil, err
+}