aws-sdk-workspaces 1.30.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27a194f731a85d40300aefaa40aa04c2752ee66
-  data.tar.gz: b290f05a900470dd6372fd2ec4963594bcf2d406
+  metadata.gz: 2cc1c03218ee6a991cfa3ed1d9bdecc638876928
+  data.tar.gz: d9e587a8ee16b9250fa41ba73e5d41cf4b688509
 SHA512:
-  metadata.gz: da6dbc1781baa7ea385e6ac255404527b983e2b7407289d4152494050f322a24a74d43a36fe8411ebf43a0fa3a75a71f83da223d95e21489fd2ca491516d6c0f
-  data.tar.gz: fe8efb9344e9cce6de96448896676f504cc8643a7ee0aac4ed00765f3682e5b0102a2c7b4b81f5be967b2d741f2552325217f7e56739a9f1b71aeef1793c8df9
+  metadata.gz: 85d6e228c00c985664055012437509c37262938325098a7f4ed11e4e3a878f3e480108dda8f91b2ea433baf1e527fbf80884a382f9e752d93734c701084c4339
+  data.tar.gz: 365dbed2ee48a858439a337c592cb5ca1b1673904fa56a28dbfe6af400a24dfcd4e91686cbe128c2577aeab8512019e89d8d8ef845aa7c776099ef4d7b0f9ff8

data/lib/aws-sdk-workspaces.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-workspaces/customizations'
 # @service
 module Aws::WorkSpaces
 
-  GEM_VERSION = '1.30.0'
+  GEM_VERSION = '1.31.0'
 
 end

data/lib/aws-sdk-workspaces/client.rb

@@ -641,8 +641,36 @@ module Aws::WorkSpaces
       req.send_request(options)
     end
 
-    # Retrieves a list that describes the configuration of bring your own
-    # license (BYOL) for the specified account.
+    # Deregisters the specified directory. This operation is asynchronous
+    # and returns before the WorkSpace directory is deregistered. If any
+    # WorkSpaces are registered to this directory, you must remove them
+    # before you can deregister the directory.
+    #
+    # @option params [required, String] :directory_id
+    #   The identifier of the directory. If any WorkSpaces are registered to
+    #   this directory, you must remove them before you deregister the
+    #   directory, or you will receive an OperationNotSupportedException
+    #   error.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.deregister_workspace_directory({
+    #     directory_id: "DirectoryId", # required
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/workspaces-2015-04-08/DeregisterWorkspaceDirectory AWS API Documentation
+    #
+    # @overload deregister_workspace_directory(params = {})
+    # @param [Hash] params ({})
+    def deregister_workspace_directory(params = {}, options = {})
+      req = build_request(:deregister_workspace_directory, params)
+      req.send_request(options)
+    end
+
+    # Retrieves a list that describes the configuration of Bring Your Own
+    # License (BYOL) for the specified account.
     #
     # @return [Types::DescribeAccountResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -664,7 +692,7 @@ module Aws::WorkSpaces
     end
 
     # Retrieves a list that describes modifications to the configuration of
-    # bring your own license (BYOL) for the specified account.
+    # Bring Your Own License (BYOL) for the specified account.
     #
     # @option params [String] :next_token
     #   If you received a `NextToken` from a previous call that was paginated,
@@ -863,13 +891,16 @@ module Aws::WorkSpaces
       req.send_request(options)
     end
 
-    # Describes the available AWS Directory Service directories that are
-    # registered with Amazon WorkSpaces.
+    # Describes the available directories that are registered with Amazon
+    # WorkSpaces.
     #
     # @option params [Array<String>] :directory_ids
     #   The identifiers of the directories. If the value is null, all
     #   directories are retrieved.
     #
+    # @option params [Integer] :limit
+    #   The maximum number of directories to return.
+    #
     # @option params [String] :next_token
     #   If you received a `NextToken` from a previous call that was paginated,
     #   provide this token to receive the next set of results.
@@ -883,6 +914,7 @@ module Aws::WorkSpaces
     #
     #   resp = client.describe_workspace_directories({
     #     directory_ids: ["DirectoryId"],
+    #     limit: 1,
     #     next_token: "PaginationToken",
     #   })
     #
@@ -907,8 +939,22 @@ module Aws::WorkSpaces
     #   resp.directories[0].workspace_creation_properties.default_ou #=> String
     #   resp.directories[0].workspace_creation_properties.custom_security_group_id #=> String
     #   resp.directories[0].workspace_creation_properties.user_enabled_as_local_administrator #=> Boolean
+    #   resp.directories[0].workspace_creation_properties.enable_maintenance_mode #=> Boolean
     #   resp.directories[0].ip_group_ids #=> Array
     #   resp.directories[0].ip_group_ids[0] #=> String
+    #   resp.directories[0].workspace_access_properties.device_type_windows #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].workspace_access_properties.device_type_osx #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].workspace_access_properties.device_type_web #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].workspace_access_properties.device_type_ios #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].workspace_access_properties.device_type_android #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].workspace_access_properties.device_type_chrome_os #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].workspace_access_properties.device_type_zero_client #=> String, one of "ALLOW", "DENY"
+    #   resp.directories[0].tenancy #=> String, one of "DEDICATED", "SHARED"
+    #   resp.directories[0].selfservice_permissions.restart_workspace #=> String, one of "ENABLED", "DISABLED"
+    #   resp.directories[0].selfservice_permissions.increase_volume_size #=> String, one of "ENABLED", "DISABLED"
+    #   resp.directories[0].selfservice_permissions.change_compute_type #=> String, one of "ENABLED", "DISABLED"
+    #   resp.directories[0].selfservice_permissions.switch_running_mode #=> String, one of "ENABLED", "DISABLED"
+    #   resp.directories[0].selfservice_permissions.rebuild_workspace #=> String, one of "ENABLED", "DISABLED"
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/workspaces-2015-04-08/DescribeWorkspaceDirectories AWS API Documentation
@@ -1153,7 +1199,7 @@ module Aws::WorkSpaces
       req.send_request(options)
     end
 
-    # Imports the specified Windows 7 or Windows 10 bring your own license
+    # Imports the specified Windows 7 or Windows 10 Bring Your Own License
     # (BYOL) image into Amazon WorkSpaces. The image must be an already
     # licensed EC2 image that is in your AWS account, and you must own the
     # image.
@@ -1207,7 +1253,7 @@ module Aws::WorkSpaces
 
     # Retrieves a list of IP address ranges, specified as IPv4 CIDR blocks,
     # that you can use for the network management interface when you enable
-    # bring your own license (BYOL).
+    # Bring Your Own License (BYOL).
     #
     # The management network interface is connected to a secure Amazon
     # WorkSpaces management network. It is used for interactive streaming of
@@ -1254,7 +1300,7 @@ module Aws::WorkSpaces
       req.send_request(options)
     end
 
-    # Modifies the configuration of bring your own license (BYOL) for the
+    # Modifies the configuration of Bring Your Own License (BYOL) for the
     # specified account.
     #
     # @option params [String] :dedicated_tenancy_support
@@ -1314,6 +1360,117 @@ module Aws::WorkSpaces
       req.send_request(options)
     end
 
+    # Modifies the self-service WorkSpace management capabilities for your
+    # users. For more information, see [Enable Self-Service WorkSpace
+    # Management Capabilities for Your Users][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/workspaces/latest/adminguide/enable-user-self-service-workspace-management.html
+    #
+    # @option params [required, String] :resource_id
+    #   The identifier of the directory.
+    #
+    # @option params [required, Types::SelfservicePermissions] :selfservice_permissions
+    #   The permissions to enable or disable self-service capabilities.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.modify_selfservice_permissions({
+    #     resource_id: "DirectoryId", # required
+    #     selfservice_permissions: { # required
+    #       restart_workspace: "ENABLED", # accepts ENABLED, DISABLED
+    #       increase_volume_size: "ENABLED", # accepts ENABLED, DISABLED
+    #       change_compute_type: "ENABLED", # accepts ENABLED, DISABLED
+    #       switch_running_mode: "ENABLED", # accepts ENABLED, DISABLED
+    #       rebuild_workspace: "ENABLED", # accepts ENABLED, DISABLED
+    #     },
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/workspaces-2015-04-08/ModifySelfservicePermissions AWS API Documentation
+    #
+    # @overload modify_selfservice_permissions(params = {})
+    # @param [Hash] params ({})
+    def modify_selfservice_permissions(params = {}, options = {})
+      req = build_request(:modify_selfservice_permissions, params)
+      req.send_request(options)
+    end
+
+    # Specifies which devices and operating systems users can use to access
+    # their Workspaces. For more information, see [ Control Device
+    # Access][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/workspaces/latest/adminguide/update-directory-details.html#control-device-access
+    #
+    # @option params [required, String] :resource_id
+    #   The identifier of the directory.
+    #
+    # @option params [required, Types::WorkspaceAccessProperties] :workspace_access_properties
+    #   The device types and operating systems to enable or disable for
+    #   access.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.modify_workspace_access_properties({
+    #     resource_id: "DirectoryId", # required
+    #     workspace_access_properties: { # required
+    #       device_type_windows: "ALLOW", # accepts ALLOW, DENY
+    #       device_type_osx: "ALLOW", # accepts ALLOW, DENY
+    #       device_type_web: "ALLOW", # accepts ALLOW, DENY
+    #       device_type_ios: "ALLOW", # accepts ALLOW, DENY
+    #       device_type_android: "ALLOW", # accepts ALLOW, DENY
+    #       device_type_chrome_os: "ALLOW", # accepts ALLOW, DENY
+    #       device_type_zero_client: "ALLOW", # accepts ALLOW, DENY
+    #     },
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/workspaces-2015-04-08/ModifyWorkspaceAccessProperties AWS API Documentation
+    #
+    # @overload modify_workspace_access_properties(params = {})
+    # @param [Hash] params ({})
+    def modify_workspace_access_properties(params = {}, options = {})
+      req = build_request(:modify_workspace_access_properties, params)
+      req.send_request(options)
+    end
+
+    # Modify the default properties used to create WorkSpaces.
+    #
+    # @option params [required, String] :resource_id
+    #   The identifier of the directory.
+    #
+    # @option params [required, Types::WorkspaceCreationProperties] :workspace_creation_properties
+    #   The default properties for creating WorkSpaces.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.modify_workspace_creation_properties({
+    #     resource_id: "DirectoryId", # required
+    #     workspace_creation_properties: { # required
+    #       enable_internet_access: false,
+    #       default_ou: "DefaultOu",
+    #       custom_security_group_id: "SecurityGroupId",
+    #       user_enabled_as_local_administrator: false,
+    #       enable_maintenance_mode: false,
+    #     },
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/workspaces-2015-04-08/ModifyWorkspaceCreationProperties AWS API Documentation
+    #
+    # @overload modify_workspace_creation_properties(params = {})
+    # @param [Hash] params ({})
+    def modify_workspace_creation_properties(params = {}, options = {})
+      req = build_request(:modify_workspace_creation_properties, params)
+      req.send_request(options)
+    end
+
     # Modifies the specified WorkSpace properties.
     #
     # @option params [required, String] :workspace_id
@@ -1468,6 +1625,84 @@ module Aws::WorkSpaces
       req.send_request(options)
     end
 
+    # Registers the specified directory. This operation is asynchronous and
+    # returns before the WorkSpace directory is registered. If this is the
+    # first time you are registering a directory, you will need to create
+    # the workspaces\_DefaultRole role before you can register a directory.
+    # For more information, see [ Creating the workspaces\_DefaultRole
+    # Role][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/workspaces/latest/adminguide/workspaces-access-control.html#create-default-role
+    #
+    # @option params [required, String] :directory_id
+    #   The identifier of the directory. You cannot register a directory if it
+    #   does not have a status of Active. If the directory does not have a
+    #   status of Active, you will receive an InvalidResourceStateException
+    #   error. If you have already registered the maximum number of
+    #   directories that you can register with Amazon WorkSpaces, you will
+    #   receive a ResourceLimitExceededException error. Deregister directories
+    #   that you are not using for WorkSpaces, and try again.
+    #
+    # @option params [Array<String>] :subnet_ids
+    #   The identifiers of the subnets for your virtual private cloud (VPC).
+    #   Make sure that the subnets are in supported Availability Zones. The
+    #   subnets must also be in separate Availability Zones. If these
+    #   conditions are not met, you will receive an
+    #   OperationNotSupportedException error.
+    #
+    # @option params [required, Boolean] :enable_work_docs
+    #   Indicates whether Amazon WorkDocs is enabled or disabled. If you have
+    #   enabled this parameter and WorkDocs is not available in the Region,
+    #   you will receive an OperationNotSupportedException error. Set
+    #   `EnableWorkDocs` to disabled, and try again.
+    #
+    # @option params [Boolean] :enable_self_service
+    #   Indicates whether self-service capabilities are enabled or disabled.
+    #
+    # @option params [String] :tenancy
+    #   Indicates whether your WorkSpace directory is dedicated or shared. To
+    #   use Bring Your Own License (BYOL) images, this value must be set to
+    #   `DEDICATED` and your AWS account must be enabled for BYOL. If your
+    #   account has not been enabled for BYOL, you will receive an
+    #   InvalidParameterValuesException error. For more information about BYOL
+    #   images, see [Bring Your Own Windows Desktop Images][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/workspaces/latest/adminguide/byol-windows-images.html
+    #
+    # @option params [Array<Types::Tag>] :tags
+    #   The tags associated with the directory.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.register_workspace_directory({
+    #     directory_id: "DirectoryId", # required
+    #     subnet_ids: ["SubnetId"],
+    #     enable_work_docs: false, # required
+    #     enable_self_service: false,
+    #     tenancy: "DEDICATED", # accepts DEDICATED, SHARED
+    #     tags: [
+    #       {
+    #         key: "TagKey", # required
+    #         value: "TagValue",
+    #       },
+    #     ],
+    #   })
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/workspaces-2015-04-08/RegisterWorkspaceDirectory AWS API Documentation
+    #
+    # @overload register_workspace_directory(params = {})
+    # @param [Hash] params ({})
+    def register_workspace_directory(params = {}, options = {})
+      req = build_request(:register_workspace_directory, params)
+      req.send_request(options)
+    end
+
     # Restores the specified WorkSpace to its last known healthy state.
     #
     # You cannot restore a WorkSpace unless its state is ` AVAILABLE`,
@@ -1695,7 +1930,7 @@ module Aws::WorkSpaces
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-workspaces'
-      context[:gem_version] = '1.30.0'
+      context[:gem_version] = '1.31.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -13,6 +13,7 @@ module Aws::WorkSpaces
 
     ARN = Shapes::StringShape.new(name: 'ARN')
     AccessDeniedException = Shapes::StructureShape.new(name: 'AccessDeniedException')
+    AccessPropertyValue = Shapes::StringShape.new(name: 'AccessPropertyValue')
     AccountModification = Shapes::StructureShape.new(name: 'AccountModification')
     AccountModificationList = Shapes::ListShape.new(name: 'AccountModificationList')
     Alias = Shapes::StringShape.new(name: 'Alias')
@@ -53,6 +54,8 @@ module Aws::WorkSpaces
     DeleteTagsResult = Shapes::StructureShape.new(name: 'DeleteTagsResult')
     DeleteWorkspaceImageRequest = Shapes::StructureShape.new(name: 'DeleteWorkspaceImageRequest')
     DeleteWorkspaceImageResult = Shapes::StructureShape.new(name: 'DeleteWorkspaceImageResult')
+    DeregisterWorkspaceDirectoryRequest = Shapes::StructureShape.new(name: 'DeregisterWorkspaceDirectoryRequest')
+    DeregisterWorkspaceDirectoryResult = Shapes::StructureShape.new(name: 'DeregisterWorkspaceDirectoryResult')
     DescribeAccountModificationsRequest = Shapes::StructureShape.new(name: 'DescribeAccountModificationsRequest')
     DescribeAccountModificationsResult = Shapes::StructureShape.new(name: 'DescribeAccountModificationsResult')
     DescribeAccountRequest = Shapes::StructureShape.new(name: 'DescribeAccountRequest')
@@ -121,6 +124,12 @@ module Aws::WorkSpaces
     ModifyAccountResult = Shapes::StructureShape.new(name: 'ModifyAccountResult')
     ModifyClientPropertiesRequest = Shapes::StructureShape.new(name: 'ModifyClientPropertiesRequest')
     ModifyClientPropertiesResult = Shapes::StructureShape.new(name: 'ModifyClientPropertiesResult')
+    ModifySelfservicePermissionsRequest = Shapes::StructureShape.new(name: 'ModifySelfservicePermissionsRequest')
+    ModifySelfservicePermissionsResult = Shapes::StructureShape.new(name: 'ModifySelfservicePermissionsResult')
+    ModifyWorkspaceAccessPropertiesRequest = Shapes::StructureShape.new(name: 'ModifyWorkspaceAccessPropertiesRequest')
+    ModifyWorkspaceAccessPropertiesResult = Shapes::StructureShape.new(name: 'ModifyWorkspaceAccessPropertiesResult')
+    ModifyWorkspaceCreationPropertiesRequest = Shapes::StructureShape.new(name: 'ModifyWorkspaceCreationPropertiesRequest')
+    ModifyWorkspaceCreationPropertiesResult = Shapes::StructureShape.new(name: 'ModifyWorkspaceCreationPropertiesResult')
     ModifyWorkspacePropertiesRequest = Shapes::StructureShape.new(name: 'ModifyWorkspacePropertiesRequest')
     ModifyWorkspacePropertiesResult = Shapes::StructureShape.new(name: 'ModifyWorkspacePropertiesResult')
     ModifyWorkspaceStateRequest = Shapes::StructureShape.new(name: 'ModifyWorkspaceStateRequest')
@@ -141,6 +150,8 @@ module Aws::WorkSpaces
     RebuildWorkspacesResult = Shapes::StructureShape.new(name: 'RebuildWorkspacesResult')
     ReconnectEnum = Shapes::StringShape.new(name: 'ReconnectEnum')
     Region = Shapes::StringShape.new(name: 'Region')
+    RegisterWorkspaceDirectoryRequest = Shapes::StructureShape.new(name: 'RegisterWorkspaceDirectoryRequest')
+    RegisterWorkspaceDirectoryResult = Shapes::StructureShape.new(name: 'RegisterWorkspaceDirectoryResult')
     RegistrationCode = Shapes::StringShape.new(name: 'RegistrationCode')
     ResourceAlreadyExistsException = Shapes::StructureShape.new(name: 'ResourceAlreadyExistsException')
     ResourceAssociatedException = Shapes::StructureShape.new(name: 'ResourceAssociatedException')
@@ -158,6 +169,7 @@ module Aws::WorkSpaces
     RunningMode = Shapes::StringShape.new(name: 'RunningMode')
     RunningModeAutoStopTimeoutInMinutes = Shapes::IntegerShape.new(name: 'RunningModeAutoStopTimeoutInMinutes')
     SecurityGroupId = Shapes::StringShape.new(name: 'SecurityGroupId')
+    SelfservicePermissions = Shapes::StructureShape.new(name: 'SelfservicePermissions')
     Snapshot = Shapes::StructureShape.new(name: 'Snapshot')
     SnapshotList = Shapes::ListShape.new(name: 'SnapshotList')
     StartRequest = Shapes::StructureShape.new(name: 'StartRequest')
@@ -176,11 +188,13 @@ module Aws::WorkSpaces
     TagList = Shapes::ListShape.new(name: 'TagList')
     TagValue = Shapes::StringShape.new(name: 'TagValue')
     TargetWorkspaceState = Shapes::StringShape.new(name: 'TargetWorkspaceState')
+    Tenancy = Shapes::StringShape.new(name: 'Tenancy')
     TerminateRequest = Shapes::StructureShape.new(name: 'TerminateRequest')
     TerminateWorkspaceRequests = Shapes::ListShape.new(name: 'TerminateWorkspaceRequests')
     TerminateWorkspacesRequest = Shapes::StructureShape.new(name: 'TerminateWorkspacesRequest')
     TerminateWorkspacesResult = Shapes::StructureShape.new(name: 'TerminateWorkspacesResult')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
+    UnsupportedNetworkConfigurationException = Shapes::StructureShape.new(name: 'UnsupportedNetworkConfigurationException')
     UnsupportedWorkspaceConfigurationException = Shapes::StructureShape.new(name: 'UnsupportedWorkspaceConfigurationException')
     UpdateRulesOfIpGroupRequest = Shapes::StructureShape.new(name: 'UpdateRulesOfIpGroupRequest')
     UpdateRulesOfIpGroupResult = Shapes::StructureShape.new(name: 'UpdateRulesOfIpGroupResult')
@@ -189,9 +203,11 @@ module Aws::WorkSpaces
     UserVolumeSizeGib = Shapes::IntegerShape.new(name: 'UserVolumeSizeGib')
     VolumeEncryptionKey = Shapes::StringShape.new(name: 'VolumeEncryptionKey')
     Workspace = Shapes::StructureShape.new(name: 'Workspace')
+    WorkspaceAccessProperties = Shapes::StructureShape.new(name: 'WorkspaceAccessProperties')
     WorkspaceBundle = Shapes::StructureShape.new(name: 'WorkspaceBundle')
     WorkspaceConnectionStatus = Shapes::StructureShape.new(name: 'WorkspaceConnectionStatus')
     WorkspaceConnectionStatusList = Shapes::ListShape.new(name: 'WorkspaceConnectionStatusList')
+    WorkspaceCreationProperties = Shapes::StructureShape.new(name: 'WorkspaceCreationProperties')
     WorkspaceDirectory = Shapes::StructureShape.new(name: 'WorkspaceDirectory')
     WorkspaceDirectoryState = Shapes::StringShape.new(name: 'WorkspaceDirectoryState')
     WorkspaceDirectoryType = Shapes::StringShape.new(name: 'WorkspaceDirectoryType')
@@ -213,6 +229,7 @@ module Aws::WorkSpaces
     WorkspaceRequest = Shapes::StructureShape.new(name: 'WorkspaceRequest')
     WorkspaceRequestList = Shapes::ListShape.new(name: 'WorkspaceRequestList')
     WorkspaceState = Shapes::StringShape.new(name: 'WorkspaceState')
+    WorkspacesDefaultRoleNotFoundException = Shapes::StructureShape.new(name: 'WorkspacesDefaultRoleNotFoundException')
     WorkspacesIpGroup = Shapes::StructureShape.new(name: 'WorkspacesIpGroup')
     WorkspacesIpGroupsList = Shapes::ListShape.new(name: 'WorkspacesIpGroupsList')
 
@@ -296,6 +313,7 @@ module Aws::WorkSpaces
     DefaultWorkspaceCreationProperties.add_member(:default_ou, Shapes::ShapeRef.new(shape: DefaultOu, location_name: "DefaultOu"))
     DefaultWorkspaceCreationProperties.add_member(:custom_security_group_id, Shapes::ShapeRef.new(shape: SecurityGroupId, location_name: "CustomSecurityGroupId"))
     DefaultWorkspaceCreationProperties.add_member(:user_enabled_as_local_administrator, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "UserEnabledAsLocalAdministrator"))
+    DefaultWorkspaceCreationProperties.add_member(:enable_maintenance_mode, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "EnableMaintenanceMode"))
     DefaultWorkspaceCreationProperties.struct_class = Types::DefaultWorkspaceCreationProperties
 
     DeleteIpGroupRequest.add_member(:group_id, Shapes::ShapeRef.new(shape: IpGroupId, required: true, location_name: "GroupId"))
@@ -314,6 +332,11 @@ module Aws::WorkSpaces
 
     DeleteWorkspaceImageResult.struct_class = Types::DeleteWorkspaceImageResult
 
+    DeregisterWorkspaceDirectoryRequest.add_member(:directory_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "DirectoryId"))
+    DeregisterWorkspaceDirectoryRequest.struct_class = Types::DeregisterWorkspaceDirectoryRequest
+
+    DeregisterWorkspaceDirectoryResult.struct_class = Types::DeregisterWorkspaceDirectoryResult
+
     DescribeAccountModificationsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: PaginationToken, location_name: "NextToken"))
     DescribeAccountModificationsRequest.struct_class = Types::DescribeAccountModificationsRequest
 
@@ -358,6 +381,7 @@ module Aws::WorkSpaces
     DescribeWorkspaceBundlesResult.struct_class = Types::DescribeWorkspaceBundlesResult
 
     DescribeWorkspaceDirectoriesRequest.add_member(:directory_ids, Shapes::ShapeRef.new(shape: DirectoryIdList, location_name: "DirectoryIds"))
+    DescribeWorkspaceDirectoriesRequest.add_member(:limit, Shapes::ShapeRef.new(shape: Limit, location_name: "Limit"))
     DescribeWorkspaceDirectoriesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: PaginationToken, location_name: "NextToken"))
     DescribeWorkspaceDirectoriesRequest.struct_class = Types::DescribeWorkspaceDirectoriesRequest
 
@@ -488,6 +512,24 @@ module Aws::WorkSpaces
 
     ModifyClientPropertiesResult.struct_class = Types::ModifyClientPropertiesResult
 
+    ModifySelfservicePermissionsRequest.add_member(:resource_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "ResourceId"))
+    ModifySelfservicePermissionsRequest.add_member(:selfservice_permissions, Shapes::ShapeRef.new(shape: SelfservicePermissions, required: true, location_name: "SelfservicePermissions"))
+    ModifySelfservicePermissionsRequest.struct_class = Types::ModifySelfservicePermissionsRequest
+
+    ModifySelfservicePermissionsResult.struct_class = Types::ModifySelfservicePermissionsResult
+
+    ModifyWorkspaceAccessPropertiesRequest.add_member(:resource_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "ResourceId"))
+    ModifyWorkspaceAccessPropertiesRequest.add_member(:workspace_access_properties, Shapes::ShapeRef.new(shape: WorkspaceAccessProperties, required: true, location_name: "WorkspaceAccessProperties"))
+    ModifyWorkspaceAccessPropertiesRequest.struct_class = Types::ModifyWorkspaceAccessPropertiesRequest
+
+    ModifyWorkspaceAccessPropertiesResult.struct_class = Types::ModifyWorkspaceAccessPropertiesResult
+
+    ModifyWorkspaceCreationPropertiesRequest.add_member(:resource_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "ResourceId"))
+    ModifyWorkspaceCreationPropertiesRequest.add_member(:workspace_creation_properties, Shapes::ShapeRef.new(shape: WorkspaceCreationProperties, required: true, location_name: "WorkspaceCreationProperties"))
+    ModifyWorkspaceCreationPropertiesRequest.struct_class = Types::ModifyWorkspaceCreationPropertiesRequest
+
+    ModifyWorkspaceCreationPropertiesResult.struct_class = Types::ModifyWorkspaceCreationPropertiesResult
+
     ModifyWorkspacePropertiesRequest.add_member(:workspace_id, Shapes::ShapeRef.new(shape: WorkspaceId, required: true, location_name: "WorkspaceId"))
     ModifyWorkspacePropertiesRequest.add_member(:workspace_properties, Shapes::ShapeRef.new(shape: WorkspaceProperties, required: true, location_name: "WorkspaceProperties"))
     ModifyWorkspacePropertiesRequest.struct_class = Types::ModifyWorkspacePropertiesRequest
@@ -531,6 +573,16 @@ module Aws::WorkSpaces
     RebuildWorkspacesResult.add_member(:failed_requests, Shapes::ShapeRef.new(shape: FailedRebuildWorkspaceRequests, location_name: "FailedRequests"))
     RebuildWorkspacesResult.struct_class = Types::RebuildWorkspacesResult
 
+    RegisterWorkspaceDirectoryRequest.add_member(:directory_id, Shapes::ShapeRef.new(shape: DirectoryId, required: true, location_name: "DirectoryId"))
+    RegisterWorkspaceDirectoryRequest.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIds, location_name: "SubnetIds"))
+    RegisterWorkspaceDirectoryRequest.add_member(:enable_work_docs, Shapes::ShapeRef.new(shape: BooleanObject, required: true, location_name: "EnableWorkDocs"))
+    RegisterWorkspaceDirectoryRequest.add_member(:enable_self_service, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "EnableSelfService"))
+    RegisterWorkspaceDirectoryRequest.add_member(:tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "Tenancy"))
+    RegisterWorkspaceDirectoryRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
+    RegisterWorkspaceDirectoryRequest.struct_class = Types::RegisterWorkspaceDirectoryRequest
+
+    RegisterWorkspaceDirectoryResult.struct_class = Types::RegisterWorkspaceDirectoryResult
+
     ResourceAlreadyExistsException.add_member(:message, Shapes::ShapeRef.new(shape: ExceptionMessage, location_name: "message"))
     ResourceAlreadyExistsException.struct_class = Types::ResourceAlreadyExistsException
 
@@ -567,6 +619,13 @@ module Aws::WorkSpaces
     RootStorage.add_member(:capacity, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "Capacity"))
     RootStorage.struct_class = Types::RootStorage
 
+    SelfservicePermissions.add_member(:restart_workspace, Shapes::ShapeRef.new(shape: ReconnectEnum, location_name: "RestartWorkspace"))
+    SelfservicePermissions.add_member(:increase_volume_size, Shapes::ShapeRef.new(shape: ReconnectEnum, location_name: "IncreaseVolumeSize"))
+    SelfservicePermissions.add_member(:change_compute_type, Shapes::ShapeRef.new(shape: ReconnectEnum, location_name: "ChangeComputeType"))
+    SelfservicePermissions.add_member(:switch_running_mode, Shapes::ShapeRef.new(shape: ReconnectEnum, location_name: "SwitchRunningMode"))
+    SelfservicePermissions.add_member(:rebuild_workspace, Shapes::ShapeRef.new(shape: ReconnectEnum, location_name: "RebuildWorkspace"))
+    SelfservicePermissions.struct_class = Types::SelfservicePermissions
+
     Snapshot.add_member(:snapshot_time, Shapes::ShapeRef.new(shape: Timestamp, location_name: "SnapshotTime"))
     Snapshot.struct_class = Types::Snapshot
 
@@ -615,6 +674,9 @@ module Aws::WorkSpaces
     TerminateWorkspacesResult.add_member(:failed_requests, Shapes::ShapeRef.new(shape: FailedTerminateWorkspaceRequests, location_name: "FailedRequests"))
     TerminateWorkspacesResult.struct_class = Types::TerminateWorkspacesResult
 
+    UnsupportedNetworkConfigurationException.add_member(:message, Shapes::ShapeRef.new(shape: ExceptionMessage, location_name: "message"))
+    UnsupportedNetworkConfigurationException.struct_class = Types::UnsupportedNetworkConfigurationException
+
     UnsupportedWorkspaceConfigurationException.add_member(:message, Shapes::ShapeRef.new(shape: ExceptionMessage, location_name: "message"))
     UnsupportedWorkspaceConfigurationException.struct_class = Types::UnsupportedWorkspaceConfigurationException
 
@@ -644,6 +706,15 @@ module Aws::WorkSpaces
     Workspace.add_member(:modification_states, Shapes::ShapeRef.new(shape: ModificationStateList, location_name: "ModificationStates"))
     Workspace.struct_class = Types::Workspace
 
+    WorkspaceAccessProperties.add_member(:device_type_windows, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeWindows"))
+    WorkspaceAccessProperties.add_member(:device_type_osx, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeOsx"))
+    WorkspaceAccessProperties.add_member(:device_type_web, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeWeb"))
+    WorkspaceAccessProperties.add_member(:device_type_ios, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeIos"))
+    WorkspaceAccessProperties.add_member(:device_type_android, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeAndroid"))
+    WorkspaceAccessProperties.add_member(:device_type_chrome_os, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeChromeOs"))
+    WorkspaceAccessProperties.add_member(:device_type_zero_client, Shapes::ShapeRef.new(shape: AccessPropertyValue, location_name: "DeviceTypeZeroClient"))
+    WorkspaceAccessProperties.struct_class = Types::WorkspaceAccessProperties
+
     WorkspaceBundle.add_member(:bundle_id, Shapes::ShapeRef.new(shape: BundleId, location_name: "BundleId"))
     WorkspaceBundle.add_member(:name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "Name"))
     WorkspaceBundle.add_member(:owner, Shapes::ShapeRef.new(shape: BundleOwner, location_name: "Owner"))
@@ -661,6 +732,13 @@ module Aws::WorkSpaces
 
     WorkspaceConnectionStatusList.member = Shapes::ShapeRef.new(shape: WorkspaceConnectionStatus)
 
+    WorkspaceCreationProperties.add_member(:enable_internet_access, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "EnableInternetAccess"))
+    WorkspaceCreationProperties.add_member(:default_ou, Shapes::ShapeRef.new(shape: DefaultOu, location_name: "DefaultOu"))
+    WorkspaceCreationProperties.add_member(:custom_security_group_id, Shapes::ShapeRef.new(shape: SecurityGroupId, location_name: "CustomSecurityGroupId"))
+    WorkspaceCreationProperties.add_member(:user_enabled_as_local_administrator, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "UserEnabledAsLocalAdministrator"))
+    WorkspaceCreationProperties.add_member(:enable_maintenance_mode, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "EnableMaintenanceMode"))
+    WorkspaceCreationProperties.struct_class = Types::WorkspaceCreationProperties
+
     WorkspaceDirectory.add_member(:directory_id, Shapes::ShapeRef.new(shape: DirectoryId, location_name: "DirectoryId"))
     WorkspaceDirectory.add_member(:alias, Shapes::ShapeRef.new(shape: Alias, location_name: "Alias"))
     WorkspaceDirectory.add_member(:directory_name, Shapes::ShapeRef.new(shape: DirectoryName, location_name: "DirectoryName"))
@@ -674,6 +752,9 @@ module Aws::WorkSpaces
     WorkspaceDirectory.add_member(:state, Shapes::ShapeRef.new(shape: WorkspaceDirectoryState, location_name: "State"))
     WorkspaceDirectory.add_member(:workspace_creation_properties, Shapes::ShapeRef.new(shape: DefaultWorkspaceCreationProperties, location_name: "WorkspaceCreationProperties"))
     WorkspaceDirectory.add_member(:ip_group_ids, Shapes::ShapeRef.new(shape: IpGroupIdList, location_name: "ipGroupIds"))
+    WorkspaceDirectory.add_member(:workspace_access_properties, Shapes::ShapeRef.new(shape: WorkspaceAccessProperties, location_name: "WorkspaceAccessProperties"))
+    WorkspaceDirectory.add_member(:tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "Tenancy"))
+    WorkspaceDirectory.add_member(:selfservice_permissions, Shapes::ShapeRef.new(shape: SelfservicePermissions, location_name: "SelfservicePermissions"))
     WorkspaceDirectory.struct_class = Types::WorkspaceDirectory
 
     WorkspaceIdList.member = Shapes::ShapeRef.new(shape: WorkspaceId)
@@ -713,6 +794,9 @@ module Aws::WorkSpaces
 
     WorkspaceRequestList.member = Shapes::ShapeRef.new(shape: WorkspaceRequest)
 
+    WorkspacesDefaultRoleNotFoundException.add_member(:message, Shapes::ShapeRef.new(shape: ExceptionMessage, location_name: "message"))
+    WorkspacesDefaultRoleNotFoundException.struct_class = Types::WorkspacesDefaultRoleNotFoundException
+
     WorkspacesIpGroup.add_member(:group_id, Shapes::ShapeRef.new(shape: IpGroupId, location_name: "groupId"))
     WorkspacesIpGroup.add_member(:group_name, Shapes::ShapeRef.new(shape: IpGroupName, location_name: "groupName"))
     WorkspacesIpGroup.add_member(:group_desc, Shapes::ShapeRef.new(shape: IpGroupDesc, location_name: "groupDesc"))
@@ -848,6 +932,19 @@ module Aws::WorkSpaces
         o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
       end)
 
+      api.add_operation(:deregister_workspace_directory, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeregisterWorkspaceDirectory"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeregisterWorkspaceDirectoryRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeregisterWorkspaceDirectoryResult)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValuesException)
+        o.errors << Shapes::ShapeRef.new(shape: OperationNotSupportedException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidResourceStateException)
+      end)
+
       api.add_operation(:describe_account, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeAccount"
         o.http_method = "POST"
@@ -1029,6 +1126,38 @@ module Aws::WorkSpaces
         o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
       end)
 
+      api.add_operation(:modify_selfservice_permissions, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifySelfservicePermissions"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifySelfservicePermissionsRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifySelfservicePermissionsResult)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValuesException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+      end)
+
+      api.add_operation(:modify_workspace_access_properties, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyWorkspaceAccessProperties"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyWorkspaceAccessPropertiesRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyWorkspaceAccessPropertiesResult)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+      end)
+
+      api.add_operation(:modify_workspace_creation_properties, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyWorkspaceCreationProperties"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyWorkspaceCreationPropertiesRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyWorkspaceCreationPropertiesResult)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValuesException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+      end)
+
       api.add_operation(:modify_workspace_properties, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyWorkspaceProperties"
         o.http_method = "POST"
@@ -1071,6 +1200,22 @@ module Aws::WorkSpaces
         o.output = Shapes::ShapeRef.new(shape: RebuildWorkspacesResult)
       end)
 
+      api.add_operation(:register_workspace_directory, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "RegisterWorkspaceDirectory"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: RegisterWorkspaceDirectoryRequest)
+        o.output = Shapes::ShapeRef.new(shape: RegisterWorkspaceDirectoryResult)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValuesException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceLimitExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: WorkspacesDefaultRoleNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidResourceStateException)
+        o.errors << Shapes::ShapeRef.new(shape: UnsupportedNetworkConfigurationException)
+        o.errors << Shapes::ShapeRef.new(shape: OperationNotSupportedException)
+      end)
+
       api.add_operation(:restore_workspace, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RestoreWorkspace"
         o.http_method = "POST"