diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -365,9 +365,3 @@ for such a notice. You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.3.2` +`1.3.3` ## Description diff --git a/amazonka-workspaces.cabal b/amazonka-workspaces.cabal --- a/amazonka-workspaces.cabal +++ b/amazonka-workspaces.cabal @@ -1,5 +1,5 @@ name: amazonka-workspaces -version: 1.3.2 +version: 1.3.3 synopsis: Amazon WorkSpaces SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -60,7 +60,7 @@ , Network.AWS.WorkSpaces.Types.Sum build-depends: - amazonka-core == 1.3.2.* + amazonka-core == 1.3.3.* , base >= 4.7 && < 5 test-suite amazonka-workspaces-test @@ -80,9 +80,9 @@ , Test.AWS.WorkSpaces.Internal build-depends: - amazonka-core == 1.3.2.* - , amazonka-test == 1.3.2.* - , amazonka-workspaces == 1.3.2.* + amazonka-core == 1.3.3.* + , amazonka-test == 1.3.3.* + , amazonka-workspaces == 1.3.3.* , base , bytestring , lens diff --git a/gen/Network/AWS/WorkSpaces.hs b/gen/Network/AWS/WorkSpaces.hs --- a/gen/Network/AWS/WorkSpaces.hs +++ b/gen/Network/AWS/WorkSpaces.hs @@ -133,8 +133,12 @@ , wUserName , wSubnetId , wBundleId + , wRootVolumeEncryptionEnabled , wErrorCode + , wVolumeEncryptionKey + , wComputerName , wWorkspaceId + , wUserVolumeEncryptionEnabled , wErrorMessage -- ** WorkspaceBundle @@ -166,6 +170,9 @@ -- ** WorkspaceRequest , WorkspaceRequest , workspaceRequest + , wrRootVolumeEncryptionEnabled + , wrVolumeEncryptionKey + , wrUserVolumeEncryptionEnabled , wrDirectoryId , wrUserName , wrBundleId diff --git a/gen/Network/AWS/WorkSpaces/Types.hs b/gen/Network/AWS/WorkSpaces/Types.hs --- a/gen/Network/AWS/WorkSpaces/Types.hs +++ b/gen/Network/AWS/WorkSpaces/Types.hs @@ -89,8 +89,12 @@ , wUserName , wSubnetId , wBundleId + , wRootVolumeEncryptionEnabled , wErrorCode + , wVolumeEncryptionKey + , wComputerName , wWorkspaceId + , wUserVolumeEncryptionEnabled , wErrorMessage -- * WorkspaceBundle @@ -122,6 +126,9 @@ -- * WorkspaceRequest , WorkspaceRequest , workspaceRequest + , wrRootVolumeEncryptionEnabled + , wrVolumeEncryptionKey + , wrUserVolumeEncryptionEnabled , wrDirectoryId , wrUserName , wrBundleId diff --git a/gen/Network/AWS/WorkSpaces/Types/Product.hs b/gen/Network/AWS/WorkSpaces/Types/Product.hs --- a/gen/Network/AWS/WorkSpaces/Types/Product.hs +++ b/gen/Network/AWS/WorkSpaces/Types/Product.hs @@ -337,15 +337,19 @@ -- -- /See:/ 'workspace' smart constructor. data Workspace = Workspace' - { _wDirectoryId :: !(Maybe Text) - , _wState :: !(Maybe WorkspaceState) - , _wIPAddress :: !(Maybe Text) - , _wUserName :: !(Maybe Text) - , _wSubnetId :: !(Maybe Text) - , _wBundleId :: !(Maybe Text) - , _wErrorCode :: !(Maybe Text) - , _wWorkspaceId :: !(Maybe Text) - , _wErrorMessage :: !(Maybe Text) + { _wDirectoryId :: !(Maybe Text) + , _wState :: !(Maybe WorkspaceState) + , _wIPAddress :: !(Maybe Text) + , _wUserName :: !(Maybe Text) + , _wSubnetId :: !(Maybe Text) + , _wBundleId :: !(Maybe Text) + , _wRootVolumeEncryptionEnabled :: !(Maybe Bool) + , _wErrorCode :: !(Maybe Text) + , _wVolumeEncryptionKey :: !(Maybe Text) + , _wComputerName :: !(Maybe Text) + , _wWorkspaceId :: !(Maybe Text) + , _wUserVolumeEncryptionEnabled :: !(Maybe Bool) + , _wErrorMessage :: !(Maybe Text) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'Workspace' with the minimum fields required to make a request. @@ -364,10 +368,18 @@ -- -- * 'wBundleId' -- +-- * 'wRootVolumeEncryptionEnabled' +-- -- * 'wErrorCode' -- +-- * 'wVolumeEncryptionKey' +-- +-- * 'wComputerName' +-- -- * 'wWorkspaceId' -- +-- * 'wUserVolumeEncryptionEnabled' +-- -- * 'wErrorMessage' workspace :: Workspace @@ -379,8 +391,12 @@ , _wUserName = Nothing , _wSubnetId = Nothing , _wBundleId = Nothing + , _wRootVolumeEncryptionEnabled = Nothing , _wErrorCode = Nothing + , _wVolumeEncryptionKey = Nothing + , _wComputerName = Nothing , _wWorkspaceId = Nothing + , _wUserVolumeEncryptionEnabled = Nothing , _wErrorMessage = Nothing } @@ -409,14 +425,32 @@ wBundleId :: Lens' Workspace (Maybe Text) wBundleId = lens _wBundleId (\ s a -> s{_wBundleId = a}); +-- | Specifies whether the data stored on the root volume, or C: drive, is +-- encrypted. +wRootVolumeEncryptionEnabled :: Lens' Workspace (Maybe Bool) +wRootVolumeEncryptionEnabled = lens _wRootVolumeEncryptionEnabled (\ s a -> s{_wRootVolumeEncryptionEnabled = a}); + -- | If the WorkSpace could not be created, this contains the error code. wErrorCode :: Lens' Workspace (Maybe Text) wErrorCode = lens _wErrorCode (\ s a -> s{_wErrorCode = a}); +-- | The KMS key used to encrypt data stored on your WorkSpace. +wVolumeEncryptionKey :: Lens' Workspace (Maybe Text) +wVolumeEncryptionKey = lens _wVolumeEncryptionKey (\ s a -> s{_wVolumeEncryptionKey = a}); + +-- | The name of the WorkSpace as seen by the operating system. +wComputerName :: Lens' Workspace (Maybe Text) +wComputerName = lens _wComputerName (\ s a -> s{_wComputerName = a}); + -- | The identifier of the WorkSpace. wWorkspaceId :: Lens' Workspace (Maybe Text) wWorkspaceId = lens _wWorkspaceId (\ s a -> s{_wWorkspaceId = a}); +-- | Specifies whether the data stored on the user volume, or D: drive, is +-- encrypted. +wUserVolumeEncryptionEnabled :: Lens' Workspace (Maybe Bool) +wUserVolumeEncryptionEnabled = lens _wUserVolumeEncryptionEnabled (\ s a -> s{_wUserVolumeEncryptionEnabled = a}); + -- | If the WorkSpace could not be created, this contains a textual error -- message that describes the failure. wErrorMessage :: Lens' Workspace (Maybe Text) @@ -432,8 +466,12 @@ <*> (x .:? "UserName") <*> (x .:? "SubnetId") <*> (x .:? "BundleId") + <*> (x .:? "RootVolumeEncryptionEnabled") <*> (x .:? "ErrorCode") + <*> (x .:? "VolumeEncryptionKey") + <*> (x .:? "ComputerName") <*> (x .:? "WorkspaceId") + <*> (x .:? "UserVolumeEncryptionEnabled") <*> (x .:? "ErrorMessage")) -- | Contains information about a WorkSpace bundle. @@ -652,15 +690,24 @@ -- -- /See:/ 'workspaceRequest' smart constructor. data WorkspaceRequest = WorkspaceRequest' - { _wrDirectoryId :: !Text - , _wrUserName :: !Text - , _wrBundleId :: !Text + { _wrRootVolumeEncryptionEnabled :: !(Maybe Bool) + , _wrVolumeEncryptionKey :: !(Maybe Text) + , _wrUserVolumeEncryptionEnabled :: !(Maybe Bool) + , _wrDirectoryId :: !Text + , _wrUserName :: !Text + , _wrBundleId :: !Text } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'WorkspaceRequest' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- +-- * 'wrRootVolumeEncryptionEnabled' +-- +-- * 'wrVolumeEncryptionKey' +-- +-- * 'wrUserVolumeEncryptionEnabled' +-- -- * 'wrDirectoryId' -- -- * 'wrUserName' @@ -673,11 +720,28 @@ -> WorkspaceRequest workspaceRequest pDirectoryId_ pUserName_ pBundleId_ = WorkspaceRequest' - { _wrDirectoryId = pDirectoryId_ + { _wrRootVolumeEncryptionEnabled = Nothing + , _wrVolumeEncryptionKey = Nothing + , _wrUserVolumeEncryptionEnabled = Nothing + , _wrDirectoryId = pDirectoryId_ , _wrUserName = pUserName_ , _wrBundleId = pBundleId_ } +-- | Specifies whether the data stored on the root volume, or C: drive, is +-- encrypted. +wrRootVolumeEncryptionEnabled :: Lens' WorkspaceRequest (Maybe Bool) +wrRootVolumeEncryptionEnabled = lens _wrRootVolumeEncryptionEnabled (\ s a -> s{_wrRootVolumeEncryptionEnabled = a}); + +-- | The KMS key used to encrypt data stored on your WorkSpace. +wrVolumeEncryptionKey :: Lens' WorkspaceRequest (Maybe Text) +wrVolumeEncryptionKey = lens _wrVolumeEncryptionKey (\ s a -> s{_wrVolumeEncryptionKey = a}); + +-- | Specifies whether the data stored on the user volume, or D: drive, is +-- encrypted. +wrUserVolumeEncryptionEnabled :: Lens' WorkspaceRequest (Maybe Bool) +wrUserVolumeEncryptionEnabled = lens _wrUserVolumeEncryptionEnabled (\ s a -> s{_wrUserVolumeEncryptionEnabled = a}); + -- | The identifier of the AWS Directory Service directory to create the -- WorkSpace in. You can use the DescribeWorkspaceDirectories operation to -- obtain a list of the directories that are available. @@ -701,13 +765,23 @@ = withObject "WorkspaceRequest" (\ x -> WorkspaceRequest' <$> - (x .: "DirectoryId") <*> (x .: "UserName") <*> - (x .: "BundleId")) + (x .:? "RootVolumeEncryptionEnabled") <*> + (x .:? "VolumeEncryptionKey") + <*> (x .:? "UserVolumeEncryptionEnabled") + <*> (x .: "DirectoryId") + <*> (x .: "UserName") + <*> (x .: "BundleId")) instance ToJSON WorkspaceRequest where toJSON WorkspaceRequest'{..} = object (catMaybes - [Just ("DirectoryId" .= _wrDirectoryId), + [("RootVolumeEncryptionEnabled" .=) <$> + _wrRootVolumeEncryptionEnabled, + ("VolumeEncryptionKey" .=) <$> + _wrVolumeEncryptionKey, + ("UserVolumeEncryptionEnabled" .=) <$> + _wrUserVolumeEncryptionEnabled, + Just ("DirectoryId" .= _wrDirectoryId), Just ("UserName" .= _wrUserName), Just ("BundleId" .= _wrBundleId)])