aws-sdk-fsx 1.16.0 → 1.21.1

data/lib/aws-sdk-fsx/client_api.rb

@@ -16,6 +16,10 @@ module Aws::FSx
     ActiveDirectoryError = Shapes::StructureShape.new(name: 'ActiveDirectoryError')
     ActiveDirectoryErrorType = Shapes::StringShape.new(name: 'ActiveDirectoryErrorType')
     ActiveDirectoryFullyQualifiedName = Shapes::StringShape.new(name: 'ActiveDirectoryFullyQualifiedName')
+    AdministrativeAction = Shapes::StructureShape.new(name: 'AdministrativeAction')
+    AdministrativeActionFailureDetails = Shapes::StructureShape.new(name: 'AdministrativeActionFailureDetails')
+    AdministrativeActionType = Shapes::StringShape.new(name: 'AdministrativeActionType')
+    AdministrativeActions = Shapes::ListShape.new(name: 'AdministrativeActions')
     ArchivePath = Shapes::StringShape.new(name: 'ArchivePath')
     AutomaticBackupRetentionDays = Shapes::IntegerShape.new(name: 'AutomaticBackupRetentionDays')
     Backup = Shapes::StructureShape.new(name: 'Backup')
@@ -127,6 +131,7 @@ module Aws::FSx
     ProgressPercent = Shapes::IntegerShape.new(name: 'ProgressPercent')
     ReportFormat = Shapes::StringShape.new(name: 'ReportFormat')
     ReportScope = Shapes::StringShape.new(name: 'ReportScope')
+    RequestTime = Shapes::TimestampShape.new(name: 'RequestTime')
     ResourceARN = Shapes::StringShape.new(name: 'ResourceARN')
     ResourceDoesNotSupportTagging = Shapes::StructureShape.new(name: 'ResourceDoesNotSupportTagging')
     ResourceNotFound = Shapes::StructureShape.new(name: 'ResourceNotFound')
@@ -138,7 +143,9 @@ module Aws::FSx
     ServiceLimit = Shapes::StringShape.new(name: 'ServiceLimit')
     ServiceLimitExceeded = Shapes::StructureShape.new(name: 'ServiceLimitExceeded')
     StartTime = Shapes::TimestampShape.new(name: 'StartTime')
+    Status = Shapes::StringShape.new(name: 'Status')
     StorageCapacity = Shapes::IntegerShape.new(name: 'StorageCapacity')
+    StorageType = Shapes::StringShape.new(name: 'StorageType')
     SubnetId = Shapes::StringShape.new(name: 'SubnetId')
     SubnetIds = Shapes::ListShape.new(name: 'SubnetIds')
     SucceededCount = Shapes::IntegerShape.new(name: 'SucceededCount')
@@ -173,6 +180,19 @@ module Aws::FSx
     ActiveDirectoryError.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
     ActiveDirectoryError.struct_class = Types::ActiveDirectoryError
 
+    AdministrativeAction.add_member(:administrative_action_type, Shapes::ShapeRef.new(shape: AdministrativeActionType, location_name: "AdministrativeActionType"))
+    AdministrativeAction.add_member(:progress_percent, Shapes::ShapeRef.new(shape: ProgressPercent, location_name: "ProgressPercent"))
+    AdministrativeAction.add_member(:request_time, Shapes::ShapeRef.new(shape: RequestTime, location_name: "RequestTime"))
+    AdministrativeAction.add_member(:status, Shapes::ShapeRef.new(shape: Status, location_name: "Status"))
+    AdministrativeAction.add_member(:target_file_system_values, Shapes::ShapeRef.new(shape: FileSystem, location_name: "TargetFileSystemValues"))
+    AdministrativeAction.add_member(:failure_details, Shapes::ShapeRef.new(shape: AdministrativeActionFailureDetails, location_name: "FailureDetails"))
+    AdministrativeAction.struct_class = Types::AdministrativeAction
+
+    AdministrativeActionFailureDetails.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
+    AdministrativeActionFailureDetails.struct_class = Types::AdministrativeActionFailureDetails
+
+    AdministrativeActions.member = Shapes::ShapeRef.new(shape: AdministrativeAction)
+
     Backup.add_member(:backup_id, Shapes::ShapeRef.new(shape: BackupId, required: true, location_name: "BackupId"))
     Backup.add_member(:lifecycle, Shapes::ShapeRef.new(shape: BackupLifecycle, required: true, location_name: "Lifecycle"))
     Backup.add_member(:failure_details, Shapes::ShapeRef.new(shape: BackupFailureDetails, location_name: "FailureDetails"))
@@ -244,6 +264,7 @@ module Aws::FSx
     CreateFileSystemFromBackupRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIds, location_name: "SecurityGroupIds"))
     CreateFileSystemFromBackupRequest.add_member(:tags, Shapes::ShapeRef.new(shape: Tags, location_name: "Tags"))
     CreateFileSystemFromBackupRequest.add_member(:windows_configuration, Shapes::ShapeRef.new(shape: CreateFileSystemWindowsConfiguration, location_name: "WindowsConfiguration"))
+    CreateFileSystemFromBackupRequest.add_member(:storage_type, Shapes::ShapeRef.new(shape: StorageType, location_name: "StorageType"))
     CreateFileSystemFromBackupRequest.struct_class = Types::CreateFileSystemFromBackupRequest
 
     CreateFileSystemFromBackupResponse.add_member(:file_system, Shapes::ShapeRef.new(shape: FileSystem, location_name: "FileSystem"))
@@ -260,6 +281,7 @@ module Aws::FSx
     CreateFileSystemRequest.add_member(:client_request_token, Shapes::ShapeRef.new(shape: ClientRequestToken, location_name: "ClientRequestToken", metadata: {"idempotencyToken"=>true}))
     CreateFileSystemRequest.add_member(:file_system_type, Shapes::ShapeRef.new(shape: FileSystemType, required: true, location_name: "FileSystemType"))
     CreateFileSystemRequest.add_member(:storage_capacity, Shapes::ShapeRef.new(shape: StorageCapacity, required: true, location_name: "StorageCapacity"))
+    CreateFileSystemRequest.add_member(:storage_type, Shapes::ShapeRef.new(shape: StorageType, location_name: "StorageType"))
     CreateFileSystemRequest.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIds, required: true, location_name: "SubnetIds"))
     CreateFileSystemRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIds, location_name: "SecurityGroupIds"))
     CreateFileSystemRequest.add_member(:tags, Shapes::ShapeRef.new(shape: Tags, location_name: "Tags"))
@@ -396,6 +418,7 @@ module Aws::FSx
     FileSystem.add_member(:lifecycle, Shapes::ShapeRef.new(shape: FileSystemLifecycle, location_name: "Lifecycle"))
     FileSystem.add_member(:failure_details, Shapes::ShapeRef.new(shape: FileSystemFailureDetails, location_name: "FailureDetails"))
     FileSystem.add_member(:storage_capacity, Shapes::ShapeRef.new(shape: StorageCapacity, location_name: "StorageCapacity"))
+    FileSystem.add_member(:storage_type, Shapes::ShapeRef.new(shape: StorageType, location_name: "StorageType"))
     FileSystem.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "VpcId"))
     FileSystem.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIds, location_name: "SubnetIds"))
     FileSystem.add_member(:network_interface_ids, Shapes::ShapeRef.new(shape: NetworkInterfaceIds, location_name: "NetworkInterfaceIds"))
@@ -405,6 +428,7 @@ module Aws::FSx
     FileSystem.add_member(:tags, Shapes::ShapeRef.new(shape: Tags, location_name: "Tags"))
     FileSystem.add_member(:windows_configuration, Shapes::ShapeRef.new(shape: WindowsFileSystemConfiguration, location_name: "WindowsConfiguration"))
     FileSystem.add_member(:lustre_configuration, Shapes::ShapeRef.new(shape: LustreFileSystemConfiguration, location_name: "LustreConfiguration"))
+    FileSystem.add_member(:administrative_actions, Shapes::ShapeRef.new(shape: AdministrativeActions, location_name: "AdministrativeActions"))
     FileSystem.struct_class = Types::FileSystem
 
     FileSystemFailureDetails.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
@@ -539,6 +563,7 @@ module Aws::FSx
 
     UpdateFileSystemRequest.add_member(:file_system_id, Shapes::ShapeRef.new(shape: FileSystemId, required: true, location_name: "FileSystemId"))
     UpdateFileSystemRequest.add_member(:client_request_token, Shapes::ShapeRef.new(shape: ClientRequestToken, location_name: "ClientRequestToken", metadata: {"idempotencyToken"=>true}))
+    UpdateFileSystemRequest.add_member(:storage_capacity, Shapes::ShapeRef.new(shape: StorageCapacity, location_name: "StorageCapacity"))
     UpdateFileSystemRequest.add_member(:windows_configuration, Shapes::ShapeRef.new(shape: UpdateFileSystemWindowsConfiguration, location_name: "WindowsConfiguration"))
     UpdateFileSystemRequest.add_member(:lustre_configuration, Shapes::ShapeRef.new(shape: UpdateFileSystemLustreConfiguration, location_name: "LustreConfiguration"))
     UpdateFileSystemRequest.struct_class = Types::UpdateFileSystemRequest
@@ -549,6 +574,7 @@ module Aws::FSx
     UpdateFileSystemWindowsConfiguration.add_member(:weekly_maintenance_start_time, Shapes::ShapeRef.new(shape: WeeklyTime, location_name: "WeeklyMaintenanceStartTime"))
     UpdateFileSystemWindowsConfiguration.add_member(:daily_automatic_backup_start_time, Shapes::ShapeRef.new(shape: DailyTime, location_name: "DailyAutomaticBackupStartTime"))
     UpdateFileSystemWindowsConfiguration.add_member(:automatic_backup_retention_days, Shapes::ShapeRef.new(shape: AutomaticBackupRetentionDays, location_name: "AutomaticBackupRetentionDays"))
+    UpdateFileSystemWindowsConfiguration.add_member(:throughput_capacity, Shapes::ShapeRef.new(shape: MegabytesPerSecond, location_name: "ThroughputCapacity"))
     UpdateFileSystemWindowsConfiguration.add_member(:self_managed_active_directory_configuration, Shapes::ShapeRef.new(shape: SelfManagedActiveDirectoryConfigurationUpdates, location_name: "SelfManagedActiveDirectoryConfiguration"))
     UpdateFileSystemWindowsConfiguration.struct_class = Types::UpdateFileSystemWindowsConfiguration
 
@@ -580,6 +606,7 @@ module Aws::FSx
         "serviceFullName" => "Amazon FSx",
         "serviceId" => "FSx",
         "signatureVersion" => "v4",
+        "signingName" => "fsx",
         "targetPrefix" => "AWSSimbaAPIService_v20180301",
         "uid" => "fsx-2018-03-01",
       }
@@ -792,6 +819,7 @@ module Aws::FSx
         o.errors << Shapes::ShapeRef.new(shape: InternalServerError)
         o.errors << Shapes::ShapeRef.new(shape: FileSystemNotFound)
         o.errors << Shapes::ShapeRef.new(shape: MissingFileSystemConfiguration)
+        o.errors << Shapes::ShapeRef.new(shape: ServiceLimitExceeded)
       end)
     end
 

data/lib/aws-sdk-fsx/resource.rb

@@ -6,13 +6,7 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::FSx
-  # This class provides a resource oriented interface for FSx.
-  # To create a resource object:
-  #     resource = Aws::FSx::Resource.new(region: 'us-west-2')
-  # You can supply a client object with custom configuration that will be used for all resource operations.
-  # If you do not pass +:client+, a default client will be constructed.
-  #     client = Aws::FSx::Client.new(region: 'us-west-2')
-  #     resource = Aws::FSx::Resource.new(client: client)
+
   class Resource
 
     # @param options ({})

data/lib/aws-sdk-fsx/types.rb

@@ -51,6 +51,100 @@ module Aws::FSx
       include Aws::Structure
     end
 
+    # Describes a specific Amazon FSx Administrative Action for the current
+    # Windows file system.
+    #
+    # @!attribute [rw] administrative_action_type
+    #   Describes the type of administrative action, as follows:
+    #
+    #   * `FILE_SYSTEM_UPDATE` - A file system update administrative action
+    #     initiated by the user from the Amazon FSx console, API
+    #     (UpdateFileSystem), or CLI (update-file-system). A
+    #
+    #   * `STORAGE_OPTIMIZATION` - Once the `FILE_SYSTEM_UPDATE` task to
+    #     increase a file system's storage capacity completes successfully,
+    #     a `STORAGE_OPTIMIZATION` task starts. Storage optimization is the
+    #     process of migrating the file system data to the new, larger
+    #     disks. You can track the storage migration progress using the
+    #     `ProgressPercent` property. When `STORAGE_OPTIMIZATION` completes
+    #     successfully, the parent `FILE_SYSTEM_UPDATE` action status
+    #     changes to `COMPLETED`. For more information, see [Managing
+    #     Storage Capacity][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/managing-storage-capacity.html
+    #   @return [String]
+    #
+    # @!attribute [rw] progress_percent
+    #   Provides the percent complete of a `STORAGE_OPTIMIZATION`
+    #   administrative action.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] request_time
+    #   Time that the administrative action request was received.
+    #   @return [Time]
+    #
+    # @!attribute [rw] status
+    #   Describes the status of the administrative action, as follows:
+    #
+    #   * `FAILED` - Amazon FSx failed to process the administrative action
+    #     successfully.
+    #
+    #   * `IN_PROGRESS` - Amazon FSx is processing the administrative
+    #     action.
+    #
+    #   * `PENDING` - Amazon FSx is waiting to process the administrative
+    #     action.
+    #
+    #   * `COMPLETED` - Amazon FSx has finished processing the
+    #     administrative task.
+    #
+    #   * `UPDATED_OPTIMIZING` - For a storage capacity increase update,
+    #     Amazon FSx has updated the file system with the new storage
+    #     capacity, and is now performing the storage optimization process.
+    #     For more information, see [Managing Storage Capacity][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/managing-storage-capacity.html
+    #   @return [String]
+    #
+    # @!attribute [rw] target_file_system_values
+    #   Describes the target `StorageCapacity` or `ThroughputCapacity` value
+    #   provided in the `UpdateFileSystem` operation. Returned for
+    #   `FILE_SYSTEM_UPDATE` administrative actions.
+    #   @return [Types::FileSystem]
+    #
+    # @!attribute [rw] failure_details
+    #   Provides information about a failed administrative action.
+    #   @return [Types::AdministrativeActionFailureDetails]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/AdministrativeAction AWS API Documentation
+    #
+    class AdministrativeAction < Struct.new(
+      :administrative_action_type,
+      :progress_percent,
+      :request_time,
+      :status,
+      :target_file_system_values,
+      :failure_details)
+      include Aws::Structure
+    end
+
+    # Provides information about a failed administrative action.
+    #
+    # @!attribute [rw] message
+    #   Error message providing details about the failure.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/AdministrativeActionFailureDetails AWS API Documentation
+    #
+    class AdministrativeActionFailureDetails < Struct.new(
+      :message)
+      include Aws::Structure
+    end
+
     # A backup of an Amazon FSx for Windows File Server file system. You can
     # create a new file system from a backup to protect against data loss.
     #
@@ -391,7 +485,11 @@ module Aws::FSx
     # @!attribute [rw] paths
     #   (Optional) The path or paths on the Amazon FSx file system to use
     #   when the data repository task is processed. The default path is the
-    #   file system root directory.
+    #   file system root directory. The paths you provide need to be
+    #   relative to the mount point of the file system. If the mount point
+    #   is `/mnt/fsx` and `/mnt/fsx/path1` is a directory or file on the
+    #   file system you want to export, then the path to provide is `path1`.
+    #   If a path that you provide isn't valid, the task fails.
     #   @return [Array<String>]
     #
     # @!attribute [rw] file_system_id
@@ -402,7 +500,12 @@ module Aws::FSx
     #   Defines whether or not Amazon FSx provides a CompletionReport once
     #   the task has completed. A CompletionReport provides a detailed
     #   report on the files that Amazon FSx processed that meet the criteria
-    #   specified by the `Scope` parameter.
+    #   specified by the `Scope` parameter. For more information, see
+    #   [Working with Task Completion Reports][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/LustreGuide/task-completion-report.html
     #   @return [Types::CompletionReport]
     #
     # @!attribute [rw] client_request_token
@@ -468,7 +571,7 @@ module Aws::FSx
     #             password: "DirectoryPassword", # required
     #             dns_ips: ["IpAddress"], # required
     #           },
-    #           deployment_type: "MULTI_AZ_1", # accepts MULTI_AZ_1, SINGLE_AZ_1
+    #           deployment_type: "MULTI_AZ_1", # accepts MULTI_AZ_1, SINGLE_AZ_1, SINGLE_AZ_2
     #           preferred_subnet_id: "SubnetId",
     #           throughput_capacity: 1, # required
     #           weekly_maintenance_start_time: "WeeklyTime",
@@ -476,6 +579,7 @@ module Aws::FSx
     #           automatic_backup_retention_days: 1,
     #           copy_tags_to_backups: false,
     #         },
+    #         storage_type: "SSD", # accepts SSD, HDD
     #       }
     #
     # @!attribute [rw] backup_id
@@ -494,16 +598,23 @@ module Aws::FSx
     #   @return [String]
     #
     # @!attribute [rw] subnet_ids
-    #   A list of IDs for the subnets that the file system will be
-    #   accessible from. Currently, you can specify only one subnet. The
-    #   file server is also launched in that subnet's Availability Zone.
+    #   Specifies the IDs of the subnets that the file system will be
+    #   accessible from. For Windows `MULTI_AZ_1` file system deployment
+    #   types, provide exactly two subnet IDs, one for the preferred file
+    #   server and one for the standby file server. You specify one of these
+    #   subnets as the preferred subnet using the `WindowsConfiguration >
+    #   PreferredSubnetID` property.
+    #
+    #   For Windows `SINGLE_AZ_1` and `SINGLE_AZ_2` deployment types and
+    #   Lustre file systems, provide exactly one subnet ID. The file server
+    #   is launched in that subnet's Availability Zone.
     #   @return [Array<String>]
     #
     # @!attribute [rw] security_group_ids
     #   A list of IDs for the security groups that apply to the specified
     #   network interfaces created for file system access. These security
     #   groups apply to all network interfaces. This value isn't returned
-    #   in later describe requests.
+    #   in later DescribeFileSystem requests.
     #   @return [Array<String>]
     #
     # @!attribute [rw] tags
@@ -516,6 +627,29 @@ module Aws::FSx
     #   The configuration for this Microsoft Windows file system.
     #   @return [Types::CreateFileSystemWindowsConfiguration]
     #
+    # @!attribute [rw] storage_type
+    #   Sets the storage type for the Windows file system you're creating
+    #   from a backup. Valid values are `SSD` and `HDD`.
+    #
+    #   * Set to `SSD` to use solid state drive storage. Supported on all
+    #     Windows deployment types.
+    #
+    #   * Set to `HDD` to use hard disk drive storage. Supported on
+    #     `SINGLE_AZ_2` and `MULTI_AZ_1` Windows file system deployment
+    #     types.
+    #
+    #   Default value is `SSD`.
+    #
+    #   <note markdown="1"> HDD and SSD storage types have different minimum storage capacity
+    #   requirements. A restored file system's storage capacity is tied to
+    #   the file system that was backed up. You can create a file system
+    #   that uses HDD storage from a backup of a file system that used SSD
+    #   storage only if the original SSD file system had a storage capacity
+    #   of at least 2000 GiB.
+    #
+    #    </note>
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/CreateFileSystemFromBackupRequest AWS API Documentation
     #
     class CreateFileSystemFromBackupRequest < Struct.new(
@@ -524,7 +658,8 @@ module Aws::FSx
       :subnet_ids,
       :security_group_ids,
       :tags,
-      :windows_configuration)
+      :windows_configuration,
+      :storage_type)
       include Aws::Structure
     end
 
@@ -541,8 +676,7 @@ module Aws::FSx
       include Aws::Structure
     end
 
-    # The Lustre configuration for the file system being created. This value
-    # is required if `FileSystemType` is set to `LUSTRE`.
+    # The Lustre configuration for the file system being created.
     #
     # @note When making an API call, you may pass CreateFileSystemLustreConfiguration
     #   data as a hash:
@@ -557,8 +691,9 @@ module Aws::FSx
     #       }
     #
     # @!attribute [rw] weekly_maintenance_start_time
-    #   The preferred time to perform weekly maintenance, in the UTC time
-    #   zone.
+    #   The preferred start time to perform weekly maintenance, formatted
+    #   d:HH:MM in the UTC time zone, where d is the weekday number, from 1
+    #   through 7, beginning with Monday and ending with Sunday.
     #   @return [String]
     #
     # @!attribute [rw] import_path
@@ -632,14 +767,14 @@ module Aws::FSx
     #   @return [String]
     #
     # @!attribute [rw] per_unit_storage_throughput
-    #   (Optional) For the `PERSISTENT_1` deployment type, describes the
+    #   Required for the `PERSISTENT_1` deployment type, describes the
     #   amount of read and write throughput for each 1 tebibyte of storage,
     #   in MB/s/TiB. File system throughput capacity is calculated by
     #   multiplying file system storage capacity (TiB) by the
     #   PerUnitStorageThroughput (MB/s/TiB). For a 2.4 TiB file system,
-    #   provisioning 50 MB/s/TiB of PerUnitStorageThroughput yields 120 MB/s
+    #   provisioning 50 MB/s/TiB of PerUnitStorageThroughput yields 117 MB/s
     #   of file system throughput. You pay for the amount of throughput that
-    #   you provision. (Default = 200 MB/s/TiB)
+    #   you provision.
     #
     #   Valid values are 50, 100, 200.
     #   @return [Integer]
@@ -665,6 +800,7 @@ module Aws::FSx
     #         client_request_token: "ClientRequestToken",
     #         file_system_type: "WINDOWS", # required, accepts WINDOWS, LUSTRE
     #         storage_capacity: 1, # required
+    #         storage_type: "SSD", # accepts SSD, HDD
     #         subnet_ids: ["SubnetId"], # required
     #         security_group_ids: ["SecurityGroupId"],
     #         tags: [
@@ -684,7 +820,7 @@ module Aws::FSx
     #             password: "DirectoryPassword", # required
     #             dns_ips: ["IpAddress"], # required
     #           },
-    #           deployment_type: "MULTI_AZ_1", # accepts MULTI_AZ_1, SINGLE_AZ_1
+    #           deployment_type: "MULTI_AZ_1", # accepts MULTI_AZ_1, SINGLE_AZ_1, SINGLE_AZ_2
     #           preferred_subnet_id: "SubnetId",
     #           throughput_capacity: 1, # required
     #           weekly_maintenance_start_time: "WeeklyTime",
@@ -718,16 +854,44 @@ module Aws::FSx
     #   @return [String]
     #
     # @!attribute [rw] storage_capacity
-    #   The storage capacity of the file system being created.
+    #   Sets the storage capacity of the file system that you're creating.
+    #
+    #   For Lustre file systems:
+    #
+    #   * For `SCRATCH_2` and `PERSISTENT_1` deployment types, valid values
+    #     are 1.2, 2.4, and increments of 2.4 TiB.
     #
-    #   For Windows file systems, valid values are 32 GiB - 65,536 GiB.
+    #   * For `SCRATCH_1` deployment type, valid values are 1.2, 2.4, and
+    #     increments of 3.6 TiB.
     #
-    #   For `SCRATCH_1` Lustre file systems, valid values are 1,200, 2,400,
-    #   3,600, then continuing in increments of 3600 GiB. For `SCRATCH_2`
-    #   and `PERSISTENT_1` file systems, valid values are 1200, 2400, then
-    #   continuing in increments of 2400 GiB.
+    #   For Windows file systems:
+    #
+    #   * If `StorageType=SSD`, valid values are 32 GiB - 65,536 GiB (64
+    #     TiB).
+    #
+    #   * If `StorageType=HDD`, valid values are 2000 GiB - 65,536 GiB (64
+    #     TiB).
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_type
+    #   Sets the storage type for the Amazon FSx for Windows file system
+    #   you're creating. Valid values are `SSD` and `HDD`.
+    #
+    #   * Set to `SSD` to use solid state drive storage. SSD is supported on
+    #     all Windows deployment types.
+    #
+    #   * Set to `HDD` to use hard disk drive storage. HDD is supported on
+    #     `SINGLE_AZ_2` and `MULTI_AZ_1` Windows file system deployment
+    #     types.
+    #
+    #   Default value is `SSD`. For more information, see [ Storage Type
+    #   Options][1] in the *Amazon FSx for Windows User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/optimize-fsx-costs.html#storage-type-options
+    #   @return [String]
+    #
     # @!attribute [rw] subnet_ids
     #   Specifies the IDs of the subnets that the file system will be
     #   accessible from. For Windows `MULTI_AZ_1` file system deployment
@@ -736,9 +900,9 @@ module Aws::FSx
     #   subnets as the preferred subnet using the `WindowsConfiguration >
     #   PreferredSubnetID` property.
     #
-    #   For Windows `SINGLE_AZ_1` file system deployment types and Lustre
-    #   file systems, provide exactly one subnet ID. The file server is
-    #   launched in that subnet's Availability Zone.
+    #   For Windows `SINGLE_AZ_1` and `SINGLE_AZ_2` file system deployment
+    #   types and Lustre file systems, provide exactly one subnet ID. The
+    #   file server is launched in that subnet's Availability Zone.
     #   @return [Array<String>]
     #
     # @!attribute [rw] security_group_ids
@@ -769,13 +933,11 @@ module Aws::FSx
     #
     # @!attribute [rw] windows_configuration
     #   The Microsoft Windows configuration for the file system being
-    #   created. This value is required if `FileSystemType` is set to
-    #   `WINDOWS`.
+    #   created.
     #   @return [Types::CreateFileSystemWindowsConfiguration]
     #
     # @!attribute [rw] lustre_configuration
-    #   The Lustre configuration for the file system being created. This
-    #   value is required if `FileSystemType` is set to `LUSTRE`.
+    #   The Lustre configuration for the file system being created.
     #   @return [Types::CreateFileSystemLustreConfiguration]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/CreateFileSystemRequest AWS API Documentation
@@ -784,6 +946,7 @@ module Aws::FSx
       :client_request_token,
       :file_system_type,
       :storage_capacity,
+      :storage_type,
       :subnet_ids,
       :security_group_ids,
       :tags,
@@ -822,7 +985,7 @@ module Aws::FSx
     #           password: "DirectoryPassword", # required
     #           dns_ips: ["IpAddress"], # required
     #         },
-    #         deployment_type: "MULTI_AZ_1", # accepts MULTI_AZ_1, SINGLE_AZ_1
+    #         deployment_type: "MULTI_AZ_1", # accepts MULTI_AZ_1, SINGLE_AZ_1, SINGLE_AZ_2
     #         preferred_subnet_id: "SubnetId",
     #         throughput_capacity: 1, # required
     #         weekly_maintenance_start_time: "WeeklyTime",
@@ -846,17 +1009,21 @@ module Aws::FSx
     #   Specifies the file system deployment type, valid values are the
     #   following:
     #
-    #   * MULTI\_AZ\_1 - Deploys a high availability file system that is
+    #   * `MULTI_AZ_1` - Deploys a high availability file system that is
     #     configured for Multi-AZ redundancy to tolerate temporary
     #     Availability Zone (AZ) unavailability. You can only deploy a
     #     Multi-AZ file system in AWS Regions that have a minimum of three
-    #     Availability Zones.
+    #     Availability Zones. Also supports HDD storage type
     #
-    #   * SINGLE\_AZ\_1 - (Default) Choose to deploy a file system that is
+    #   * `SINGLE_AZ_1` - (Default) Choose to deploy a file system that is
     #     configured for single AZ redundancy.
     #
-    #   To learn more about high availability Multi-AZ file systems, see [
-    #   High Availability for Amazon FSx for Windows File Server][1].
+    #   * `SINGLE_AZ_2` - The latest generation Single AZ file system.
+    #     Specifies a file system that is configured for single AZ
+    #     redundancy and supports HDD storage type.
+    #
+    #   For more information, see [ Availability and Durability: Single-AZ
+    #   and Multi-AZ File Systems][1].
     #
     #
     #
@@ -880,7 +1047,8 @@ module Aws::FSx
     #
     # @!attribute [rw] weekly_maintenance_start_time
     #   The preferred start time to perform weekly maintenance, formatted
-    #   d:HH:MM in the UTC time zone.
+    #   d:HH:MM in the UTC time zone, where d is the weekday number, from 1
+    #   through 7, beginning with Monday and ending with Sunday.
     #   @return [String]
     #
     # @!attribute [rw] daily_automatic_backup_start_time
@@ -1638,14 +1806,29 @@ module Aws::FSx
     #   The storage capacity of the file system in gigabytes (GB).
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_type
+    #   The storage type of the file system. Valid values are `SSD` and
+    #   `HDD`. If set to `SSD`, the file system uses solid state drive
+    #   storage. If set to `HDD`, the file system uses hard disk drive
+    #   storage.
+    #   @return [String]
+    #
     # @!attribute [rw] vpc_id
     #   The ID of the primary VPC for the file system.
     #   @return [String]
     #
     # @!attribute [rw] subnet_ids
-    #   The ID of the subnet to contain the endpoint for the file system.
-    #   One and only one is supported. The file system is launched in the
-    #   Availability Zone associated with this subnet.
+    #   Specifies the IDs of the subnets that the file system is accessible
+    #   from. For Windows `MULTI_AZ_1` file system deployment type, there
+    #   are two subnet IDs, one for the preferred file server and one for
+    #   the standby file server. The preferred file server subnet identified
+    #   in the `PreferredSubnetID` property. All other file systems have
+    #   only one subnet ID.
+    #
+    #   For Lustre file systems, and Single-AZ Windows file systems, this is
+    #   the ID of the subnet that contains the endpoint for the file system.
+    #   For `MULTI_AZ_1` Windows file systems, the endpoint for the file
+    #   system is available in the `PreferredSubnetID`.
     #   @return [Array<String>]
     #
     # @!attribute [rw] network_interface_ids
@@ -1705,6 +1888,13 @@ module Aws::FSx
     #   The configuration for the Amazon FSx for Lustre file system.
     #   @return [Types::LustreFileSystemConfiguration]
     #
+    # @!attribute [rw] administrative_actions
+    #   A list of administrative actions for the file system that are in
+    #   process or waiting to be processed. Administrative actions describe
+    #   changes to the Windows file system that you have initiated using the
+    #   `UpdateFileSystem` action.
+    #   @return [Array<Types::AdministrativeAction>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/FileSystem AWS API Documentation
     #
     class FileSystem < Struct.new(
@@ -1715,6 +1905,7 @@ module Aws::FSx
       :lifecycle,
       :failure_details,
       :storage_capacity,
+      :storage_type,
       :vpc_id,
       :subnet_ids,
       :network_interface_ids,
@@ -1723,7 +1914,8 @@ module Aws::FSx
       :resource_arn,
       :tags,
       :windows_configuration,
-      :lustre_configuration)
+      :lustre_configuration,
+      :administrative_actions)
       include Aws::Structure
     end
 
@@ -1960,7 +2152,9 @@ module Aws::FSx
     # The configuration for the Amazon FSx for Lustre file system.
     #
     # @!attribute [rw] weekly_maintenance_start_time
-    #   The UTC time that you want to begin your weekly maintenance window.
+    #   The preferred start time to perform weekly maintenance, formatted
+    #   d:HH:MM in the UTC time zone. d is the weekday number, from 1
+    #   through 7, beginning with Monday and ending with Sunday.
     #   @return [String]
     #
     # @!attribute [rw] data_repository_configuration
@@ -2202,8 +2396,7 @@ module Aws::FSx
     end
 
     # The configuration that Amazon FSx uses to join the Windows File Server
-    # instance to the self-managed Microsoft Active Directory (AD)
-    # directory.
+    # instance to a self-managed Microsoft Active Directory (AD) directory.
     #
     # @note When making an API call, you may pass SelfManagedActiveDirectoryConfigurationUpdates
     #   data as a hash:
@@ -2387,8 +2580,9 @@ module Aws::FSx
     #       }
     #
     # @!attribute [rw] weekly_maintenance_start_time
-    #   The preferred time to perform weekly maintenance, in the UTC time
-    #   zone.
+    #   The preferred start time to perform weekly maintenance, formatted
+    #   d:HH:MM in the UTC time zone. d is the weekday number, from 1
+    #   through 7, beginning with Monday and ending with Sunday.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/UpdateFileSystemLustreConfiguration AWS API Documentation
@@ -2406,10 +2600,12 @@ module Aws::FSx
     #       {
     #         file_system_id: "FileSystemId", # required
     #         client_request_token: "ClientRequestToken",
+    #         storage_capacity: 1,
     #         windows_configuration: {
     #           weekly_maintenance_start_time: "WeeklyTime",
     #           daily_automatic_backup_start_time: "DailyTime",
     #           automatic_backup_retention_days: 1,
+    #           throughput_capacity: 1,
     #           self_managed_active_directory_configuration: {
     #             user_name: "DirectoryUserName",
     #             password: "DirectoryPassword",
@@ -2422,23 +2618,38 @@ module Aws::FSx
     #       }
     #
     # @!attribute [rw] file_system_id
-    #   The globally unique ID of the file system, assigned by Amazon FSx.
+    #   Identifies the file system that you are updating.
     #   @return [String]
     #
     # @!attribute [rw] client_request_token
-    #   (Optional) A string of up to 64 ASCII characters that Amazon FSx
-    #   uses to ensure idempotent updates. This string is automatically
-    #   filled on your behalf when you use the AWS Command Line Interface
-    #   (AWS CLI) or an AWS SDK.
+    #   A string of up to 64 ASCII characters that Amazon FSx uses to ensure
+    #   idempotent updates. This string is automatically filled on your
+    #   behalf when you use the AWS Command Line Interface (AWS CLI) or an
+    #   AWS SDK.
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.
     #   @return [String]
     #
+    # @!attribute [rw] storage_capacity
+    #   Use this parameter to increase the storage capacity of an Amazon FSx
+    #   for Windows File Server file system. Specifies the storage capacity
+    #   target value, GiB, for the file system you're updating. The storage
+    #   capacity target value must be at least 10 percent (%) greater than
+    #   the current storage capacity value. In order to increase storage
+    #   capacity, the file system needs to have at least 16 MB/s of
+    #   throughput capacity. You cannot make a storage capacity increase
+    #   request if there is an existing storage capacity increase request in
+    #   progress. For more information, see [Managing Storage Capacity][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/managing-storage-capacity.html
+    #   @return [Integer]
+    #
     # @!attribute [rw] windows_configuration
-    #   The configuration update for this Microsoft Windows file system. The
-    #   only supported options are for backup and maintenance and for
-    #   self-managed Active Directory configuration.
+    #   The configuration updates for an Amazon FSx for Windows File Server
+    #   file system.
     #   @return [Types::UpdateFileSystemWindowsConfiguration]
     #
     # @!attribute [rw] lustre_configuration
@@ -2451,6 +2662,7 @@ module Aws::FSx
     class UpdateFileSystemRequest < Struct.new(
       :file_system_id,
       :client_request_token,
+      :storage_capacity,
       :windows_configuration,
       :lustre_configuration)
       include Aws::Structure
@@ -2469,10 +2681,9 @@ module Aws::FSx
       include Aws::Structure
     end
 
-    # Updates the Microsoft Windows configuration for an existing Amazon FSx
-    # for Windows File Server file system. Amazon FSx overwrites existing
-    # properties with non-null values provided in the request. If you don't
-    # specify a non-null value for a property, that property is not updated.
+    # Updates the configuration for an existing Amazon FSx for Windows File
+    # Server file system. Amazon FSx only overwrites existing properties
+    # with non-null values provided in the request.
     #
     # @note When making an API call, you may pass UpdateFileSystemWindowsConfiguration
     #   data as a hash:
@@ -2481,6 +2692,7 @@ module Aws::FSx
     #         weekly_maintenance_start_time: "WeeklyTime",
     #         daily_automatic_backup_start_time: "DailyTime",
     #         automatic_backup_retention_days: 1,
+    #         throughput_capacity: 1,
     #         self_managed_active_directory_configuration: {
     #           user_name: "DirectoryUserName",
     #           password: "DirectoryPassword",
@@ -2489,24 +2701,45 @@ module Aws::FSx
     #       }
     #
     # @!attribute [rw] weekly_maintenance_start_time
-    #   The preferred time to perform weekly maintenance, in the UTC time
-    #   zone.
+    #   The preferred start time to perform weekly maintenance, formatted
+    #   d:HH:MM in the UTC time zone. Where d is the weekday number, from 1
+    #   through 7, with 1 = Monday and 7 = Sunday.
     #   @return [String]
     #
     # @!attribute [rw] daily_automatic_backup_start_time
-    #   The preferred time to take daily automatic backups, in the UTC time
-    #   zone.
+    #   The preferred time to start the daily automatic backup, in the UTC
+    #   time zone, for example, `02:00`
     #   @return [String]
     #
     # @!attribute [rw] automatic_backup_retention_days
-    #   The number of days to retain automatic backups. Setting this to 0
-    #   disables automatic backups. You can retain automatic backups for a
-    #   maximum of 35 days.
+    #   The number of days to retain automatic daily backups. Setting this
+    #   to zero (0) disables automatic daily backups. You can retain
+    #   automatic daily backups for a maximum of 35 days. For more
+    #   information, see [Working with Automatic Daily Backups][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/using-backups.html#automatic-backups
+    #   @return [Integer]
+    #
+    # @!attribute [rw] throughput_capacity
+    #   Sets the target value for a file system's throughput capacity, in
+    #   MB/s, that you are updating the file system to. Valid values are 8,
+    #   16, 32, 64, 128, 256, 512, 1024, 2048. You cannot make a throughput
+    #   capacity update request if there is an existing throughput capacity
+    #   update request in progress. For more information, see [Managing
+    #   Throughput Capacity][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/managing-throughput-capacity.html
     #   @return [Integer]
     #
     # @!attribute [rw] self_managed_active_directory_configuration
     #   The configuration Amazon FSx uses to join the Windows File Server
-    #   instance to the self-managed Microsoft AD directory.
+    #   instance to the self-managed Microsoft AD directory. You cannot make
+    #   a self-managed Microsoft AD update request if there is an existing
+    #   self-managed Microsoft AD update request in progress.
     #   @return [Types::SelfManagedActiveDirectoryConfigurationUpdates]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/fsx-2018-03-01/UpdateFileSystemWindowsConfiguration AWS API Documentation
@@ -2515,6 +2748,7 @@ module Aws::FSx
       :weekly_maintenance_start_time,
       :daily_automatic_backup_start_time,
       :automatic_backup_retention_days,
+      :throughput_capacity,
       :self_managed_active_directory_configuration)
       include Aws::Structure
     end
@@ -2537,10 +2771,21 @@ module Aws::FSx
     #
     #   * `MULTI_AZ_1` - Specifies a high availability file system that is
     #     configured for Multi-AZ redundancy to tolerate temporary
-    #     Availability Zone (AZ) unavailability.
+    #     Availability Zone (AZ) unavailability, and supports SSD and HDD
+    #     storage.
     #
     #   * `SINGLE_AZ_1` - (Default) Specifies a file system that is
-    #     configured for single AZ redundancy.
+    #     configured for single AZ redundancy, only supports SSD storage.
+    #
+    #   * `SINGLE_AZ_2` - Latest generation Single AZ file system. Specifies
+    #     a file system that is configured for single AZ redundancy and
+    #     supports SSD and HDD storage.
+    #
+    #   For more information, see [Single-AZ and Multi-AZ File Systems][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html
     #   @return [String]
     #
     # @!attribute [rw] remote_administration_endpoint
@@ -2548,8 +2793,8 @@ module Aws::FSx
     #   administrative tasks on the file system using Amazon FSx Remote
     #   PowerShell.
     #
-    #   For `SINGLE_AZ_1` deployment types, this is the DNS name of the file
-    #   system.
+    #   For `SINGLE_AZ_1` and `SINGLE_AZ_2` deployment types, this is the
+    #   DNS name of the file system.
     #
     #   This endpoint is temporarily unavailable when the file system is
     #   undergoing maintenance.
@@ -2562,8 +2807,14 @@ module Aws::FSx
     #   traffic from this subnet except in the event of a failover to the
     #   secondary file server.
     #
-    #   For `SINGLE_AZ_1` deployment types, this value is the same as that
-    #   for `SubnetIDs`.
+    #   For `SINGLE_AZ_1` and `SINGLE_AZ_2` deployment types, this value is
+    #   the same as that for `SubnetIDs`. For more information, see
+    #   [Availability and Durability: Single-AZ and Multi-AZ File
+    #   Systems][1]
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html#single-multi-az-resources
     #   @return [String]
     #
     # @!attribute [rw] preferred_file_server_ip
@@ -2572,13 +2823,12 @@ module Aws::FSx
     #
     #   Use this IP address when mounting the file system on Linux SMB
     #   clients or Windows SMB clients that are not joined to a Microsoft
-    #   Active Directory. Applicable for both `SINGLE_AZ_1` and `MULTI_AZ_1`
-    #   deployment types. This IP address is temporarily unavailable when
-    #   the file system is undergoing maintenance. For Linux and Windows SMB
-    #   clients that are joined to an Active Directory, use the file
-    #   system's DNSName instead. For more information and instruction on
-    #   mapping and mounting file shares, see
-    #   [https://docs.aws.amazon.com/fsx/latest/WindowsGuide/accessing-file-shares.html][1].
+    #   Active Directory. Applicable for all Windows file system deployment
+    #   types. This IP address is temporarily unavailable when the file
+    #   system is undergoing maintenance. For Linux and Windows SMB clients
+    #   that are joined to an Active Directory, use the file system's
+    #   DNSName instead. For more information on mapping and mounting file
+    #   shares, see [Accessing File Shares][1].
     #
     #
     #
@@ -2595,8 +2845,9 @@ module Aws::FSx
     #   @return [Array<String>]
     #
     # @!attribute [rw] weekly_maintenance_start_time
-    #   The preferred time to perform weekly maintenance, in the UTC time
-    #   zone.
+    #   The preferred start time to perform weekly maintenance, formatted
+    #   d:HH:MM in the UTC time zone. d is the weekday number, from 1
+    #   through 7, beginning with Monday and ending with Sunday.
     #   @return [String]
     #
     # @!attribute [rw] daily_automatic_backup_start_time