diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.5.0`
+`1.6.0`
 
 
 ## Description
diff --git a/amazonka-inspector.cabal b/amazonka-inspector.cabal
--- a/amazonka-inspector.cabal
+++ b/amazonka-inspector.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-inspector
-version:               1.5.0
+version:               1.6.0
 synopsis:              Amazon Inspector SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -7,7 +7,7 @@
 license-file:          LICENSE
 author:                Brendan Hay
 maintainer:            Brendan Hay <brendan.g.hay+amazonka@gmail.com>
-copyright:             Copyright (c) 2013-2017 Brendan Hay
+copyright:             Copyright (c) 2013-2018 Brendan Hay
 category:              Network, AWS, Cloud, Distributed Computing
 build-type:            Simple
 cabal-version:         >= 1.10
@@ -86,7 +86,7 @@
         , Network.AWS.Inspector.Types.Sum
 
     build-depends:
-          amazonka-core == 1.5.0.*
+          amazonka-core == 1.6.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-inspector-test
@@ -106,8 +106,8 @@
         , Test.AWS.Inspector.Internal
 
     build-depends:
-          amazonka-core == 1.5.0.*
-        , amazonka-test == 1.5.0.*
+          amazonka-core == 1.6.0.*
+        , amazonka-test == 1.6.0.*
         , amazonka-inspector
         , base
         , bytestring
diff --git a/gen/Network/AWS/Inspector.hs b/gen/Network/AWS/Inspector.hs
--- a/gen/Network/AWS/Inspector.hs
+++ b/gen/Network/AWS/Inspector.hs
@@ -5,7 +5,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -59,16 +59,16 @@
     -- ** GetTelemetryMetadata
     , module Network.AWS.Inspector.GetTelemetryMetadata
 
-    -- ** ListFindings
+    -- ** ListFindings (Paginated)
     , module Network.AWS.Inspector.ListFindings
 
-    -- ** ListAssessmentTemplates
+    -- ** ListAssessmentTemplates (Paginated)
     , module Network.AWS.Inspector.ListAssessmentTemplates
 
     -- ** SubscribeToEvent
     , module Network.AWS.Inspector.SubscribeToEvent
 
-    -- ** ListAssessmentRunAgents
+    -- ** ListAssessmentRunAgents (Paginated)
     , module Network.AWS.Inspector.ListAssessmentRunAgents
 
     -- ** StartAssessmentRun
@@ -98,13 +98,13 @@
     -- ** CreateAssessmentTarget
     , module Network.AWS.Inspector.CreateAssessmentTarget
 
-    -- ** ListEventSubscriptions
+    -- ** ListEventSubscriptions (Paginated)
     , module Network.AWS.Inspector.ListEventSubscriptions
 
     -- ** RegisterCrossAccountAccessRole
     , module Network.AWS.Inspector.RegisterCrossAccountAccessRole
 
-    -- ** ListAssessmentTargets
+    -- ** ListAssessmentTargets (Paginated)
     , module Network.AWS.Inspector.ListAssessmentTargets
 
     -- ** CreateResourceGroup
@@ -116,7 +116,7 @@
     -- ** StopAssessmentRun
     , module Network.AWS.Inspector.StopAssessmentRun
 
-    -- ** PreviewAgents
+    -- ** PreviewAgents (Paginated)
     , module Network.AWS.Inspector.PreviewAgents
 
     -- ** DescribeFindings
@@ -134,13 +134,13 @@
     -- ** DeleteAssessmentRun
     , module Network.AWS.Inspector.DeleteAssessmentRun
 
-    -- ** ListAssessmentRuns
+    -- ** ListAssessmentRuns (Paginated)
     , module Network.AWS.Inspector.ListAssessmentRuns
 
     -- ** GetAssessmentReport
     , module Network.AWS.Inspector.GetAssessmentReport
 
-    -- ** ListRulesPackages
+    -- ** ListRulesPackages (Paginated)
     , module Network.AWS.Inspector.ListRulesPackages
 
     -- ** DescribeAssessmentRuns
@@ -205,7 +205,13 @@
     -- ** AgentPreview
     , AgentPreview
     , agentPreview
+    , apHostname
     , apAutoScalingGroup
+    , apOperatingSystem
+    , apAgentVersion
+    , apKernelVersion
+    , apAgentHealth
+    , apIpv4Address
     , apAgentId
 
     -- ** AssessmentRun
@@ -282,12 +288,14 @@
     -- ** AssessmentTemplate
     , AssessmentTemplate
     , assessmentTemplate
+    , atLastAssessmentRunARN
     , atArn
     , atName
     , atAssessmentTargetARN
     , atDurationInSeconds
     , atRulesPackageARNs
     , atUserAttributesForFindings
+    , atAssessmentRunCount
     , atCreatedAt
 
     -- ** AssessmentTemplateFilter
diff --git a/gen/Network/AWS/Inspector/AddAttributesToFindings.hs b/gen/Network/AWS/Inspector/AddAttributesToFindings.hs
--- a/gen/Network/AWS/Inspector/AddAttributesToFindings.hs
+++ b/gen/Network/AWS/Inspector/AddAttributesToFindings.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.AddAttributesToFindings
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,16 +64,16 @@
     -> AddAttributesToFindings
 addAttributesToFindings pFindingARNs_ =
   AddAttributesToFindings'
-  {_aatfFindingARNs = _List1 # pFindingARNs_, _aatfAttributes = mempty}
+    {_aatfFindingARNs = _List1 # pFindingARNs_, _aatfAttributes = mempty}
 
 
 -- | The ARNs that specify the findings that you want to assign attributes to.
 aatfFindingARNs :: Lens' AddAttributesToFindings (NonEmpty Text)
-aatfFindingARNs = lens _aatfFindingARNs (\ s a -> s{_aatfFindingARNs = a}) . _List1;
+aatfFindingARNs = lens _aatfFindingARNs (\ s a -> s{_aatfFindingARNs = a}) . _List1
 
 -- | The array of attributes that you want to assign to specified findings.
 aatfAttributes :: Lens' AddAttributesToFindings [Attribute]
-aatfAttributes = lens _aatfAttributes (\ s a -> s{_aatfAttributes = a}) . _Coerce;
+aatfAttributes = lens _aatfAttributes (\ s a -> s{_aatfAttributes = a}) . _Coerce
 
 instance AWSRequest AddAttributesToFindings where
         type Rs AddAttributesToFindings =
@@ -132,15 +132,15 @@
     -> AddAttributesToFindingsResponse
 addAttributesToFindingsResponse pResponseStatus_ =
   AddAttributesToFindingsResponse'
-  {_aatfrsResponseStatus = pResponseStatus_, _aatfrsFailedItems = mempty}
+    {_aatfrsResponseStatus = pResponseStatus_, _aatfrsFailedItems = mempty}
 
 
 -- | -- | The response status code.
 aatfrsResponseStatus :: Lens' AddAttributesToFindingsResponse Int
-aatfrsResponseStatus = lens _aatfrsResponseStatus (\ s a -> s{_aatfrsResponseStatus = a});
+aatfrsResponseStatus = lens _aatfrsResponseStatus (\ s a -> s{_aatfrsResponseStatus = a})
 
 -- | Attribute details that cannot be described. An error code is provided for each failed item.
 aatfrsFailedItems :: Lens' AddAttributesToFindingsResponse (HashMap Text FailedItemDetails)
-aatfrsFailedItems = lens _aatfrsFailedItems (\ s a -> s{_aatfrsFailedItems = a}) . _Map;
+aatfrsFailedItems = lens _aatfrsFailedItems (\ s a -> s{_aatfrsFailedItems = a}) . _Map
 
 instance NFData AddAttributesToFindingsResponse where
diff --git a/gen/Network/AWS/Inspector/CreateAssessmentTarget.hs b/gen/Network/AWS/Inspector/CreateAssessmentTarget.hs
--- a/gen/Network/AWS/Inspector/CreateAssessmentTarget.hs
+++ b/gen/Network/AWS/Inspector/CreateAssessmentTarget.hs
@@ -12,13 +12,13 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.CreateAssessmentTarget
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Creates a new assessment target using the ARN of the resource group that is generated by 'CreateResourceGroup' . You can create up to 50 assessment targets per AWS account. You can run up to 500 concurrent agents per AWS account. For more information, see <http://docs.aws.amazon.com/inspector/latest/userguide/inspector_applications.html Amazon Inspector Assessment Targets> .
+-- Creates a new assessment target using the ARN of the resource group that is generated by 'CreateResourceGroup' . If the <https://docs.aws.amazon.com/inspector/latest/userguide/inspector_slr.html service-linked role> isn’t already registered, also creates and registers a service-linked role to grant Amazon Inspector access to AWS Services needed to perform security assessments. You can create up to 50 assessment targets per AWS account. You can run up to 500 concurrent agents per AWS account. For more information, see <http://docs.aws.amazon.com/inspector/latest/userguide/inspector_applications.html Amazon Inspector Assessment Targets> .
 --
 --
 module Network.AWS.Inspector.CreateAssessmentTarget
@@ -65,18 +65,18 @@
     -> CreateAssessmentTarget
 createAssessmentTarget pAssessmentTargetName_ pResourceGroupARN_ =
   CreateAssessmentTarget'
-  { _catAssessmentTargetName = pAssessmentTargetName_
-  , _catResourceGroupARN = pResourceGroupARN_
-  }
+    { _catAssessmentTargetName = pAssessmentTargetName_
+    , _catResourceGroupARN = pResourceGroupARN_
+    }
 
 
 -- | The user-defined name that identifies the assessment target that you want to create. The name must be unique within the AWS account.
 catAssessmentTargetName :: Lens' CreateAssessmentTarget Text
-catAssessmentTargetName = lens _catAssessmentTargetName (\ s a -> s{_catAssessmentTargetName = a});
+catAssessmentTargetName = lens _catAssessmentTargetName (\ s a -> s{_catAssessmentTargetName = a})
 
 -- | The ARN that specifies the resource group that is used to create the assessment target.
 catResourceGroupARN :: Lens' CreateAssessmentTarget Text
-catResourceGroupARN = lens _catResourceGroupARN (\ s a -> s{_catResourceGroupARN = a});
+catResourceGroupARN = lens _catResourceGroupARN (\ s a -> s{_catResourceGroupARN = a})
 
 instance AWSRequest CreateAssessmentTarget where
         type Rs CreateAssessmentTarget =
@@ -137,17 +137,17 @@
     -> CreateAssessmentTargetResponse
 createAssessmentTargetResponse pResponseStatus_ pAssessmentTargetARN_ =
   CreateAssessmentTargetResponse'
-  { _catrsResponseStatus = pResponseStatus_
-  , _catrsAssessmentTargetARN = pAssessmentTargetARN_
-  }
+    { _catrsResponseStatus = pResponseStatus_
+    , _catrsAssessmentTargetARN = pAssessmentTargetARN_
+    }
 
 
 -- | -- | The response status code.
 catrsResponseStatus :: Lens' CreateAssessmentTargetResponse Int
-catrsResponseStatus = lens _catrsResponseStatus (\ s a -> s{_catrsResponseStatus = a});
+catrsResponseStatus = lens _catrsResponseStatus (\ s a -> s{_catrsResponseStatus = a})
 
 -- | The ARN that specifies the assessment target that is created.
 catrsAssessmentTargetARN :: Lens' CreateAssessmentTargetResponse Text
-catrsAssessmentTargetARN = lens _catrsAssessmentTargetARN (\ s a -> s{_catrsAssessmentTargetARN = a});
+catrsAssessmentTargetARN = lens _catrsAssessmentTargetARN (\ s a -> s{_catrsAssessmentTargetARN = a})
 
 instance NFData CreateAssessmentTargetResponse where
diff --git a/gen/Network/AWS/Inspector/CreateAssessmentTemplate.hs b/gen/Network/AWS/Inspector/CreateAssessmentTemplate.hs
--- a/gen/Network/AWS/Inspector/CreateAssessmentTemplate.hs
+++ b/gen/Network/AWS/Inspector/CreateAssessmentTemplate.hs
@@ -12,13 +12,13 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.CreateAssessmentTemplate
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Creates an assessment template for the assessment target that is specified by the ARN of the assessment target.
+-- Creates an assessment template for the assessment target that is specified by the ARN of the assessment target. If the <https://docs.aws.amazon.com/inspector/latest/userguide/inspector_slr.html service-linked role> isn’t already registered, also creates and registers a service-linked role to grant Amazon Inspector access to AWS Services needed to perform security assessments.
 --
 --
 module Network.AWS.Inspector.CreateAssessmentTemplate
@@ -78,33 +78,33 @@
     -> CreateAssessmentTemplate
 createAssessmentTemplate pAssessmentTargetARN_ pAssessmentTemplateName_ pDurationInSeconds_ =
   CreateAssessmentTemplate'
-  { _catUserAttributesForFindings = Nothing
-  , _catAssessmentTargetARN = pAssessmentTargetARN_
-  , _catAssessmentTemplateName = pAssessmentTemplateName_
-  , _catDurationInSeconds = _Nat # pDurationInSeconds_
-  , _catRulesPackageARNs = mempty
-  }
+    { _catUserAttributesForFindings = Nothing
+    , _catAssessmentTargetARN = pAssessmentTargetARN_
+    , _catAssessmentTemplateName = pAssessmentTemplateName_
+    , _catDurationInSeconds = _Nat # pDurationInSeconds_
+    , _catRulesPackageARNs = mempty
+    }
 
 
 -- | The user-defined attributes that are assigned to every finding that is generated by the assessment run that uses this assessment template. An attribute is a key and value pair (an 'Attribute' object). Within an assessment template, each key must be unique.
 catUserAttributesForFindings :: Lens' CreateAssessmentTemplate [Attribute]
-catUserAttributesForFindings = lens _catUserAttributesForFindings (\ s a -> s{_catUserAttributesForFindings = a}) . _Default . _Coerce;
+catUserAttributesForFindings = lens _catUserAttributesForFindings (\ s a -> s{_catUserAttributesForFindings = a}) . _Default . _Coerce
 
 -- | The ARN that specifies the assessment target for which you want to create the assessment template.
 catAssessmentTargetARN :: Lens' CreateAssessmentTemplate Text
-catAssessmentTargetARN = lens _catAssessmentTargetARN (\ s a -> s{_catAssessmentTargetARN = a});
+catAssessmentTargetARN = lens _catAssessmentTargetARN (\ s a -> s{_catAssessmentTargetARN = a})
 
 -- | The user-defined name that identifies the assessment template that you want to create. You can create several assessment templates for an assessment target. The names of the assessment templates that correspond to a particular assessment target must be unique.
 catAssessmentTemplateName :: Lens' CreateAssessmentTemplate Text
-catAssessmentTemplateName = lens _catAssessmentTemplateName (\ s a -> s{_catAssessmentTemplateName = a});
+catAssessmentTemplateName = lens _catAssessmentTemplateName (\ s a -> s{_catAssessmentTemplateName = a})
 
 -- | The duration of the assessment run in seconds. The default value is 3600 seconds (one hour).
 catDurationInSeconds :: Lens' CreateAssessmentTemplate Natural
-catDurationInSeconds = lens _catDurationInSeconds (\ s a -> s{_catDurationInSeconds = a}) . _Nat;
+catDurationInSeconds = lens _catDurationInSeconds (\ s a -> s{_catDurationInSeconds = a}) . _Nat
 
 -- | The ARNs that specify the rules packages that you want to attach to the assessment template.
 catRulesPackageARNs :: Lens' CreateAssessmentTemplate [Text]
-catRulesPackageARNs = lens _catRulesPackageARNs (\ s a -> s{_catRulesPackageARNs = a}) . _Coerce;
+catRulesPackageARNs = lens _catRulesPackageARNs (\ s a -> s{_catRulesPackageARNs = a}) . _Coerce
 
 instance AWSRequest CreateAssessmentTemplate where
         type Rs CreateAssessmentTemplate =
@@ -171,18 +171,18 @@
     -> CreateAssessmentTemplateResponse
 createAssessmentTemplateResponse pResponseStatus_ pAssessmentTemplateARN_ =
   CreateAssessmentTemplateResponse'
-  { _crsResponseStatus = pResponseStatus_
-  , _crsAssessmentTemplateARN = pAssessmentTemplateARN_
-  }
+    { _crsResponseStatus = pResponseStatus_
+    , _crsAssessmentTemplateARN = pAssessmentTemplateARN_
+    }
 
 
 -- | -- | The response status code.
 crsResponseStatus :: Lens' CreateAssessmentTemplateResponse Int
-crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a});
+crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a})
 
 -- | The ARN that specifies the assessment template that is created.
 crsAssessmentTemplateARN :: Lens' CreateAssessmentTemplateResponse Text
-crsAssessmentTemplateARN = lens _crsAssessmentTemplateARN (\ s a -> s{_crsAssessmentTemplateARN = a});
+crsAssessmentTemplateARN = lens _crsAssessmentTemplateARN (\ s a -> s{_crsAssessmentTemplateARN = a})
 
 instance NFData CreateAssessmentTemplateResponse
          where
diff --git a/gen/Network/AWS/Inspector/CreateResourceGroup.hs b/gen/Network/AWS/Inspector/CreateResourceGroup.hs
--- a/gen/Network/AWS/Inspector/CreateResourceGroup.hs
+++ b/gen/Network/AWS/Inspector/CreateResourceGroup.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.CreateResourceGroup
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 
 -- | A collection of keys and an array of possible values, '[{"key":"key1","values":["Value1","Value2"]},{"key":"Key2","values":["Value3"]}]'. For example,'[{"key":"Name","values":["TestEC2Instance"]}]'.
 crgResourceGroupTags :: Lens' CreateResourceGroup (NonEmpty ResourceGroupTag)
-crgResourceGroupTags = lens _crgResourceGroupTags (\ s a -> s{_crgResourceGroupTags = a}) . _List1;
+crgResourceGroupTags = lens _crgResourceGroupTags (\ s a -> s{_crgResourceGroupTags = a}) . _List1
 
 instance AWSRequest CreateResourceGroup where
         type Rs CreateResourceGroup =
@@ -123,17 +123,17 @@
     -> CreateResourceGroupResponse
 createResourceGroupResponse pResponseStatus_ pResourceGroupARN_ =
   CreateResourceGroupResponse'
-  { _crgrsResponseStatus = pResponseStatus_
-  , _crgrsResourceGroupARN = pResourceGroupARN_
-  }
+    { _crgrsResponseStatus = pResponseStatus_
+    , _crgrsResourceGroupARN = pResourceGroupARN_
+    }
 
 
 -- | -- | The response status code.
 crgrsResponseStatus :: Lens' CreateResourceGroupResponse Int
-crgrsResponseStatus = lens _crgrsResponseStatus (\ s a -> s{_crgrsResponseStatus = a});
+crgrsResponseStatus = lens _crgrsResponseStatus (\ s a -> s{_crgrsResponseStatus = a})
 
 -- | The ARN that specifies the resource group that is created.
 crgrsResourceGroupARN :: Lens' CreateResourceGroupResponse Text
-crgrsResourceGroupARN = lens _crgrsResourceGroupARN (\ s a -> s{_crgrsResourceGroupARN = a});
+crgrsResourceGroupARN = lens _crgrsResourceGroupARN (\ s a -> s{_crgrsResourceGroupARN = a})
 
 instance NFData CreateResourceGroupResponse where
diff --git a/gen/Network/AWS/Inspector/DeleteAssessmentRun.hs b/gen/Network/AWS/Inspector/DeleteAssessmentRun.hs
--- a/gen/Network/AWS/Inspector/DeleteAssessmentRun.hs
+++ b/gen/Network/AWS/Inspector/DeleteAssessmentRun.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DeleteAssessmentRun
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -61,7 +61,7 @@
 
 -- | The ARN that specifies the assessment run that you want to delete.
 darAssessmentRunARN :: Lens' DeleteAssessmentRun Text
-darAssessmentRunARN = lens _darAssessmentRunARN (\ s a -> s{_darAssessmentRunARN = a});
+darAssessmentRunARN = lens _darAssessmentRunARN (\ s a -> s{_darAssessmentRunARN = a})
 
 instance AWSRequest DeleteAssessmentRun where
         type Rs DeleteAssessmentRun =
diff --git a/gen/Network/AWS/Inspector/DeleteAssessmentTarget.hs b/gen/Network/AWS/Inspector/DeleteAssessmentTarget.hs
--- a/gen/Network/AWS/Inspector/DeleteAssessmentTarget.hs
+++ b/gen/Network/AWS/Inspector/DeleteAssessmentTarget.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DeleteAssessmentTarget
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -61,7 +61,7 @@
 
 -- | The ARN that specifies the assessment target that you want to delete.
 datAssessmentTargetARN :: Lens' DeleteAssessmentTarget Text
-datAssessmentTargetARN = lens _datAssessmentTargetARN (\ s a -> s{_datAssessmentTargetARN = a});
+datAssessmentTargetARN = lens _datAssessmentTargetARN (\ s a -> s{_datAssessmentTargetARN = a})
 
 instance AWSRequest DeleteAssessmentTarget where
         type Rs DeleteAssessmentTarget =
diff --git a/gen/Network/AWS/Inspector/DeleteAssessmentTemplate.hs b/gen/Network/AWS/Inspector/DeleteAssessmentTemplate.hs
--- a/gen/Network/AWS/Inspector/DeleteAssessmentTemplate.hs
+++ b/gen/Network/AWS/Inspector/DeleteAssessmentTemplate.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DeleteAssessmentTemplate
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -57,12 +57,12 @@
     -> DeleteAssessmentTemplate
 deleteAssessmentTemplate pAssessmentTemplateARN_ =
   DeleteAssessmentTemplate'
-  {_datAssessmentTemplateARN = pAssessmentTemplateARN_}
+    {_datAssessmentTemplateARN = pAssessmentTemplateARN_}
 
 
 -- | The ARN that specifies the assessment template that you want to delete.
 datAssessmentTemplateARN :: Lens' DeleteAssessmentTemplate Text
-datAssessmentTemplateARN = lens _datAssessmentTemplateARN (\ s a -> s{_datAssessmentTemplateARN = a});
+datAssessmentTemplateARN = lens _datAssessmentTemplateARN (\ s a -> s{_datAssessmentTemplateARN = a})
 
 instance AWSRequest DeleteAssessmentTemplate where
         type Rs DeleteAssessmentTemplate =
diff --git a/gen/Network/AWS/Inspector/DescribeAssessmentRuns.hs b/gen/Network/AWS/Inspector/DescribeAssessmentRuns.hs
--- a/gen/Network/AWS/Inspector/DescribeAssessmentRuns.hs
+++ b/gen/Network/AWS/Inspector/DescribeAssessmentRuns.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeAssessmentRuns
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,7 +65,7 @@
 
 -- | The ARN that specifies the assessment run that you want to describe.
 darAssessmentRunARNs :: Lens' DescribeAssessmentRuns (NonEmpty Text)
-darAssessmentRunARNs = lens _darAssessmentRunARNs (\ s a -> s{_darAssessmentRunARNs = a}) . _List1;
+darAssessmentRunARNs = lens _darAssessmentRunARNs (\ s a -> s{_darAssessmentRunARNs = a}) . _List1
 
 instance AWSRequest DescribeAssessmentRuns where
         type Rs DescribeAssessmentRuns =
@@ -128,22 +128,22 @@
     -> DescribeAssessmentRunsResponse
 describeAssessmentRunsResponse pResponseStatus_ =
   DescribeAssessmentRunsResponse'
-  { _darrsResponseStatus = pResponseStatus_
-  , _darrsAssessmentRuns = mempty
-  , _darrsFailedItems = mempty
-  }
+    { _darrsResponseStatus = pResponseStatus_
+    , _darrsAssessmentRuns = mempty
+    , _darrsFailedItems = mempty
+    }
 
 
 -- | -- | The response status code.
 darrsResponseStatus :: Lens' DescribeAssessmentRunsResponse Int
-darrsResponseStatus = lens _darrsResponseStatus (\ s a -> s{_darrsResponseStatus = a});
+darrsResponseStatus = lens _darrsResponseStatus (\ s a -> s{_darrsResponseStatus = a})
 
 -- | Information about the assessment run.
 darrsAssessmentRuns :: Lens' DescribeAssessmentRunsResponse [AssessmentRun]
-darrsAssessmentRuns = lens _darrsAssessmentRuns (\ s a -> s{_darrsAssessmentRuns = a}) . _Coerce;
+darrsAssessmentRuns = lens _darrsAssessmentRuns (\ s a -> s{_darrsAssessmentRuns = a}) . _Coerce
 
 -- | Assessment run details that cannot be described. An error code is provided for each failed item.
 darrsFailedItems :: Lens' DescribeAssessmentRunsResponse (HashMap Text FailedItemDetails)
-darrsFailedItems = lens _darrsFailedItems (\ s a -> s{_darrsFailedItems = a}) . _Map;
+darrsFailedItems = lens _darrsFailedItems (\ s a -> s{_darrsFailedItems = a}) . _Map
 
 instance NFData DescribeAssessmentRunsResponse where
diff --git a/gen/Network/AWS/Inspector/DescribeAssessmentTargets.hs b/gen/Network/AWS/Inspector/DescribeAssessmentTargets.hs
--- a/gen/Network/AWS/Inspector/DescribeAssessmentTargets.hs
+++ b/gen/Network/AWS/Inspector/DescribeAssessmentTargets.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeAssessmentTargets
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -61,12 +61,12 @@
     -> DescribeAssessmentTargets
 describeAssessmentTargets pAssessmentTargetARNs_ =
   DescribeAssessmentTargets'
-  {_datAssessmentTargetARNs = _List1 # pAssessmentTargetARNs_}
+    {_datAssessmentTargetARNs = _List1 # pAssessmentTargetARNs_}
 
 
 -- | The ARNs that specifies the assessment targets that you want to describe.
 datAssessmentTargetARNs :: Lens' DescribeAssessmentTargets (NonEmpty Text)
-datAssessmentTargetARNs = lens _datAssessmentTargetARNs (\ s a -> s{_datAssessmentTargetARNs = a}) . _List1;
+datAssessmentTargetARNs = lens _datAssessmentTargetARNs (\ s a -> s{_datAssessmentTargetARNs = a}) . _List1
 
 instance AWSRequest DescribeAssessmentTargets where
         type Rs DescribeAssessmentTargets =
@@ -130,23 +130,23 @@
     -> DescribeAssessmentTargetsResponse
 describeAssessmentTargetsResponse pResponseStatus_ =
   DescribeAssessmentTargetsResponse'
-  { _drsResponseStatus = pResponseStatus_
-  , _drsAssessmentTargets = mempty
-  , _drsFailedItems = mempty
-  }
+    { _drsResponseStatus = pResponseStatus_
+    , _drsAssessmentTargets = mempty
+    , _drsFailedItems = mempty
+    }
 
 
 -- | -- | The response status code.
 drsResponseStatus :: Lens' DescribeAssessmentTargetsResponse Int
-drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a})
 
 -- | Information about the assessment targets.
 drsAssessmentTargets :: Lens' DescribeAssessmentTargetsResponse [AssessmentTarget]
-drsAssessmentTargets = lens _drsAssessmentTargets (\ s a -> s{_drsAssessmentTargets = a}) . _Coerce;
+drsAssessmentTargets = lens _drsAssessmentTargets (\ s a -> s{_drsAssessmentTargets = a}) . _Coerce
 
 -- | Assessment target details that cannot be described. An error code is provided for each failed item.
 drsFailedItems :: Lens' DescribeAssessmentTargetsResponse (HashMap Text FailedItemDetails)
-drsFailedItems = lens _drsFailedItems (\ s a -> s{_drsFailedItems = a}) . _Map;
+drsFailedItems = lens _drsFailedItems (\ s a -> s{_drsFailedItems = a}) . _Map
 
 instance NFData DescribeAssessmentTargetsResponse
          where
diff --git a/gen/Network/AWS/Inspector/DescribeAssessmentTemplates.hs b/gen/Network/AWS/Inspector/DescribeAssessmentTemplates.hs
--- a/gen/Network/AWS/Inspector/DescribeAssessmentTemplates.hs
+++ b/gen/Network/AWS/Inspector/DescribeAssessmentTemplates.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeAssessmentTemplates
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -61,12 +61,12 @@
     -> DescribeAssessmentTemplates
 describeAssessmentTemplates pAssessmentTemplateARNs_ =
   DescribeAssessmentTemplates'
-  {_datAssessmentTemplateARNs = _List1 # pAssessmentTemplateARNs_}
+    {_datAssessmentTemplateARNs = _List1 # pAssessmentTemplateARNs_}
 
 
 -- | Undocumented member.
 datAssessmentTemplateARNs :: Lens' DescribeAssessmentTemplates (NonEmpty Text)
-datAssessmentTemplateARNs = lens _datAssessmentTemplateARNs (\ s a -> s{_datAssessmentTemplateARNs = a}) . _List1;
+datAssessmentTemplateARNs = lens _datAssessmentTemplateARNs (\ s a -> s{_datAssessmentTemplateARNs = a}) . _List1
 
 instance AWSRequest DescribeAssessmentTemplates where
         type Rs DescribeAssessmentTemplates =
@@ -130,23 +130,23 @@
     -> DescribeAssessmentTemplatesResponse
 describeAssessmentTemplatesResponse pResponseStatus_ =
   DescribeAssessmentTemplatesResponse'
-  { _datrsResponseStatus = pResponseStatus_
-  , _datrsAssessmentTemplates = mempty
-  , _datrsFailedItems = mempty
-  }
+    { _datrsResponseStatus = pResponseStatus_
+    , _datrsAssessmentTemplates = mempty
+    , _datrsFailedItems = mempty
+    }
 
 
 -- | -- | The response status code.
 datrsResponseStatus :: Lens' DescribeAssessmentTemplatesResponse Int
-datrsResponseStatus = lens _datrsResponseStatus (\ s a -> s{_datrsResponseStatus = a});
+datrsResponseStatus = lens _datrsResponseStatus (\ s a -> s{_datrsResponseStatus = a})
 
 -- | Information about the assessment templates.
 datrsAssessmentTemplates :: Lens' DescribeAssessmentTemplatesResponse [AssessmentTemplate]
-datrsAssessmentTemplates = lens _datrsAssessmentTemplates (\ s a -> s{_datrsAssessmentTemplates = a}) . _Coerce;
+datrsAssessmentTemplates = lens _datrsAssessmentTemplates (\ s a -> s{_datrsAssessmentTemplates = a}) . _Coerce
 
 -- | Assessment template details that cannot be described. An error code is provided for each failed item.
 datrsFailedItems :: Lens' DescribeAssessmentTemplatesResponse (HashMap Text FailedItemDetails)
-datrsFailedItems = lens _datrsFailedItems (\ s a -> s{_datrsFailedItems = a}) . _Map;
+datrsFailedItems = lens _datrsFailedItems (\ s a -> s{_datrsFailedItems = a}) . _Map
 
 instance NFData DescribeAssessmentTemplatesResponse
          where
diff --git a/gen/Network/AWS/Inspector/DescribeCrossAccountAccessRole.hs b/gen/Network/AWS/Inspector/DescribeCrossAccountAccessRole.hs
--- a/gen/Network/AWS/Inspector/DescribeCrossAccountAccessRole.hs
+++ b/gen/Network/AWS/Inspector/DescribeCrossAccountAccessRole.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeCrossAccountAccessRole
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -123,28 +123,28 @@
     -> DescribeCrossAccountAccessRoleResponse
 describeCrossAccountAccessRoleResponse pResponseStatus_ pRoleARN_ pValid_ pRegisteredAt_ =
   DescribeCrossAccountAccessRoleResponse'
-  { _dcaarrsResponseStatus = pResponseStatus_
-  , _dcaarrsRoleARN = pRoleARN_
-  , _dcaarrsValid = pValid_
-  , _dcaarrsRegisteredAt = _Time # pRegisteredAt_
-  }
+    { _dcaarrsResponseStatus = pResponseStatus_
+    , _dcaarrsRoleARN = pRoleARN_
+    , _dcaarrsValid = pValid_
+    , _dcaarrsRegisteredAt = _Time # pRegisteredAt_
+    }
 
 
 -- | -- | The response status code.
 dcaarrsResponseStatus :: Lens' DescribeCrossAccountAccessRoleResponse Int
-dcaarrsResponseStatus = lens _dcaarrsResponseStatus (\ s a -> s{_dcaarrsResponseStatus = a});
+dcaarrsResponseStatus = lens _dcaarrsResponseStatus (\ s a -> s{_dcaarrsResponseStatus = a})
 
 -- | The ARN that specifies the IAM role that Amazon Inspector uses to access your AWS account.
 dcaarrsRoleARN :: Lens' DescribeCrossAccountAccessRoleResponse Text
-dcaarrsRoleARN = lens _dcaarrsRoleARN (\ s a -> s{_dcaarrsRoleARN = a});
+dcaarrsRoleARN = lens _dcaarrsRoleARN (\ s a -> s{_dcaarrsRoleARN = a})
 
 -- | A Boolean value that specifies whether the IAM role has the necessary policies attached to enable Amazon Inspector to access your AWS account.
 dcaarrsValid :: Lens' DescribeCrossAccountAccessRoleResponse Bool
-dcaarrsValid = lens _dcaarrsValid (\ s a -> s{_dcaarrsValid = a});
+dcaarrsValid = lens _dcaarrsValid (\ s a -> s{_dcaarrsValid = a})
 
 -- | The date when the cross-account access role was registered.
 dcaarrsRegisteredAt :: Lens' DescribeCrossAccountAccessRoleResponse UTCTime
-dcaarrsRegisteredAt = lens _dcaarrsRegisteredAt (\ s a -> s{_dcaarrsRegisteredAt = a}) . _Time;
+dcaarrsRegisteredAt = lens _dcaarrsRegisteredAt (\ s a -> s{_dcaarrsRegisteredAt = a}) . _Time
 
 instance NFData
            DescribeCrossAccountAccessRoleResponse
diff --git a/gen/Network/AWS/Inspector/DescribeFindings.hs b/gen/Network/AWS/Inspector/DescribeFindings.hs
--- a/gen/Network/AWS/Inspector/DescribeFindings.hs
+++ b/gen/Network/AWS/Inspector/DescribeFindings.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeFindings
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,16 +65,16 @@
     -> DescribeFindings
 describeFindings pFindingARNs_ =
   DescribeFindings'
-  {_dfLocale = Nothing, _dfFindingARNs = _List1 # pFindingARNs_}
+    {_dfLocale = Nothing, _dfFindingARNs = _List1 # pFindingARNs_}
 
 
 -- | The locale into which you want to translate a finding description, recommendation, and the short description that identifies the finding.
 dfLocale :: Lens' DescribeFindings (Maybe Locale)
-dfLocale = lens _dfLocale (\ s a -> s{_dfLocale = a});
+dfLocale = lens _dfLocale (\ s a -> s{_dfLocale = a})
 
 -- | The ARN that specifies the finding that you want to describe.
 dfFindingARNs :: Lens' DescribeFindings (NonEmpty Text)
-dfFindingARNs = lens _dfFindingARNs (\ s a -> s{_dfFindingARNs = a}) . _List1;
+dfFindingARNs = lens _dfFindingARNs (\ s a -> s{_dfFindingARNs = a}) . _List1
 
 instance AWSRequest DescribeFindings where
         type Rs DescribeFindings = DescribeFindingsResponse
@@ -134,22 +134,22 @@
     -> DescribeFindingsResponse
 describeFindingsResponse pResponseStatus_ =
   DescribeFindingsResponse'
-  { _dfrsResponseStatus = pResponseStatus_
-  , _dfrsFindings = mempty
-  , _dfrsFailedItems = mempty
-  }
+    { _dfrsResponseStatus = pResponseStatus_
+    , _dfrsFindings = mempty
+    , _dfrsFailedItems = mempty
+    }
 
 
 -- | -- | The response status code.
 dfrsResponseStatus :: Lens' DescribeFindingsResponse Int
-dfrsResponseStatus = lens _dfrsResponseStatus (\ s a -> s{_dfrsResponseStatus = a});
+dfrsResponseStatus = lens _dfrsResponseStatus (\ s a -> s{_dfrsResponseStatus = a})
 
 -- | Information about the finding.
 dfrsFindings :: Lens' DescribeFindingsResponse [Finding]
-dfrsFindings = lens _dfrsFindings (\ s a -> s{_dfrsFindings = a}) . _Coerce;
+dfrsFindings = lens _dfrsFindings (\ s a -> s{_dfrsFindings = a}) . _Coerce
 
 -- | Finding details that cannot be described. An error code is provided for each failed item.
 dfrsFailedItems :: Lens' DescribeFindingsResponse (HashMap Text FailedItemDetails)
-dfrsFailedItems = lens _dfrsFailedItems (\ s a -> s{_dfrsFailedItems = a}) . _Map;
+dfrsFailedItems = lens _dfrsFailedItems (\ s a -> s{_dfrsFailedItems = a}) . _Map
 
 instance NFData DescribeFindingsResponse where
diff --git a/gen/Network/AWS/Inspector/DescribeResourceGroups.hs b/gen/Network/AWS/Inspector/DescribeResourceGroups.hs
--- a/gen/Network/AWS/Inspector/DescribeResourceGroups.hs
+++ b/gen/Network/AWS/Inspector/DescribeResourceGroups.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeResourceGroups
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,7 +65,7 @@
 
 -- | The ARN that specifies the resource group that you want to describe.
 drgResourceGroupARNs :: Lens' DescribeResourceGroups (NonEmpty Text)
-drgResourceGroupARNs = lens _drgResourceGroupARNs (\ s a -> s{_drgResourceGroupARNs = a}) . _List1;
+drgResourceGroupARNs = lens _drgResourceGroupARNs (\ s a -> s{_drgResourceGroupARNs = a}) . _List1
 
 instance AWSRequest DescribeResourceGroups where
         type Rs DescribeResourceGroups =
@@ -128,22 +128,22 @@
     -> DescribeResourceGroupsResponse
 describeResourceGroupsResponse pResponseStatus_ =
   DescribeResourceGroupsResponse'
-  { _drgrsResponseStatus = pResponseStatus_
-  , _drgrsResourceGroups = mempty
-  , _drgrsFailedItems = mempty
-  }
+    { _drgrsResponseStatus = pResponseStatus_
+    , _drgrsResourceGroups = mempty
+    , _drgrsFailedItems = mempty
+    }
 
 
 -- | -- | The response status code.
 drgrsResponseStatus :: Lens' DescribeResourceGroupsResponse Int
-drgrsResponseStatus = lens _drgrsResponseStatus (\ s a -> s{_drgrsResponseStatus = a});
+drgrsResponseStatus = lens _drgrsResponseStatus (\ s a -> s{_drgrsResponseStatus = a})
 
 -- | Information about a resource group.
 drgrsResourceGroups :: Lens' DescribeResourceGroupsResponse [ResourceGroup]
-drgrsResourceGroups = lens _drgrsResourceGroups (\ s a -> s{_drgrsResourceGroups = a}) . _Coerce;
+drgrsResourceGroups = lens _drgrsResourceGroups (\ s a -> s{_drgrsResourceGroups = a}) . _Coerce
 
 -- | Resource group details that cannot be described. An error code is provided for each failed item.
 drgrsFailedItems :: Lens' DescribeResourceGroupsResponse (HashMap Text FailedItemDetails)
-drgrsFailedItems = lens _drgrsFailedItems (\ s a -> s{_drgrsFailedItems = a}) . _Map;
+drgrsFailedItems = lens _drgrsFailedItems (\ s a -> s{_drgrsFailedItems = a}) . _Map
 
 instance NFData DescribeResourceGroupsResponse where
diff --git a/gen/Network/AWS/Inspector/DescribeRulesPackages.hs b/gen/Network/AWS/Inspector/DescribeRulesPackages.hs
--- a/gen/Network/AWS/Inspector/DescribeRulesPackages.hs
+++ b/gen/Network/AWS/Inspector/DescribeRulesPackages.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.DescribeRulesPackages
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,16 +65,16 @@
     -> DescribeRulesPackages
 describeRulesPackages pRulesPackageARNs_ =
   DescribeRulesPackages'
-  {_drpLocale = Nothing, _drpRulesPackageARNs = _List1 # pRulesPackageARNs_}
+    {_drpLocale = Nothing, _drpRulesPackageARNs = _List1 # pRulesPackageARNs_}
 
 
 -- | The locale that you want to translate a rules package description into.
 drpLocale :: Lens' DescribeRulesPackages (Maybe Locale)
-drpLocale = lens _drpLocale (\ s a -> s{_drpLocale = a});
+drpLocale = lens _drpLocale (\ s a -> s{_drpLocale = a})
 
 -- | The ARN that specifies the rules package that you want to describe.
 drpRulesPackageARNs :: Lens' DescribeRulesPackages (NonEmpty Text)
-drpRulesPackageARNs = lens _drpRulesPackageARNs (\ s a -> s{_drpRulesPackageARNs = a}) . _List1;
+drpRulesPackageARNs = lens _drpRulesPackageARNs (\ s a -> s{_drpRulesPackageARNs = a}) . _List1
 
 instance AWSRequest DescribeRulesPackages where
         type Rs DescribeRulesPackages =
@@ -137,22 +137,22 @@
     -> DescribeRulesPackagesResponse
 describeRulesPackagesResponse pResponseStatus_ =
   DescribeRulesPackagesResponse'
-  { _drprsResponseStatus = pResponseStatus_
-  , _drprsRulesPackages = mempty
-  , _drprsFailedItems = mempty
-  }
+    { _drprsResponseStatus = pResponseStatus_
+    , _drprsRulesPackages = mempty
+    , _drprsFailedItems = mempty
+    }
 
 
 -- | -- | The response status code.
 drprsResponseStatus :: Lens' DescribeRulesPackagesResponse Int
-drprsResponseStatus = lens _drprsResponseStatus (\ s a -> s{_drprsResponseStatus = a});
+drprsResponseStatus = lens _drprsResponseStatus (\ s a -> s{_drprsResponseStatus = a})
 
 -- | Information about the rules package.
 drprsRulesPackages :: Lens' DescribeRulesPackagesResponse [RulesPackage]
-drprsRulesPackages = lens _drprsRulesPackages (\ s a -> s{_drprsRulesPackages = a}) . _Coerce;
+drprsRulesPackages = lens _drprsRulesPackages (\ s a -> s{_drprsRulesPackages = a}) . _Coerce
 
 -- | Rules package details that cannot be described. An error code is provided for each failed item.
 drprsFailedItems :: Lens' DescribeRulesPackagesResponse (HashMap Text FailedItemDetails)
-drprsFailedItems = lens _drprsFailedItems (\ s a -> s{_drprsFailedItems = a}) . _Map;
+drprsFailedItems = lens _drprsFailedItems (\ s a -> s{_drprsFailedItems = a}) . _Map
 
 instance NFData DescribeRulesPackagesResponse where
diff --git a/gen/Network/AWS/Inspector/GetAssessmentReport.hs b/gen/Network/AWS/Inspector/GetAssessmentReport.hs
--- a/gen/Network/AWS/Inspector/GetAssessmentReport.hs
+++ b/gen/Network/AWS/Inspector/GetAssessmentReport.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.GetAssessmentReport
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -71,23 +71,23 @@
     -> GetAssessmentReport
 getAssessmentReport pAssessmentRunARN_ pReportFileFormat_ pReportType_ =
   GetAssessmentReport'
-  { _garAssessmentRunARN = pAssessmentRunARN_
-  , _garReportFileFormat = pReportFileFormat_
-  , _garReportType = pReportType_
-  }
+    { _garAssessmentRunARN = pAssessmentRunARN_
+    , _garReportFileFormat = pReportFileFormat_
+    , _garReportType = pReportType_
+    }
 
 
 -- | The ARN that specifies the assessment run for which you want to generate a report.
 garAssessmentRunARN :: Lens' GetAssessmentReport Text
-garAssessmentRunARN = lens _garAssessmentRunARN (\ s a -> s{_garAssessmentRunARN = a});
+garAssessmentRunARN = lens _garAssessmentRunARN (\ s a -> s{_garAssessmentRunARN = a})
 
 -- | Specifies the file format (html or pdf) of the assessment report that you want to generate.
 garReportFileFormat :: Lens' GetAssessmentReport ReportFileFormat
-garReportFileFormat = lens _garReportFileFormat (\ s a -> s{_garReportFileFormat = a});
+garReportFileFormat = lens _garReportFileFormat (\ s a -> s{_garReportFileFormat = a})
 
 -- | Specifies the type of the assessment report that you want to generate. There are two types of assessment reports: a finding report and a full report. For more information, see <http://docs.aws.amazon.com/inspector/latest/userguide/inspector_reports.html Assessment Reports> .
 garReportType :: Lens' GetAssessmentReport ReportType
-garReportType = lens _garReportType (\ s a -> s{_garReportType = a});
+garReportType = lens _garReportType (\ s a -> s{_garReportType = a})
 
 instance AWSRequest GetAssessmentReport where
         type Rs GetAssessmentReport =
@@ -151,22 +151,22 @@
     -> GetAssessmentReportResponse
 getAssessmentReportResponse pResponseStatus_ pStatus_ =
   GetAssessmentReportResponse'
-  { _garrsUrl = Nothing
-  , _garrsResponseStatus = pResponseStatus_
-  , _garrsStatus = pStatus_
-  }
+    { _garrsUrl = Nothing
+    , _garrsResponseStatus = pResponseStatus_
+    , _garrsStatus = pStatus_
+    }
 
 
 -- | Specifies the URL where you can find the generated assessment report. This parameter is only returned if the report is successfully generated.
 garrsUrl :: Lens' GetAssessmentReportResponse (Maybe Text)
-garrsUrl = lens _garrsUrl (\ s a -> s{_garrsUrl = a});
+garrsUrl = lens _garrsUrl (\ s a -> s{_garrsUrl = a})
 
 -- | -- | The response status code.
 garrsResponseStatus :: Lens' GetAssessmentReportResponse Int
-garrsResponseStatus = lens _garrsResponseStatus (\ s a -> s{_garrsResponseStatus = a});
+garrsResponseStatus = lens _garrsResponseStatus (\ s a -> s{_garrsResponseStatus = a})
 
 -- | Specifies the status of the request to generate an assessment report.
 garrsStatus :: Lens' GetAssessmentReportResponse ReportStatus
-garrsStatus = lens _garrsStatus (\ s a -> s{_garrsStatus = a});
+garrsStatus = lens _garrsStatus (\ s a -> s{_garrsStatus = a})
 
 instance NFData GetAssessmentReportResponse where
diff --git a/gen/Network/AWS/Inspector/GetTelemetryMetadata.hs b/gen/Network/AWS/Inspector/GetTelemetryMetadata.hs
--- a/gen/Network/AWS/Inspector/GetTelemetryMetadata.hs
+++ b/gen/Network/AWS/Inspector/GetTelemetryMetadata.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.GetTelemetryMetadata
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 
 -- | The ARN that specifies the assessment run that has the telemetry data that you want to obtain.
 gtmAssessmentRunARN :: Lens' GetTelemetryMetadata Text
-gtmAssessmentRunARN = lens _gtmAssessmentRunARN (\ s a -> s{_gtmAssessmentRunARN = a});
+gtmAssessmentRunARN = lens _gtmAssessmentRunARN (\ s a -> s{_gtmAssessmentRunARN = a})
 
 instance AWSRequest GetTelemetryMetadata where
         type Rs GetTelemetryMetadata =
@@ -122,15 +122,15 @@
     -> GetTelemetryMetadataResponse
 getTelemetryMetadataResponse pResponseStatus_ =
   GetTelemetryMetadataResponse'
-  {_gtmrsResponseStatus = pResponseStatus_, _gtmrsTelemetryMetadata = mempty}
+    {_gtmrsResponseStatus = pResponseStatus_, _gtmrsTelemetryMetadata = mempty}
 
 
 -- | -- | The response status code.
 gtmrsResponseStatus :: Lens' GetTelemetryMetadataResponse Int
-gtmrsResponseStatus = lens _gtmrsResponseStatus (\ s a -> s{_gtmrsResponseStatus = a});
+gtmrsResponseStatus = lens _gtmrsResponseStatus (\ s a -> s{_gtmrsResponseStatus = a})
 
 -- | Telemetry details.
 gtmrsTelemetryMetadata :: Lens' GetTelemetryMetadataResponse [TelemetryMetadata]
-gtmrsTelemetryMetadata = lens _gtmrsTelemetryMetadata (\ s a -> s{_gtmrsTelemetryMetadata = a}) . _Coerce;
+gtmrsTelemetryMetadata = lens _gtmrsTelemetryMetadata (\ s a -> s{_gtmrsTelemetryMetadata = a}) . _Coerce
 
 instance NFData GetTelemetryMetadataResponse where
diff --git a/gen/Network/AWS/Inspector/ListAssessmentRunAgents.hs b/gen/Network/AWS/Inspector/ListAssessmentRunAgents.hs
--- a/gen/Network/AWS/Inspector/ListAssessmentRunAgents.hs
+++ b/gen/Network/AWS/Inspector/ListAssessmentRunAgents.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListAssessmentRunAgents
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists the agents of the assessment runs that are specified by the ARNs of the assessment runs.
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListAssessmentRunAgents
     (
     -- * Creating a Request
@@ -44,6 +46,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -73,29 +76,36 @@
     -> ListAssessmentRunAgents
 listAssessmentRunAgents pAssessmentRunARN_ =
   ListAssessmentRunAgents'
-  { _laraNextToken = Nothing
-  , _laraFilter = Nothing
-  , _laraMaxResults = Nothing
-  , _laraAssessmentRunARN = pAssessmentRunARN_
-  }
+    { _laraNextToken = Nothing
+    , _laraFilter = Nothing
+    , _laraMaxResults = Nothing
+    , _laraAssessmentRunARN = pAssessmentRunARN_
+    }
 
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListAssessmentRunAgents__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 laraNextToken :: Lens' ListAssessmentRunAgents (Maybe Text)
-laraNextToken = lens _laraNextToken (\ s a -> s{_laraNextToken = a});
+laraNextToken = lens _laraNextToken (\ s a -> s{_laraNextToken = a})
 
 -- | You can use this parameter to specify a subset of data to be included in the action's response. For a record to match a filter, all specified filter attributes must match. When multiple values are specified for a filter attribute, any of the values can match.
 laraFilter :: Lens' ListAssessmentRunAgents (Maybe AgentFilter)
-laraFilter = lens _laraFilter (\ s a -> s{_laraFilter = a});
+laraFilter = lens _laraFilter (\ s a -> s{_laraFilter = a})
 
 -- | You can use this parameter to indicate the maximum number of items that you want in the response. The default value is 10. The maximum value is 500.
 laraMaxResults :: Lens' ListAssessmentRunAgents (Maybe Int)
-laraMaxResults = lens _laraMaxResults (\ s a -> s{_laraMaxResults = a});
+laraMaxResults = lens _laraMaxResults (\ s a -> s{_laraMaxResults = a})
 
 -- | The ARN that specifies the assessment run whose agents you want to list.
 laraAssessmentRunARN :: Lens' ListAssessmentRunAgents Text
-laraAssessmentRunARN = lens _laraAssessmentRunARN (\ s a -> s{_laraAssessmentRunARN = a});
+laraAssessmentRunARN = lens _laraAssessmentRunARN (\ s a -> s{_laraAssessmentRunARN = a})
 
+instance AWSPager ListAssessmentRunAgents where
+        page rq rs
+          | stop (rs ^. lararsNextToken) = Nothing
+          | stop (rs ^. lararsAssessmentRunAgents) = Nothing
+          | otherwise =
+            Just $ rq & laraNextToken .~ rs ^. lararsNextToken
+
 instance AWSRequest ListAssessmentRunAgents where
         type Rs ListAssessmentRunAgents =
              ListAssessmentRunAgentsResponse
@@ -158,22 +168,22 @@
     -> ListAssessmentRunAgentsResponse
 listAssessmentRunAgentsResponse pResponseStatus_ =
   ListAssessmentRunAgentsResponse'
-  { _lararsNextToken = Nothing
-  , _lararsResponseStatus = pResponseStatus_
-  , _lararsAssessmentRunAgents = mempty
-  }
+    { _lararsNextToken = Nothing
+    , _lararsResponseStatus = pResponseStatus_
+    , _lararsAssessmentRunAgents = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 lararsNextToken :: Lens' ListAssessmentRunAgentsResponse (Maybe Text)
-lararsNextToken = lens _lararsNextToken (\ s a -> s{_lararsNextToken = a});
+lararsNextToken = lens _lararsNextToken (\ s a -> s{_lararsNextToken = a})
 
 -- | -- | The response status code.
 lararsResponseStatus :: Lens' ListAssessmentRunAgentsResponse Int
-lararsResponseStatus = lens _lararsResponseStatus (\ s a -> s{_lararsResponseStatus = a});
+lararsResponseStatus = lens _lararsResponseStatus (\ s a -> s{_lararsResponseStatus = a})
 
 -- | A list of ARNs that specifies the agents returned by the action.
 lararsAssessmentRunAgents :: Lens' ListAssessmentRunAgentsResponse [AssessmentRunAgent]
-lararsAssessmentRunAgents = lens _lararsAssessmentRunAgents (\ s a -> s{_lararsAssessmentRunAgents = a}) . _Coerce;
+lararsAssessmentRunAgents = lens _lararsAssessmentRunAgents (\ s a -> s{_lararsAssessmentRunAgents = a}) . _Coerce
 
 instance NFData ListAssessmentRunAgentsResponse where
diff --git a/gen/Network/AWS/Inspector/ListAssessmentRuns.hs b/gen/Network/AWS/Inspector/ListAssessmentRuns.hs
--- a/gen/Network/AWS/Inspector/ListAssessmentRuns.hs
+++ b/gen/Network/AWS/Inspector/ListAssessmentRuns.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListAssessmentRuns
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists the assessment runs that correspond to the assessment templates that are specified by the ARNs of the assessment templates.
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListAssessmentRuns
     (
     -- * Creating a Request
@@ -44,6 +46,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -72,29 +75,36 @@
     :: ListAssessmentRuns
 listAssessmentRuns =
   ListAssessmentRuns'
-  { _larNextToken = Nothing
-  , _larFilter = Nothing
-  , _larAssessmentTemplateARNs = Nothing
-  , _larMaxResults = Nothing
-  }
+    { _larNextToken = Nothing
+    , _larFilter = Nothing
+    , _larAssessmentTemplateARNs = Nothing
+    , _larMaxResults = Nothing
+    }
 
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListAssessmentRuns__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 larNextToken :: Lens' ListAssessmentRuns (Maybe Text)
-larNextToken = lens _larNextToken (\ s a -> s{_larNextToken = a});
+larNextToken = lens _larNextToken (\ s a -> s{_larNextToken = a})
 
 -- | You can use this parameter to specify a subset of data to be included in the action's response. For a record to match a filter, all specified filter attributes must match. When multiple values are specified for a filter attribute, any of the values can match.
 larFilter :: Lens' ListAssessmentRuns (Maybe AssessmentRunFilter)
-larFilter = lens _larFilter (\ s a -> s{_larFilter = a});
+larFilter = lens _larFilter (\ s a -> s{_larFilter = a})
 
 -- | The ARNs that specify the assessment templates whose assessment runs you want to list.
 larAssessmentTemplateARNs :: Lens' ListAssessmentRuns [Text]
-larAssessmentTemplateARNs = lens _larAssessmentTemplateARNs (\ s a -> s{_larAssessmentTemplateARNs = a}) . _Default . _Coerce;
+larAssessmentTemplateARNs = lens _larAssessmentTemplateARNs (\ s a -> s{_larAssessmentTemplateARNs = a}) . _Default . _Coerce
 
 -- | You can use this parameter to indicate the maximum number of items that you want in the response. The default value is 10. The maximum value is 500.
 larMaxResults :: Lens' ListAssessmentRuns (Maybe Int)
-larMaxResults = lens _larMaxResults (\ s a -> s{_larMaxResults = a});
+larMaxResults = lens _larMaxResults (\ s a -> s{_larMaxResults = a})
 
+instance AWSPager ListAssessmentRuns where
+        page rq rs
+          | stop (rs ^. larrsNextToken) = Nothing
+          | stop (rs ^. larrsAssessmentRunARNs) = Nothing
+          | otherwise =
+            Just $ rq & larNextToken .~ rs ^. larrsNextToken
+
 instance AWSRequest ListAssessmentRuns where
         type Rs ListAssessmentRuns =
              ListAssessmentRunsResponse
@@ -158,22 +168,22 @@
     -> ListAssessmentRunsResponse
 listAssessmentRunsResponse pResponseStatus_ =
   ListAssessmentRunsResponse'
-  { _larrsNextToken = Nothing
-  , _larrsResponseStatus = pResponseStatus_
-  , _larrsAssessmentRunARNs = mempty
-  }
+    { _larrsNextToken = Nothing
+    , _larrsResponseStatus = pResponseStatus_
+    , _larrsAssessmentRunARNs = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 larrsNextToken :: Lens' ListAssessmentRunsResponse (Maybe Text)
-larrsNextToken = lens _larrsNextToken (\ s a -> s{_larrsNextToken = a});
+larrsNextToken = lens _larrsNextToken (\ s a -> s{_larrsNextToken = a})
 
 -- | -- | The response status code.
 larrsResponseStatus :: Lens' ListAssessmentRunsResponse Int
-larrsResponseStatus = lens _larrsResponseStatus (\ s a -> s{_larrsResponseStatus = a});
+larrsResponseStatus = lens _larrsResponseStatus (\ s a -> s{_larrsResponseStatus = a})
 
 -- | A list of ARNs that specifies the assessment runs that are returned by the action.
 larrsAssessmentRunARNs :: Lens' ListAssessmentRunsResponse [Text]
-larrsAssessmentRunARNs = lens _larrsAssessmentRunARNs (\ s a -> s{_larrsAssessmentRunARNs = a}) . _Coerce;
+larrsAssessmentRunARNs = lens _larrsAssessmentRunARNs (\ s a -> s{_larrsAssessmentRunARNs = a}) . _Coerce
 
 instance NFData ListAssessmentRunsResponse where
diff --git a/gen/Network/AWS/Inspector/ListAssessmentTargets.hs b/gen/Network/AWS/Inspector/ListAssessmentTargets.hs
--- a/gen/Network/AWS/Inspector/ListAssessmentTargets.hs
+++ b/gen/Network/AWS/Inspector/ListAssessmentTargets.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListAssessmentTargets
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists the ARNs of the assessment targets within this AWS account. For more information about assessment targets, see <http://docs.aws.amazon.com/inspector/latest/userguide/inspector_applications.html Amazon Inspector Assessment Targets> .
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListAssessmentTargets
     (
     -- * Creating a Request
@@ -43,6 +45,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -68,21 +71,28 @@
     :: ListAssessmentTargets
 listAssessmentTargets =
   ListAssessmentTargets'
-  {_lNextToken = Nothing, _lFilter = Nothing, _lMaxResults = Nothing}
+    {_lNextToken = Nothing, _lFilter = Nothing, _lMaxResults = Nothing}
 
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListAssessmentTargets__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 lNextToken :: Lens' ListAssessmentTargets (Maybe Text)
-lNextToken = lens _lNextToken (\ s a -> s{_lNextToken = a});
+lNextToken = lens _lNextToken (\ s a -> s{_lNextToken = a})
 
 -- | You can use this parameter to specify a subset of data to be included in the action's response. For a record to match a filter, all specified filter attributes must match. When multiple values are specified for a filter attribute, any of the values can match.
 lFilter :: Lens' ListAssessmentTargets (Maybe AssessmentTargetFilter)
-lFilter = lens _lFilter (\ s a -> s{_lFilter = a});
+lFilter = lens _lFilter (\ s a -> s{_lFilter = a})
 
 -- | You can use this parameter to indicate the maximum number of items you want in the response. The default value is 10. The maximum value is 500.
 lMaxResults :: Lens' ListAssessmentTargets (Maybe Int)
-lMaxResults = lens _lMaxResults (\ s a -> s{_lMaxResults = a});
+lMaxResults = lens _lMaxResults (\ s a -> s{_lMaxResults = a})
 
+instance AWSPager ListAssessmentTargets where
+        page rq rs
+          | stop (rs ^. lrsNextToken) = Nothing
+          | stop (rs ^. lrsAssessmentTargetARNs) = Nothing
+          | otherwise =
+            Just $ rq & lNextToken .~ rs ^. lrsNextToken
+
 instance AWSRequest ListAssessmentTargets where
         type Rs ListAssessmentTargets =
              ListAssessmentTargetsResponse
@@ -144,22 +154,22 @@
     -> ListAssessmentTargetsResponse
 listAssessmentTargetsResponse pResponseStatus_ =
   ListAssessmentTargetsResponse'
-  { _lrsNextToken = Nothing
-  , _lrsResponseStatus = pResponseStatus_
-  , _lrsAssessmentTargetARNs = mempty
-  }
+    { _lrsNextToken = Nothing
+    , _lrsResponseStatus = pResponseStatus_
+    , _lrsAssessmentTargetARNs = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 lrsNextToken :: Lens' ListAssessmentTargetsResponse (Maybe Text)
-lrsNextToken = lens _lrsNextToken (\ s a -> s{_lrsNextToken = a});
+lrsNextToken = lens _lrsNextToken (\ s a -> s{_lrsNextToken = a})
 
 -- | -- | The response status code.
 lrsResponseStatus :: Lens' ListAssessmentTargetsResponse Int
-lrsResponseStatus = lens _lrsResponseStatus (\ s a -> s{_lrsResponseStatus = a});
+lrsResponseStatus = lens _lrsResponseStatus (\ s a -> s{_lrsResponseStatus = a})
 
 -- | A list of ARNs that specifies the assessment targets that are returned by the action.
 lrsAssessmentTargetARNs :: Lens' ListAssessmentTargetsResponse [Text]
-lrsAssessmentTargetARNs = lens _lrsAssessmentTargetARNs (\ s a -> s{_lrsAssessmentTargetARNs = a}) . _Coerce;
+lrsAssessmentTargetARNs = lens _lrsAssessmentTargetARNs (\ s a -> s{_lrsAssessmentTargetARNs = a}) . _Coerce
 
 instance NFData ListAssessmentTargetsResponse where
diff --git a/gen/Network/AWS/Inspector/ListAssessmentTemplates.hs b/gen/Network/AWS/Inspector/ListAssessmentTemplates.hs
--- a/gen/Network/AWS/Inspector/ListAssessmentTemplates.hs
+++ b/gen/Network/AWS/Inspector/ListAssessmentTemplates.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListAssessmentTemplates
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists the assessment templates that correspond to the assessment targets that are specified by the ARNs of the assessment targets.
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListAssessmentTemplates
     (
     -- * Creating a Request
@@ -44,6 +46,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -72,29 +75,36 @@
     :: ListAssessmentTemplates
 listAssessmentTemplates =
   ListAssessmentTemplates'
-  { _latNextToken = Nothing
-  , _latFilter = Nothing
-  , _latMaxResults = Nothing
-  , _latAssessmentTargetARNs = Nothing
-  }
+    { _latNextToken = Nothing
+    , _latFilter = Nothing
+    , _latMaxResults = Nothing
+    , _latAssessmentTargetARNs = Nothing
+    }
 
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListAssessmentTemplates__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 latNextToken :: Lens' ListAssessmentTemplates (Maybe Text)
-latNextToken = lens _latNextToken (\ s a -> s{_latNextToken = a});
+latNextToken = lens _latNextToken (\ s a -> s{_latNextToken = a})
 
 -- | You can use this parameter to specify a subset of data to be included in the action's response. For a record to match a filter, all specified filter attributes must match. When multiple values are specified for a filter attribute, any of the values can match.
 latFilter :: Lens' ListAssessmentTemplates (Maybe AssessmentTemplateFilter)
-latFilter = lens _latFilter (\ s a -> s{_latFilter = a});
+latFilter = lens _latFilter (\ s a -> s{_latFilter = a})
 
 -- | You can use this parameter to indicate the maximum number of items you want in the response. The default value is 10. The maximum value is 500.
 latMaxResults :: Lens' ListAssessmentTemplates (Maybe Int)
-latMaxResults = lens _latMaxResults (\ s a -> s{_latMaxResults = a});
+latMaxResults = lens _latMaxResults (\ s a -> s{_latMaxResults = a})
 
 -- | A list of ARNs that specifies the assessment targets whose assessment templates you want to list.
 latAssessmentTargetARNs :: Lens' ListAssessmentTemplates [Text]
-latAssessmentTargetARNs = lens _latAssessmentTargetARNs (\ s a -> s{_latAssessmentTargetARNs = a}) . _Default . _Coerce;
+latAssessmentTargetARNs = lens _latAssessmentTargetARNs (\ s a -> s{_latAssessmentTargetARNs = a}) . _Default . _Coerce
 
+instance AWSPager ListAssessmentTemplates where
+        page rq rs
+          | stop (rs ^. latrsNextToken) = Nothing
+          | stop (rs ^. latrsAssessmentTemplateARNs) = Nothing
+          | otherwise =
+            Just $ rq & latNextToken .~ rs ^. latrsNextToken
+
 instance AWSRequest ListAssessmentTemplates where
         type Rs ListAssessmentTemplates =
              ListAssessmentTemplatesResponse
@@ -158,22 +168,22 @@
     -> ListAssessmentTemplatesResponse
 listAssessmentTemplatesResponse pResponseStatus_ =
   ListAssessmentTemplatesResponse'
-  { _latrsNextToken = Nothing
-  , _latrsResponseStatus = pResponseStatus_
-  , _latrsAssessmentTemplateARNs = mempty
-  }
+    { _latrsNextToken = Nothing
+    , _latrsResponseStatus = pResponseStatus_
+    , _latrsAssessmentTemplateARNs = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 latrsNextToken :: Lens' ListAssessmentTemplatesResponse (Maybe Text)
-latrsNextToken = lens _latrsNextToken (\ s a -> s{_latrsNextToken = a});
+latrsNextToken = lens _latrsNextToken (\ s a -> s{_latrsNextToken = a})
 
 -- | -- | The response status code.
 latrsResponseStatus :: Lens' ListAssessmentTemplatesResponse Int
-latrsResponseStatus = lens _latrsResponseStatus (\ s a -> s{_latrsResponseStatus = a});
+latrsResponseStatus = lens _latrsResponseStatus (\ s a -> s{_latrsResponseStatus = a})
 
 -- | A list of ARNs that specifies the assessment templates returned by the action.
 latrsAssessmentTemplateARNs :: Lens' ListAssessmentTemplatesResponse [Text]
-latrsAssessmentTemplateARNs = lens _latrsAssessmentTemplateARNs (\ s a -> s{_latrsAssessmentTemplateARNs = a}) . _Coerce;
+latrsAssessmentTemplateARNs = lens _latrsAssessmentTemplateARNs (\ s a -> s{_latrsAssessmentTemplateARNs = a}) . _Coerce
 
 instance NFData ListAssessmentTemplatesResponse where
diff --git a/gen/Network/AWS/Inspector/ListEventSubscriptions.hs b/gen/Network/AWS/Inspector/ListEventSubscriptions.hs
--- a/gen/Network/AWS/Inspector/ListEventSubscriptions.hs
+++ b/gen/Network/AWS/Inspector/ListEventSubscriptions.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListEventSubscriptions
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists all the event subscriptions for the assessment template that is specified by the ARN of the assessment template. For more information, see 'SubscribeToEvent' and 'UnsubscribeFromEvent' .
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListEventSubscriptions
     (
     -- * Creating a Request
@@ -43,6 +45,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -68,21 +71,31 @@
     :: ListEventSubscriptions
 listEventSubscriptions =
   ListEventSubscriptions'
-  {_lesNextToken = Nothing, _lesResourceARN = Nothing, _lesMaxResults = Nothing}
+    { _lesNextToken = Nothing
+    , _lesResourceARN = Nothing
+    , _lesMaxResults = Nothing
+    }
 
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListEventSubscriptions__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 lesNextToken :: Lens' ListEventSubscriptions (Maybe Text)
-lesNextToken = lens _lesNextToken (\ s a -> s{_lesNextToken = a});
+lesNextToken = lens _lesNextToken (\ s a -> s{_lesNextToken = a})
 
 -- | The ARN of the assessment template for which you want to list the existing event subscriptions.
 lesResourceARN :: Lens' ListEventSubscriptions (Maybe Text)
-lesResourceARN = lens _lesResourceARN (\ s a -> s{_lesResourceARN = a});
+lesResourceARN = lens _lesResourceARN (\ s a -> s{_lesResourceARN = a})
 
 -- | You can use this parameter to indicate the maximum number of items you want in the response. The default value is 10. The maximum value is 500.
 lesMaxResults :: Lens' ListEventSubscriptions (Maybe Int)
-lesMaxResults = lens _lesMaxResults (\ s a -> s{_lesMaxResults = a});
+lesMaxResults = lens _lesMaxResults (\ s a -> s{_lesMaxResults = a})
 
+instance AWSPager ListEventSubscriptions where
+        page rq rs
+          | stop (rs ^. lesrsNextToken) = Nothing
+          | stop (rs ^. lesrsSubscriptions) = Nothing
+          | otherwise =
+            Just $ rq & lesNextToken .~ rs ^. lesrsNextToken
+
 instance AWSRequest ListEventSubscriptions where
         type Rs ListEventSubscriptions =
              ListEventSubscriptionsResponse
@@ -144,22 +157,22 @@
     -> ListEventSubscriptionsResponse
 listEventSubscriptionsResponse pResponseStatus_ =
   ListEventSubscriptionsResponse'
-  { _lesrsNextToken = Nothing
-  , _lesrsResponseStatus = pResponseStatus_
-  , _lesrsSubscriptions = mempty
-  }
+    { _lesrsNextToken = Nothing
+    , _lesrsResponseStatus = pResponseStatus_
+    , _lesrsSubscriptions = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 lesrsNextToken :: Lens' ListEventSubscriptionsResponse (Maybe Text)
-lesrsNextToken = lens _lesrsNextToken (\ s a -> s{_lesrsNextToken = a});
+lesrsNextToken = lens _lesrsNextToken (\ s a -> s{_lesrsNextToken = a})
 
 -- | -- | The response status code.
 lesrsResponseStatus :: Lens' ListEventSubscriptionsResponse Int
-lesrsResponseStatus = lens _lesrsResponseStatus (\ s a -> s{_lesrsResponseStatus = a});
+lesrsResponseStatus = lens _lesrsResponseStatus (\ s a -> s{_lesrsResponseStatus = a})
 
 -- | Details of the returned event subscriptions.
 lesrsSubscriptions :: Lens' ListEventSubscriptionsResponse [Subscription]
-lesrsSubscriptions = lens _lesrsSubscriptions (\ s a -> s{_lesrsSubscriptions = a}) . _Coerce;
+lesrsSubscriptions = lens _lesrsSubscriptions (\ s a -> s{_lesrsSubscriptions = a}) . _Coerce
 
 instance NFData ListEventSubscriptionsResponse where
diff --git a/gen/Network/AWS/Inspector/ListFindings.hs b/gen/Network/AWS/Inspector/ListFindings.hs
--- a/gen/Network/AWS/Inspector/ListFindings.hs
+++ b/gen/Network/AWS/Inspector/ListFindings.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListFindings
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists findings that are generated by the assessment runs that are specified by the ARNs of the assessment runs.
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListFindings
     (
     -- * Creating a Request
@@ -44,6 +46,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -72,29 +75,36 @@
     :: ListFindings
 listFindings =
   ListFindings'
-  { _lfAssessmentRunARNs = Nothing
-  , _lfNextToken = Nothing
-  , _lfFilter = Nothing
-  , _lfMaxResults = Nothing
-  }
+    { _lfAssessmentRunARNs = Nothing
+    , _lfNextToken = Nothing
+    , _lfFilter = Nothing
+    , _lfMaxResults = Nothing
+    }
 
 
 -- | The ARNs of the assessment runs that generate the findings that you want to list.
 lfAssessmentRunARNs :: Lens' ListFindings [Text]
-lfAssessmentRunARNs = lens _lfAssessmentRunARNs (\ s a -> s{_lfAssessmentRunARNs = a}) . _Default . _Coerce;
+lfAssessmentRunARNs = lens _lfAssessmentRunARNs (\ s a -> s{_lfAssessmentRunARNs = a}) . _Default . _Coerce
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListFindings__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 lfNextToken :: Lens' ListFindings (Maybe Text)
-lfNextToken = lens _lfNextToken (\ s a -> s{_lfNextToken = a});
+lfNextToken = lens _lfNextToken (\ s a -> s{_lfNextToken = a})
 
 -- | You can use this parameter to specify a subset of data to be included in the action's response. For a record to match a filter, all specified filter attributes must match. When multiple values are specified for a filter attribute, any of the values can match.
 lfFilter :: Lens' ListFindings (Maybe FindingFilter)
-lfFilter = lens _lfFilter (\ s a -> s{_lfFilter = a});
+lfFilter = lens _lfFilter (\ s a -> s{_lfFilter = a})
 
 -- | You can use this parameter to indicate the maximum number of items you want in the response. The default value is 10. The maximum value is 500.
 lfMaxResults :: Lens' ListFindings (Maybe Int)
-lfMaxResults = lens _lfMaxResults (\ s a -> s{_lfMaxResults = a});
+lfMaxResults = lens _lfMaxResults (\ s a -> s{_lfMaxResults = a})
 
+instance AWSPager ListFindings where
+        page rq rs
+          | stop (rs ^. lfrsNextToken) = Nothing
+          | stop (rs ^. lfrsFindingARNs) = Nothing
+          | otherwise =
+            Just $ rq & lfNextToken .~ rs ^. lfrsNextToken
+
 instance AWSRequest ListFindings where
         type Rs ListFindings = ListFindingsResponse
         request = postJSON inspector
@@ -155,22 +165,22 @@
     -> ListFindingsResponse
 listFindingsResponse pResponseStatus_ =
   ListFindingsResponse'
-  { _lfrsNextToken = Nothing
-  , _lfrsResponseStatus = pResponseStatus_
-  , _lfrsFindingARNs = mempty
-  }
+    { _lfrsNextToken = Nothing
+    , _lfrsResponseStatus = pResponseStatus_
+    , _lfrsFindingARNs = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 lfrsNextToken :: Lens' ListFindingsResponse (Maybe Text)
-lfrsNextToken = lens _lfrsNextToken (\ s a -> s{_lfrsNextToken = a});
+lfrsNextToken = lens _lfrsNextToken (\ s a -> s{_lfrsNextToken = a})
 
 -- | -- | The response status code.
 lfrsResponseStatus :: Lens' ListFindingsResponse Int
-lfrsResponseStatus = lens _lfrsResponseStatus (\ s a -> s{_lfrsResponseStatus = a});
+lfrsResponseStatus = lens _lfrsResponseStatus (\ s a -> s{_lfrsResponseStatus = a})
 
 -- | A list of ARNs that specifies the findings returned by the action.
 lfrsFindingARNs :: Lens' ListFindingsResponse [Text]
-lfrsFindingARNs = lens _lfrsFindingARNs (\ s a -> s{_lfrsFindingARNs = a}) . _Coerce;
+lfrsFindingARNs = lens _lfrsFindingARNs (\ s a -> s{_lfrsFindingARNs = a}) . _Coerce
 
 instance NFData ListFindingsResponse where
diff --git a/gen/Network/AWS/Inspector/ListRulesPackages.hs b/gen/Network/AWS/Inspector/ListRulesPackages.hs
--- a/gen/Network/AWS/Inspector/ListRulesPackages.hs
+++ b/gen/Network/AWS/Inspector/ListRulesPackages.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListRulesPackages
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Lists all available Amazon Inspector rules packages.
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.ListRulesPackages
     (
     -- * Creating a Request
@@ -42,6 +44,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -68,12 +71,19 @@
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __ListRulesPackages__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 lrpNextToken :: Lens' ListRulesPackages (Maybe Text)
-lrpNextToken = lens _lrpNextToken (\ s a -> s{_lrpNextToken = a});
+lrpNextToken = lens _lrpNextToken (\ s a -> s{_lrpNextToken = a})
 
 -- | You can use this parameter to indicate the maximum number of items you want in the response. The default value is 10. The maximum value is 500.
 lrpMaxResults :: Lens' ListRulesPackages (Maybe Int)
-lrpMaxResults = lens _lrpMaxResults (\ s a -> s{_lrpMaxResults = a});
+lrpMaxResults = lens _lrpMaxResults (\ s a -> s{_lrpMaxResults = a})
 
+instance AWSPager ListRulesPackages where
+        page rq rs
+          | stop (rs ^. lrprsNextToken) = Nothing
+          | stop (rs ^. lrprsRulesPackageARNs) = Nothing
+          | otherwise =
+            Just $ rq & lrpNextToken .~ rs ^. lrprsNextToken
+
 instance AWSRequest ListRulesPackages where
         type Rs ListRulesPackages = ListRulesPackagesResponse
         request = postJSON inspector
@@ -132,22 +142,22 @@
     -> ListRulesPackagesResponse
 listRulesPackagesResponse pResponseStatus_ =
   ListRulesPackagesResponse'
-  { _lrprsNextToken = Nothing
-  , _lrprsResponseStatus = pResponseStatus_
-  , _lrprsRulesPackageARNs = mempty
-  }
+    { _lrprsNextToken = Nothing
+    , _lrprsResponseStatus = pResponseStatus_
+    , _lrprsRulesPackageARNs = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 lrprsNextToken :: Lens' ListRulesPackagesResponse (Maybe Text)
-lrprsNextToken = lens _lrprsNextToken (\ s a -> s{_lrprsNextToken = a});
+lrprsNextToken = lens _lrprsNextToken (\ s a -> s{_lrprsNextToken = a})
 
 -- | -- | The response status code.
 lrprsResponseStatus :: Lens' ListRulesPackagesResponse Int
-lrprsResponseStatus = lens _lrprsResponseStatus (\ s a -> s{_lrprsResponseStatus = a});
+lrprsResponseStatus = lens _lrprsResponseStatus (\ s a -> s{_lrprsResponseStatus = a})
 
 -- | The list of ARNs that specifies the rules packages returned by the action.
 lrprsRulesPackageARNs :: Lens' ListRulesPackagesResponse [Text]
-lrprsRulesPackageARNs = lens _lrprsRulesPackageARNs (\ s a -> s{_lrprsRulesPackageARNs = a}) . _Coerce;
+lrprsRulesPackageARNs = lens _lrprsRulesPackageARNs (\ s a -> s{_lrprsRulesPackageARNs = a}) . _Coerce
 
 instance NFData ListRulesPackagesResponse where
diff --git a/gen/Network/AWS/Inspector/ListTagsForResource.hs b/gen/Network/AWS/Inspector/ListTagsForResource.hs
--- a/gen/Network/AWS/Inspector/ListTagsForResource.hs
+++ b/gen/Network/AWS/Inspector/ListTagsForResource.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.ListTagsForResource
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,7 +64,7 @@
 
 -- | The ARN that specifies the assessment template whose tags you want to list.
 ltfrResourceARN :: Lens' ListTagsForResource Text
-ltfrResourceARN = lens _ltfrResourceARN (\ s a -> s{_ltfrResourceARN = a});
+ltfrResourceARN = lens _ltfrResourceARN (\ s a -> s{_ltfrResourceARN = a})
 
 instance AWSRequest ListTagsForResource where
         type Rs ListTagsForResource =
@@ -121,15 +121,15 @@
     -> ListTagsForResourceResponse
 listTagsForResourceResponse pResponseStatus_ =
   ListTagsForResourceResponse'
-  {_ltfrrsResponseStatus = pResponseStatus_, _ltfrrsTags = mempty}
+    {_ltfrrsResponseStatus = pResponseStatus_, _ltfrrsTags = mempty}
 
 
 -- | -- | The response status code.
 ltfrrsResponseStatus :: Lens' ListTagsForResourceResponse Int
-ltfrrsResponseStatus = lens _ltfrrsResponseStatus (\ s a -> s{_ltfrrsResponseStatus = a});
+ltfrrsResponseStatus = lens _ltfrrsResponseStatus (\ s a -> s{_ltfrrsResponseStatus = a})
 
 -- | A collection of key and value pairs.
 ltfrrsTags :: Lens' ListTagsForResourceResponse [Tag]
-ltfrrsTags = lens _ltfrrsTags (\ s a -> s{_ltfrrsTags = a}) . _Coerce;
+ltfrrsTags = lens _ltfrrsTags (\ s a -> s{_ltfrrsTags = a}) . _Coerce
 
 instance NFData ListTagsForResourceResponse where
diff --git a/gen/Network/AWS/Inspector/PreviewAgents.hs b/gen/Network/AWS/Inspector/PreviewAgents.hs
--- a/gen/Network/AWS/Inspector/PreviewAgents.hs
+++ b/gen/Network/AWS/Inspector/PreviewAgents.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.PreviewAgents
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -21,6 +21,8 @@
 -- Previews the agents installed on the EC2 instances that are part of the specified assessment target.
 --
 --
+--
+-- This operation returns paginated results.
 module Network.AWS.Inspector.PreviewAgents
     (
     -- * Creating a Request
@@ -43,6 +45,7 @@
 import Network.AWS.Inspector.Types
 import Network.AWS.Inspector.Types.Product
 import Network.AWS.Lens
+import Network.AWS.Pager
 import Network.AWS.Prelude
 import Network.AWS.Request
 import Network.AWS.Response
@@ -69,24 +72,31 @@
     -> PreviewAgents
 previewAgents pPreviewAgentsARN_ =
   PreviewAgents'
-  { _paNextToken = Nothing
-  , _paMaxResults = Nothing
-  , _paPreviewAgentsARN = pPreviewAgentsARN_
-  }
+    { _paNextToken = Nothing
+    , _paMaxResults = Nothing
+    , _paPreviewAgentsARN = pPreviewAgentsARN_
+    }
 
 
 -- | You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the __PreviewAgents__ action. Subsequent calls to the action fill __nextToken__ in the request with the value of __NextToken__ from the previous response to continue listing data.
 paNextToken :: Lens' PreviewAgents (Maybe Text)
-paNextToken = lens _paNextToken (\ s a -> s{_paNextToken = a});
+paNextToken = lens _paNextToken (\ s a -> s{_paNextToken = a})
 
 -- | You can use this parameter to indicate the maximum number of items you want in the response. The default value is 10. The maximum value is 500.
 paMaxResults :: Lens' PreviewAgents (Maybe Int)
-paMaxResults = lens _paMaxResults (\ s a -> s{_paMaxResults = a});
+paMaxResults = lens _paMaxResults (\ s a -> s{_paMaxResults = a})
 
 -- | The ARN of the assessment target whose agents you want to preview.
 paPreviewAgentsARN :: Lens' PreviewAgents Text
-paPreviewAgentsARN = lens _paPreviewAgentsARN (\ s a -> s{_paPreviewAgentsARN = a});
+paPreviewAgentsARN = lens _paPreviewAgentsARN (\ s a -> s{_paPreviewAgentsARN = a})
 
+instance AWSPager PreviewAgents where
+        page rq rs
+          | stop (rs ^. parsNextToken) = Nothing
+          | stop (rs ^. parsAgentPreviews) = Nothing
+          | otherwise =
+            Just $ rq & paNextToken .~ rs ^. parsNextToken
+
 instance AWSRequest PreviewAgents where
         type Rs PreviewAgents = PreviewAgentsResponse
         request = postJSON inspector
@@ -146,22 +156,22 @@
     -> PreviewAgentsResponse
 previewAgentsResponse pResponseStatus_ =
   PreviewAgentsResponse'
-  { _parsNextToken = Nothing
-  , _parsResponseStatus = pResponseStatus_
-  , _parsAgentPreviews = mempty
-  }
+    { _parsNextToken = Nothing
+    , _parsResponseStatus = pResponseStatus_
+    , _parsAgentPreviews = mempty
+    }
 
 
 -- | When a response is generated, if there is more data to be listed, this parameter is present in the response and contains the value to use for the __nextToken__ parameter in a subsequent pagination request. If there is no more data to be listed, this parameter is set to null.
 parsNextToken :: Lens' PreviewAgentsResponse (Maybe Text)
-parsNextToken = lens _parsNextToken (\ s a -> s{_parsNextToken = a});
+parsNextToken = lens _parsNextToken (\ s a -> s{_parsNextToken = a})
 
 -- | -- | The response status code.
 parsResponseStatus :: Lens' PreviewAgentsResponse Int
-parsResponseStatus = lens _parsResponseStatus (\ s a -> s{_parsResponseStatus = a});
+parsResponseStatus = lens _parsResponseStatus (\ s a -> s{_parsResponseStatus = a})
 
 -- | The resulting list of agents.
 parsAgentPreviews :: Lens' PreviewAgentsResponse [AgentPreview]
-parsAgentPreviews = lens _parsAgentPreviews (\ s a -> s{_parsAgentPreviews = a}) . _Coerce;
+parsAgentPreviews = lens _parsAgentPreviews (\ s a -> s{_parsAgentPreviews = a}) . _Coerce
 
 instance NFData PreviewAgentsResponse where
diff --git a/gen/Network/AWS/Inspector/RegisterCrossAccountAccessRole.hs b/gen/Network/AWS/Inspector/RegisterCrossAccountAccessRole.hs
--- a/gen/Network/AWS/Inspector/RegisterCrossAccountAccessRole.hs
+++ b/gen/Network/AWS/Inspector/RegisterCrossAccountAccessRole.hs
@@ -12,13 +12,13 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.RegisterCrossAccountAccessRole
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
 -- Portability : non-portable (GHC extensions)
 --
--- Registers the IAM role that Amazon Inspector uses to list your EC2 instances at the start of the assessment run or when you call the 'PreviewAgents' action.
+-- Registers the IAM role that grants Amazon Inspector access to AWS Services needed to perform security assessments.
 --
 --
 module Network.AWS.Inspector.RegisterCrossAccountAccessRole
@@ -51,7 +51,7 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rcaarRoleARN' - The ARN of the IAM role that Amazon Inspector uses to list your EC2 instances during the assessment run or when you call the 'PreviewAgents' action.
+-- * 'rcaarRoleARN' - The ARN of the IAM role that grants Amazon Inspector access to AWS Services needed to perform security assessments.
 registerCrossAccountAccessRole
     :: Text -- ^ 'rcaarRoleARN'
     -> RegisterCrossAccountAccessRole
@@ -59,9 +59,9 @@
   RegisterCrossAccountAccessRole' {_rcaarRoleARN = pRoleARN_}
 
 
--- | The ARN of the IAM role that Amazon Inspector uses to list your EC2 instances during the assessment run or when you call the 'PreviewAgents' action.
+-- | The ARN of the IAM role that grants Amazon Inspector access to AWS Services needed to perform security assessments.
 rcaarRoleARN :: Lens' RegisterCrossAccountAccessRole Text
-rcaarRoleARN = lens _rcaarRoleARN (\ s a -> s{_rcaarRoleARN = a});
+rcaarRoleARN = lens _rcaarRoleARN (\ s a -> s{_rcaarRoleARN = a})
 
 instance AWSRequest RegisterCrossAccountAccessRole
          where
diff --git a/gen/Network/AWS/Inspector/RemoveAttributesFromFindings.hs b/gen/Network/AWS/Inspector/RemoveAttributesFromFindings.hs
--- a/gen/Network/AWS/Inspector/RemoveAttributesFromFindings.hs
+++ b/gen/Network/AWS/Inspector/RemoveAttributesFromFindings.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.RemoveAttributesFromFindings
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,16 +64,16 @@
     -> RemoveAttributesFromFindings
 removeAttributesFromFindings pFindingARNs_ =
   RemoveAttributesFromFindings'
-  {_raffFindingARNs = _List1 # pFindingARNs_, _raffAttributeKeys = mempty}
+    {_raffFindingARNs = _List1 # pFindingARNs_, _raffAttributeKeys = mempty}
 
 
 -- | The ARNs that specify the findings that you want to remove attributes from.
 raffFindingARNs :: Lens' RemoveAttributesFromFindings (NonEmpty Text)
-raffFindingARNs = lens _raffFindingARNs (\ s a -> s{_raffFindingARNs = a}) . _List1;
+raffFindingARNs = lens _raffFindingARNs (\ s a -> s{_raffFindingARNs = a}) . _List1
 
 -- | The array of attribute keys that you want to remove from specified findings.
 raffAttributeKeys :: Lens' RemoveAttributesFromFindings [Text]
-raffAttributeKeys = lens _raffAttributeKeys (\ s a -> s{_raffAttributeKeys = a}) . _Coerce;
+raffAttributeKeys = lens _raffAttributeKeys (\ s a -> s{_raffAttributeKeys = a}) . _Coerce
 
 instance AWSRequest RemoveAttributesFromFindings
          where
@@ -133,16 +133,16 @@
     -> RemoveAttributesFromFindingsResponse
 removeAttributesFromFindingsResponse pResponseStatus_ =
   RemoveAttributesFromFindingsResponse'
-  {_raffrsResponseStatus = pResponseStatus_, _raffrsFailedItems = mempty}
+    {_raffrsResponseStatus = pResponseStatus_, _raffrsFailedItems = mempty}
 
 
 -- | -- | The response status code.
 raffrsResponseStatus :: Lens' RemoveAttributesFromFindingsResponse Int
-raffrsResponseStatus = lens _raffrsResponseStatus (\ s a -> s{_raffrsResponseStatus = a});
+raffrsResponseStatus = lens _raffrsResponseStatus (\ s a -> s{_raffrsResponseStatus = a})
 
 -- | Attributes details that cannot be described. An error code is provided for each failed item.
 raffrsFailedItems :: Lens' RemoveAttributesFromFindingsResponse (HashMap Text FailedItemDetails)
-raffrsFailedItems = lens _raffrsFailedItems (\ s a -> s{_raffrsFailedItems = a}) . _Map;
+raffrsFailedItems = lens _raffrsFailedItems (\ s a -> s{_raffrsFailedItems = a}) . _Map
 
 instance NFData RemoveAttributesFromFindingsResponse
          where
diff --git a/gen/Network/AWS/Inspector/SetTagsForResource.hs b/gen/Network/AWS/Inspector/SetTagsForResource.hs
--- a/gen/Network/AWS/Inspector/SetTagsForResource.hs
+++ b/gen/Network/AWS/Inspector/SetTagsForResource.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.SetTagsForResource
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -65,11 +65,11 @@
 
 -- | A collection of key and value pairs that you want to set to the assessment template.
 stfrTags :: Lens' SetTagsForResource [Tag]
-stfrTags = lens _stfrTags (\ s a -> s{_stfrTags = a}) . _Default . _Coerce;
+stfrTags = lens _stfrTags (\ s a -> s{_stfrTags = a}) . _Default . _Coerce
 
 -- | The ARN of the assessment template that you want to set tags to.
 stfrResourceARN :: Lens' SetTagsForResource Text
-stfrResourceARN = lens _stfrResourceARN (\ s a -> s{_stfrResourceARN = a});
+stfrResourceARN = lens _stfrResourceARN (\ s a -> s{_stfrResourceARN = a})
 
 instance AWSRequest SetTagsForResource where
         type Rs SetTagsForResource =
diff --git a/gen/Network/AWS/Inspector/StartAssessmentRun.hs b/gen/Network/AWS/Inspector/StartAssessmentRun.hs
--- a/gen/Network/AWS/Inspector/StartAssessmentRun.hs
+++ b/gen/Network/AWS/Inspector/StartAssessmentRun.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.StartAssessmentRun
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -64,18 +64,18 @@
     -> StartAssessmentRun
 startAssessmentRun pAssessmentTemplateARN_ =
   StartAssessmentRun'
-  { _sarAssessmentRunName = Nothing
-  , _sarAssessmentTemplateARN = pAssessmentTemplateARN_
-  }
+    { _sarAssessmentRunName = Nothing
+    , _sarAssessmentTemplateARN = pAssessmentTemplateARN_
+    }
 
 
 -- | You can specify the name for the assessment run. The name must be unique for the assessment template whose ARN is used to start the assessment run.
 sarAssessmentRunName :: Lens' StartAssessmentRun (Maybe Text)
-sarAssessmentRunName = lens _sarAssessmentRunName (\ s a -> s{_sarAssessmentRunName = a});
+sarAssessmentRunName = lens _sarAssessmentRunName (\ s a -> s{_sarAssessmentRunName = a})
 
 -- | The ARN of the assessment template of the assessment run that you want to start.
 sarAssessmentTemplateARN :: Lens' StartAssessmentRun Text
-sarAssessmentTemplateARN = lens _sarAssessmentTemplateARN (\ s a -> s{_sarAssessmentTemplateARN = a});
+sarAssessmentTemplateARN = lens _sarAssessmentTemplateARN (\ s a -> s{_sarAssessmentTemplateARN = a})
 
 instance AWSRequest StartAssessmentRun where
         type Rs StartAssessmentRun =
@@ -136,17 +136,17 @@
     -> StartAssessmentRunResponse
 startAssessmentRunResponse pResponseStatus_ pAssessmentRunARN_ =
   StartAssessmentRunResponse'
-  { _sarrsResponseStatus = pResponseStatus_
-  , _sarrsAssessmentRunARN = pAssessmentRunARN_
-  }
+    { _sarrsResponseStatus = pResponseStatus_
+    , _sarrsAssessmentRunARN = pAssessmentRunARN_
+    }
 
 
 -- | -- | The response status code.
 sarrsResponseStatus :: Lens' StartAssessmentRunResponse Int
-sarrsResponseStatus = lens _sarrsResponseStatus (\ s a -> s{_sarrsResponseStatus = a});
+sarrsResponseStatus = lens _sarrsResponseStatus (\ s a -> s{_sarrsResponseStatus = a})
 
 -- | The ARN of the assessment run that has been started.
 sarrsAssessmentRunARN :: Lens' StartAssessmentRunResponse Text
-sarrsAssessmentRunARN = lens _sarrsAssessmentRunARN (\ s a -> s{_sarrsAssessmentRunARN = a});
+sarrsAssessmentRunARN = lens _sarrsAssessmentRunARN (\ s a -> s{_sarrsAssessmentRunARN = a})
 
 instance NFData StartAssessmentRunResponse where
diff --git a/gen/Network/AWS/Inspector/StopAssessmentRun.hs b/gen/Network/AWS/Inspector/StopAssessmentRun.hs
--- a/gen/Network/AWS/Inspector/StopAssessmentRun.hs
+++ b/gen/Network/AWS/Inspector/StopAssessmentRun.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.StopAssessmentRun
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -61,16 +61,16 @@
     -> StopAssessmentRun
 stopAssessmentRun pAssessmentRunARN_ =
   StopAssessmentRun'
-  {_sarStopAction = Nothing, _sarAssessmentRunARN = pAssessmentRunARN_}
+    {_sarStopAction = Nothing, _sarAssessmentRunARN = pAssessmentRunARN_}
 
 
 -- | An input option that can be set to either START_EVALUATION or SKIP_EVALUATION. START_EVALUATION (the default value), stops the AWS agent from collecting data and begins the results evaluation and the findings generation process. SKIP_EVALUATION cancels the assessment run immediately, after which no findings are generated.
 sarStopAction :: Lens' StopAssessmentRun (Maybe StopAction)
-sarStopAction = lens _sarStopAction (\ s a -> s{_sarStopAction = a});
+sarStopAction = lens _sarStopAction (\ s a -> s{_sarStopAction = a})
 
 -- | The ARN of the assessment run that you want to stop.
 sarAssessmentRunARN :: Lens' StopAssessmentRun Text
-sarAssessmentRunARN = lens _sarAssessmentRunARN (\ s a -> s{_sarAssessmentRunARN = a});
+sarAssessmentRunARN = lens _sarAssessmentRunARN (\ s a -> s{_sarAssessmentRunARN = a})
 
 instance AWSRequest StopAssessmentRun where
         type Rs StopAssessmentRun = StopAssessmentRunResponse
diff --git a/gen/Network/AWS/Inspector/SubscribeToEvent.hs b/gen/Network/AWS/Inspector/SubscribeToEvent.hs
--- a/gen/Network/AWS/Inspector/SubscribeToEvent.hs
+++ b/gen/Network/AWS/Inspector/SubscribeToEvent.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.SubscribeToEvent
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -67,23 +67,23 @@
     -> SubscribeToEvent
 subscribeToEvent pResourceARN_ pEvent_ pTopicARN_ =
   SubscribeToEvent'
-  { _steResourceARN = pResourceARN_
-  , _steEvent = pEvent_
-  , _steTopicARN = pTopicARN_
-  }
+    { _steResourceARN = pResourceARN_
+    , _steEvent = pEvent_
+    , _steTopicARN = pTopicARN_
+    }
 
 
 -- | The ARN of the assessment template that is used during the event for which you want to receive SNS notifications.
 steResourceARN :: Lens' SubscribeToEvent Text
-steResourceARN = lens _steResourceARN (\ s a -> s{_steResourceARN = a});
+steResourceARN = lens _steResourceARN (\ s a -> s{_steResourceARN = a})
 
 -- | The event for which you want to receive SNS notifications.
 steEvent :: Lens' SubscribeToEvent InspectorEvent
-steEvent = lens _steEvent (\ s a -> s{_steEvent = a});
+steEvent = lens _steEvent (\ s a -> s{_steEvent = a})
 
 -- | The ARN of the SNS topic to which the SNS notifications are sent.
 steTopicARN :: Lens' SubscribeToEvent Text
-steTopicARN = lens _steTopicARN (\ s a -> s{_steTopicARN = a});
+steTopicARN = lens _steTopicARN (\ s a -> s{_steTopicARN = a})
 
 instance AWSRequest SubscribeToEvent where
         type Rs SubscribeToEvent = SubscribeToEventResponse
diff --git a/gen/Network/AWS/Inspector/Types.hs b/gen/Network/AWS/Inspector/Types.hs
--- a/gen/Network/AWS/Inspector/Types.hs
+++ b/gen/Network/AWS/Inspector/Types.hs
@@ -4,7 +4,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.Types
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -74,7 +74,13 @@
     -- * AgentPreview
     , AgentPreview
     , agentPreview
+    , apHostname
     , apAutoScalingGroup
+    , apOperatingSystem
+    , apAgentVersion
+    , apKernelVersion
+    , apAgentHealth
+    , apIpv4Address
     , apAgentId
 
     -- * AssessmentRun
@@ -151,12 +157,14 @@
     -- * AssessmentTemplate
     , AssessmentTemplate
     , assessmentTemplate
+    , atLastAssessmentRunARN
     , atArn
     , atName
     , atAssessmentTargetARN
     , atDurationInSeconds
     , atRulesPackageARNs
     , atUserAttributesForFindings
+    , atAssessmentRunCount
     , atCreatedAt
 
     -- * AssessmentTemplateFilter
@@ -300,24 +308,24 @@
 inspector :: Service
 inspector =
   Service
-  { _svcAbbrev = "Inspector"
-  , _svcSigner = v4
-  , _svcPrefix = "inspector"
-  , _svcVersion = "2016-02-16"
-  , _svcEndpoint = defaultEndpoint inspector
-  , _svcTimeout = Just 70
-  , _svcCheck = statusSuccess
-  , _svcError = parseJSONError "Inspector"
-  , _svcRetry = retry
-  }
+    { _svcAbbrev = "Inspector"
+    , _svcSigner = v4
+    , _svcPrefix = "inspector"
+    , _svcVersion = "2016-02-16"
+    , _svcEndpoint = defaultEndpoint inspector
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseJSONError "Inspector"
+    , _svcRetry = retry
+    }
   where
     retry =
       Exponential
-      { _retryBase = 5.0e-2
-      , _retryGrowth = 2
-      , _retryAttempts = 5
-      , _retryCheck = check
-      }
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
     check e
       | has (hasCode "ThrottledException" . hasStatus 400) e =
         Just "throttled_exception"
@@ -326,6 +334,8 @@
         Just "throttling_exception"
       | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
       | has (hasStatus 504) e = Just "gateway_timeout"
+      | has (hasCode "RequestThrottledException" . hasStatus 400) e =
+        Just "request_throttled_exception"
       | has (hasStatus 502) e = Just "bad_gateway"
       | has (hasStatus 503) e = Just "service_unavailable"
       | has (hasStatus 500) e = Just "general_server_error"
diff --git a/gen/Network/AWS/Inspector/Types/Product.hs b/gen/Network/AWS/Inspector/Types/Product.hs
--- a/gen/Network/AWS/Inspector/Types/Product.hs
+++ b/gen/Network/AWS/Inspector/Types/Product.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.Types.Product
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -47,11 +47,11 @@
 
 -- | The current health state of the agent. Values can be set to __HEALTHY__ or __UNHEALTHY__ .
 afAgentHealths :: Lens' AgentFilter [AgentHealth]
-afAgentHealths = lens _afAgentHealths (\ s a -> s{_afAgentHealths = a}) . _Coerce;
+afAgentHealths = lens _afAgentHealths (\ s a -> s{_afAgentHealths = a}) . _Coerce
 
 -- | The detailed health state of the agent. Values can be set to __IDLE__ , __RUNNING__ , __SHUTDOWN__ , __UNHEALTHY__ , __THROTTLED__ , and __UNKNOWN__ .
 afAgentHealthCodes :: Lens' AgentFilter [AgentHealthCode]
-afAgentHealthCodes = lens _afAgentHealthCodes (\ s a -> s{_afAgentHealthCodes = a}) . _Coerce;
+afAgentHealthCodes = lens _afAgentHealthCodes (\ s a -> s{_afAgentHealthCodes = a}) . _Coerce
 
 instance Hashable AgentFilter where
 
@@ -70,7 +70,13 @@
 --
 -- /See:/ 'agentPreview' smart constructor.
 data AgentPreview = AgentPreview'
-  { _apAutoScalingGroup :: !(Maybe Text)
+  { _apHostname         :: !(Maybe Text)
+  , _apAutoScalingGroup :: !(Maybe Text)
+  , _apOperatingSystem  :: !(Maybe Text)
+  , _apAgentVersion     :: !(Maybe Text)
+  , _apKernelVersion    :: !(Maybe Text)
+  , _apAgentHealth      :: !(Maybe AgentHealth)
+  , _apIpv4Address      :: !(Maybe Text)
   , _apAgentId          :: !Text
   } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
@@ -79,30 +85,81 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'apHostname' - The hostname of the EC2 instance on which the Amazon Inspector Agent is installed.
+--
 -- * 'apAutoScalingGroup' - The Auto Scaling group for the EC2 instance where the agent is installed.
 --
+-- * 'apOperatingSystem' - The operating system running on the EC2 instance on which the Amazon Inspector Agent is installed.
+--
+-- * 'apAgentVersion' - The version of the Amazon Inspector Agent.
+--
+-- * 'apKernelVersion' - The kernel version of the operating system running on the EC2 instance on which the Amazon Inspector Agent is installed.
+--
+-- * 'apAgentHealth' - The health status of the Amazon Inspector Agent.
+--
+-- * 'apIpv4Address' - The IP address of the EC2 instance on which the Amazon Inspector Agent is installed.
+--
 -- * 'apAgentId' - The ID of the EC2 instance where the agent is installed.
 agentPreview
     :: Text -- ^ 'apAgentId'
     -> AgentPreview
 agentPreview pAgentId_ =
-  AgentPreview' {_apAutoScalingGroup = Nothing, _apAgentId = pAgentId_}
+  AgentPreview'
+    { _apHostname = Nothing
+    , _apAutoScalingGroup = Nothing
+    , _apOperatingSystem = Nothing
+    , _apAgentVersion = Nothing
+    , _apKernelVersion = Nothing
+    , _apAgentHealth = Nothing
+    , _apIpv4Address = Nothing
+    , _apAgentId = pAgentId_
+    }
 
 
+-- | The hostname of the EC2 instance on which the Amazon Inspector Agent is installed.
+apHostname :: Lens' AgentPreview (Maybe Text)
+apHostname = lens _apHostname (\ s a -> s{_apHostname = a})
+
 -- | The Auto Scaling group for the EC2 instance where the agent is installed.
 apAutoScalingGroup :: Lens' AgentPreview (Maybe Text)
-apAutoScalingGroup = lens _apAutoScalingGroup (\ s a -> s{_apAutoScalingGroup = a});
+apAutoScalingGroup = lens _apAutoScalingGroup (\ s a -> s{_apAutoScalingGroup = a})
 
+-- | The operating system running on the EC2 instance on which the Amazon Inspector Agent is installed.
+apOperatingSystem :: Lens' AgentPreview (Maybe Text)
+apOperatingSystem = lens _apOperatingSystem (\ s a -> s{_apOperatingSystem = a})
+
+-- | The version of the Amazon Inspector Agent.
+apAgentVersion :: Lens' AgentPreview (Maybe Text)
+apAgentVersion = lens _apAgentVersion (\ s a -> s{_apAgentVersion = a})
+
+-- | The kernel version of the operating system running on the EC2 instance on which the Amazon Inspector Agent is installed.
+apKernelVersion :: Lens' AgentPreview (Maybe Text)
+apKernelVersion = lens _apKernelVersion (\ s a -> s{_apKernelVersion = a})
+
+-- | The health status of the Amazon Inspector Agent.
+apAgentHealth :: Lens' AgentPreview (Maybe AgentHealth)
+apAgentHealth = lens _apAgentHealth (\ s a -> s{_apAgentHealth = a})
+
+-- | The IP address of the EC2 instance on which the Amazon Inspector Agent is installed.
+apIpv4Address :: Lens' AgentPreview (Maybe Text)
+apIpv4Address = lens _apIpv4Address (\ s a -> s{_apIpv4Address = a})
+
 -- | The ID of the EC2 instance where the agent is installed.
 apAgentId :: Lens' AgentPreview Text
-apAgentId = lens _apAgentId (\ s a -> s{_apAgentId = a});
+apAgentId = lens _apAgentId (\ s a -> s{_apAgentId = a})
 
 instance FromJSON AgentPreview where
         parseJSON
           = withObject "AgentPreview"
               (\ x ->
                  AgentPreview' <$>
-                   (x .:? "autoScalingGroup") <*> (x .: "agentId"))
+                   (x .:? "hostname") <*> (x .:? "autoScalingGroup") <*>
+                     (x .:? "operatingSystem")
+                     <*> (x .:? "agentVersion")
+                     <*> (x .:? "kernelVersion")
+                     <*> (x .:? "agentHealth")
+                     <*> (x .:? "ipv4Address")
+                     <*> (x .: "agentId"))
 
 instance Hashable AgentPreview where
 
@@ -180,83 +237,83 @@
     -> AssessmentRun
 assessmentRun pArn_ pName_ pAssessmentTemplateARN_ pState_ pDurationInSeconds_ pRulesPackageARNs_ pCreatedAt_ pStateChangedAt_ pDataCollected_ =
   AssessmentRun'
-  { _arStartedAt = Nothing
-  , _arCompletedAt = Nothing
-  , _arArn = pArn_
-  , _arName = pName_
-  , _arAssessmentTemplateARN = pAssessmentTemplateARN_
-  , _arState = pState_
-  , _arDurationInSeconds = _Nat # pDurationInSeconds_
-  , _arRulesPackageARNs = _List1 # pRulesPackageARNs_
-  , _arUserAttributesForFindings = mempty
-  , _arCreatedAt = _Time # pCreatedAt_
-  , _arStateChangedAt = _Time # pStateChangedAt_
-  , _arDataCollected = pDataCollected_
-  , _arStateChanges = mempty
-  , _arNotifications = mempty
-  , _arFindingCounts = mempty
-  }
+    { _arStartedAt = Nothing
+    , _arCompletedAt = Nothing
+    , _arArn = pArn_
+    , _arName = pName_
+    , _arAssessmentTemplateARN = pAssessmentTemplateARN_
+    , _arState = pState_
+    , _arDurationInSeconds = _Nat # pDurationInSeconds_
+    , _arRulesPackageARNs = _List1 # pRulesPackageARNs_
+    , _arUserAttributesForFindings = mempty
+    , _arCreatedAt = _Time # pCreatedAt_
+    , _arStateChangedAt = _Time # pStateChangedAt_
+    , _arDataCollected = pDataCollected_
+    , _arStateChanges = mempty
+    , _arNotifications = mempty
+    , _arFindingCounts = mempty
+    }
 
 
 -- | The time when 'StartAssessmentRun' was called.
 arStartedAt :: Lens' AssessmentRun (Maybe UTCTime)
-arStartedAt = lens _arStartedAt (\ s a -> s{_arStartedAt = a}) . mapping _Time;
+arStartedAt = lens _arStartedAt (\ s a -> s{_arStartedAt = a}) . mapping _Time
 
 -- | The assessment run completion time that corresponds to the rules packages evaluation completion time or failure.
 arCompletedAt :: Lens' AssessmentRun (Maybe UTCTime)
-arCompletedAt = lens _arCompletedAt (\ s a -> s{_arCompletedAt = a}) . mapping _Time;
+arCompletedAt = lens _arCompletedAt (\ s a -> s{_arCompletedAt = a}) . mapping _Time
 
 -- | The ARN of the assessment run.
 arArn :: Lens' AssessmentRun Text
-arArn = lens _arArn (\ s a -> s{_arArn = a});
+arArn = lens _arArn (\ s a -> s{_arArn = a})
 
 -- | The auto-generated name for the assessment run.
 arName :: Lens' AssessmentRun Text
-arName = lens _arName (\ s a -> s{_arName = a});
+arName = lens _arName (\ s a -> s{_arName = a})
 
 -- | The ARN of the assessment template that is associated with the assessment run.
 arAssessmentTemplateARN :: Lens' AssessmentRun Text
-arAssessmentTemplateARN = lens _arAssessmentTemplateARN (\ s a -> s{_arAssessmentTemplateARN = a});
+arAssessmentTemplateARN = lens _arAssessmentTemplateARN (\ s a -> s{_arAssessmentTemplateARN = a})
 
 -- | The state of the assessment run.
 arState :: Lens' AssessmentRun AssessmentRunState
-arState = lens _arState (\ s a -> s{_arState = a});
+arState = lens _arState (\ s a -> s{_arState = a})
 
 -- | The duration of the assessment run.
 arDurationInSeconds :: Lens' AssessmentRun Natural
-arDurationInSeconds = lens _arDurationInSeconds (\ s a -> s{_arDurationInSeconds = a}) . _Nat;
+arDurationInSeconds = lens _arDurationInSeconds (\ s a -> s{_arDurationInSeconds = a}) . _Nat
 
 -- | The rules packages selected for the assessment run.
 arRulesPackageARNs :: Lens' AssessmentRun (NonEmpty Text)
-arRulesPackageARNs = lens _arRulesPackageARNs (\ s a -> s{_arRulesPackageARNs = a}) . _List1;
+arRulesPackageARNs = lens _arRulesPackageARNs (\ s a -> s{_arRulesPackageARNs = a}) . _List1
 
 -- | The user-defined attributes that are assigned to every generated finding.
 arUserAttributesForFindings :: Lens' AssessmentRun [Attribute]
-arUserAttributesForFindings = lens _arUserAttributesForFindings (\ s a -> s{_arUserAttributesForFindings = a}) . _Coerce;
+arUserAttributesForFindings = lens _arUserAttributesForFindings (\ s a -> s{_arUserAttributesForFindings = a}) . _Coerce
 
 -- | The time when 'StartAssessmentRun' was called.
 arCreatedAt :: Lens' AssessmentRun UTCTime
-arCreatedAt = lens _arCreatedAt (\ s a -> s{_arCreatedAt = a}) . _Time;
+arCreatedAt = lens _arCreatedAt (\ s a -> s{_arCreatedAt = a}) . _Time
 
 -- | The last time when the assessment run's state changed.
 arStateChangedAt :: Lens' AssessmentRun UTCTime
-arStateChangedAt = lens _arStateChangedAt (\ s a -> s{_arStateChangedAt = a}) . _Time;
+arStateChangedAt = lens _arStateChangedAt (\ s a -> s{_arStateChangedAt = a}) . _Time
 
 -- | A Boolean value (true or false) that specifies whether the process of collecting data from the agents is completed.
 arDataCollected :: Lens' AssessmentRun Bool
-arDataCollected = lens _arDataCollected (\ s a -> s{_arDataCollected = a});
+arDataCollected = lens _arDataCollected (\ s a -> s{_arDataCollected = a})
 
 -- | A list of the assessment run state changes.
 arStateChanges :: Lens' AssessmentRun [AssessmentRunStateChange]
-arStateChanges = lens _arStateChanges (\ s a -> s{_arStateChanges = a}) . _Coerce;
+arStateChanges = lens _arStateChanges (\ s a -> s{_arStateChanges = a}) . _Coerce
 
 -- | A list of notifications for the event subscriptions. A notification about a particular generated finding is added to this list only once.
 arNotifications :: Lens' AssessmentRun [AssessmentRunNotification]
-arNotifications = lens _arNotifications (\ s a -> s{_arNotifications = a}) . _Coerce;
+arNotifications = lens _arNotifications (\ s a -> s{_arNotifications = a}) . _Coerce
 
 -- | Provides a total count of generated findings per severity.
 arFindingCounts :: Lens' AssessmentRun (HashMap Severity Int)
-arFindingCounts = lens _arFindingCounts (\ s a -> s{_arFindingCounts = a}) . _Map;
+arFindingCounts = lens _arFindingCounts (\ s a -> s{_arFindingCounts = a}) . _Map
 
 instance FromJSON AssessmentRun where
         parseJSON
@@ -323,43 +380,43 @@
     -> AssessmentRunAgent
 assessmentRunAgent pAgentId_ pAssessmentRunARN_ pAgentHealth_ pAgentHealthCode_ =
   AssessmentRunAgent'
-  { _araAutoScalingGroup = Nothing
-  , _araAgentHealthDetails = Nothing
-  , _araAgentId = pAgentId_
-  , _araAssessmentRunARN = pAssessmentRunARN_
-  , _araAgentHealth = pAgentHealth_
-  , _araAgentHealthCode = pAgentHealthCode_
-  , _araTelemetryMetadata = mempty
-  }
+    { _araAutoScalingGroup = Nothing
+    , _araAgentHealthDetails = Nothing
+    , _araAgentId = pAgentId_
+    , _araAssessmentRunARN = pAssessmentRunARN_
+    , _araAgentHealth = pAgentHealth_
+    , _araAgentHealthCode = pAgentHealthCode_
+    , _araTelemetryMetadata = mempty
+    }
 
 
 -- | The Auto Scaling group of the EC2 instance that is specified by the agent ID.
 araAutoScalingGroup :: Lens' AssessmentRunAgent (Maybe Text)
-araAutoScalingGroup = lens _araAutoScalingGroup (\ s a -> s{_araAutoScalingGroup = a});
+araAutoScalingGroup = lens _araAutoScalingGroup (\ s a -> s{_araAutoScalingGroup = a})
 
 -- | The description for the agent health code.
 araAgentHealthDetails :: Lens' AssessmentRunAgent (Maybe Text)
-araAgentHealthDetails = lens _araAgentHealthDetails (\ s a -> s{_araAgentHealthDetails = a});
+araAgentHealthDetails = lens _araAgentHealthDetails (\ s a -> s{_araAgentHealthDetails = a})
 
 -- | The AWS account of the EC2 instance where the agent is installed.
 araAgentId :: Lens' AssessmentRunAgent Text
-araAgentId = lens _araAgentId (\ s a -> s{_araAgentId = a});
+araAgentId = lens _araAgentId (\ s a -> s{_araAgentId = a})
 
 -- | The ARN of the assessment run that is associated with the agent.
 araAssessmentRunARN :: Lens' AssessmentRunAgent Text
-araAssessmentRunARN = lens _araAssessmentRunARN (\ s a -> s{_araAssessmentRunARN = a});
+araAssessmentRunARN = lens _araAssessmentRunARN (\ s a -> s{_araAssessmentRunARN = a})
 
 -- | The current health state of the agent.
 araAgentHealth :: Lens' AssessmentRunAgent AgentHealth
-araAgentHealth = lens _araAgentHealth (\ s a -> s{_araAgentHealth = a});
+araAgentHealth = lens _araAgentHealth (\ s a -> s{_araAgentHealth = a})
 
 -- | The detailed health state of the agent.
 araAgentHealthCode :: Lens' AssessmentRunAgent AgentHealthCode
-araAgentHealthCode = lens _araAgentHealthCode (\ s a -> s{_araAgentHealthCode = a});
+araAgentHealthCode = lens _araAgentHealthCode (\ s a -> s{_araAgentHealthCode = a})
 
 -- | The Amazon Inspector application data metrics that are collected by the agent.
 araTelemetryMetadata :: Lens' AssessmentRunAgent [TelemetryMetadata]
-araTelemetryMetadata = lens _araTelemetryMetadata (\ s a -> s{_araTelemetryMetadata = a}) . _Coerce;
+araTelemetryMetadata = lens _araTelemetryMetadata (\ s a -> s{_araTelemetryMetadata = a}) . _Coerce
 
 instance FromJSON AssessmentRunAgent where
         parseJSON
@@ -415,43 +472,43 @@
     :: AssessmentRunFilter
 assessmentRunFilter =
   AssessmentRunFilter'
-  { _arfStates = Nothing
-  , _arfNamePattern = Nothing
-  , _arfStartTimeRange = Nothing
-  , _arfStateChangeTimeRange = Nothing
-  , _arfRulesPackageARNs = Nothing
-  , _arfCompletionTimeRange = Nothing
-  , _arfDurationRange = Nothing
-  }
+    { _arfStates = Nothing
+    , _arfNamePattern = Nothing
+    , _arfStartTimeRange = Nothing
+    , _arfStateChangeTimeRange = Nothing
+    , _arfRulesPackageARNs = Nothing
+    , _arfCompletionTimeRange = Nothing
+    , _arfDurationRange = Nothing
+    }
 
 
 -- | For a record to match a filter, one of the values specified for this data type property must be the exact match of the value of the __assessmentRunState__ property of the 'AssessmentRun' data type.
 arfStates :: Lens' AssessmentRunFilter [AssessmentRunState]
-arfStates = lens _arfStates (\ s a -> s{_arfStates = a}) . _Default . _Coerce;
+arfStates = lens _arfStates (\ s a -> s{_arfStates = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, an explicit value or a string containing a wildcard that is specified for this data type property must match the value of the __assessmentRunName__ property of the 'AssessmentRun' data type.
 arfNamePattern :: Lens' AssessmentRunFilter (Maybe Text)
-arfNamePattern = lens _arfNamePattern (\ s a -> s{_arfNamePattern = a});
+arfNamePattern = lens _arfNamePattern (\ s a -> s{_arfNamePattern = a})
 
 -- | For a record to match a filter, the value that is specified for this data type property must inclusively match any value between the specified minimum and maximum values of the __startTime__ property of the 'AssessmentRun' data type.
 arfStartTimeRange :: Lens' AssessmentRunFilter (Maybe TimestampRange)
-arfStartTimeRange = lens _arfStartTimeRange (\ s a -> s{_arfStartTimeRange = a});
+arfStartTimeRange = lens _arfStartTimeRange (\ s a -> s{_arfStartTimeRange = a})
 
 -- | For a record to match a filter, the value that is specified for this data type property must match the __stateChangedAt__ property of the 'AssessmentRun' data type.
 arfStateChangeTimeRange :: Lens' AssessmentRunFilter (Maybe TimestampRange)
-arfStateChangeTimeRange = lens _arfStateChangeTimeRange (\ s a -> s{_arfStateChangeTimeRange = a});
+arfStateChangeTimeRange = lens _arfStateChangeTimeRange (\ s a -> s{_arfStateChangeTimeRange = a})
 
 -- | For a record to match a filter, the value that is specified for this data type property must be contained in the list of values of the __rulesPackages__ property of the 'AssessmentRun' data type.
 arfRulesPackageARNs :: Lens' AssessmentRunFilter [Text]
-arfRulesPackageARNs = lens _arfRulesPackageARNs (\ s a -> s{_arfRulesPackageARNs = a}) . _Default . _Coerce;
+arfRulesPackageARNs = lens _arfRulesPackageARNs (\ s a -> s{_arfRulesPackageARNs = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, the value that is specified for this data type property must inclusively match any value between the specified minimum and maximum values of the __completedAt__ property of the 'AssessmentRun' data type.
 arfCompletionTimeRange :: Lens' AssessmentRunFilter (Maybe TimestampRange)
-arfCompletionTimeRange = lens _arfCompletionTimeRange (\ s a -> s{_arfCompletionTimeRange = a});
+arfCompletionTimeRange = lens _arfCompletionTimeRange (\ s a -> s{_arfCompletionTimeRange = a})
 
 -- | For a record to match a filter, the value that is specified for this data type property must inclusively match any value between the specified minimum and maximum values of the __durationInSeconds__ property of the 'AssessmentRun' data type.
 arfDurationRange :: Lens' AssessmentRunFilter (Maybe DurationRange)
-arfDurationRange = lens _arfDurationRange (\ s a -> s{_arfDurationRange = a});
+arfDurationRange = lens _arfDurationRange (\ s a -> s{_arfDurationRange = a})
 
 instance Hashable AssessmentRunFilter where
 
@@ -508,38 +565,38 @@
     -> AssessmentRunNotification
 assessmentRunNotification pDate_ pEvent_ pError_ =
   AssessmentRunNotification'
-  { _arnSnsTopicARN = Nothing
-  , _arnSnsPublishStatusCode = Nothing
-  , _arnMessage = Nothing
-  , _arnDate = _Time # pDate_
-  , _arnEvent = pEvent_
-  , _arnError = pError_
-  }
+    { _arnSnsTopicARN = Nothing
+    , _arnSnsPublishStatusCode = Nothing
+    , _arnMessage = Nothing
+    , _arnDate = _Time # pDate_
+    , _arnEvent = pEvent_
+    , _arnError = pError_
+    }
 
 
 -- | The SNS topic to which the SNS notification is sent.
 arnSnsTopicARN :: Lens' AssessmentRunNotification (Maybe Text)
-arnSnsTopicARN = lens _arnSnsTopicARN (\ s a -> s{_arnSnsTopicARN = a});
+arnSnsTopicARN = lens _arnSnsTopicARN (\ s a -> s{_arnSnsTopicARN = a})
 
 -- | The status code of the SNS notification.
 arnSnsPublishStatusCode :: Lens' AssessmentRunNotification (Maybe AssessmentRunNotificationSNSStatusCode)
-arnSnsPublishStatusCode = lens _arnSnsPublishStatusCode (\ s a -> s{_arnSnsPublishStatusCode = a});
+arnSnsPublishStatusCode = lens _arnSnsPublishStatusCode (\ s a -> s{_arnSnsPublishStatusCode = a})
 
 -- | The message included in the notification.
 arnMessage :: Lens' AssessmentRunNotification (Maybe Text)
-arnMessage = lens _arnMessage (\ s a -> s{_arnMessage = a});
+arnMessage = lens _arnMessage (\ s a -> s{_arnMessage = a})
 
 -- | The date of the notification.
 arnDate :: Lens' AssessmentRunNotification UTCTime
-arnDate = lens _arnDate (\ s a -> s{_arnDate = a}) . _Time;
+arnDate = lens _arnDate (\ s a -> s{_arnDate = a}) . _Time
 
 -- | The event for which a notification is sent.
 arnEvent :: Lens' AssessmentRunNotification InspectorEvent
-arnEvent = lens _arnEvent (\ s a -> s{_arnEvent = a});
+arnEvent = lens _arnEvent (\ s a -> s{_arnEvent = a})
 
 -- | The Boolean value that specifies whether the notification represents an error.
 arnError :: Lens' AssessmentRunNotification Bool
-arnError = lens _arnError (\ s a -> s{_arnError = a});
+arnError = lens _arnError (\ s a -> s{_arnError = a})
 
 instance FromJSON AssessmentRunNotification where
         parseJSON
@@ -581,16 +638,16 @@
     -> AssessmentRunStateChange
 assessmentRunStateChange pStateChangedAt_ pState_ =
   AssessmentRunStateChange'
-  {_arscStateChangedAt = _Time # pStateChangedAt_, _arscState = pState_}
+    {_arscStateChangedAt = _Time # pStateChangedAt_, _arscState = pState_}
 
 
 -- | The last time the assessment run state changed.
 arscStateChangedAt :: Lens' AssessmentRunStateChange UTCTime
-arscStateChangedAt = lens _arscStateChangedAt (\ s a -> s{_arscStateChangedAt = a}) . _Time;
+arscStateChangedAt = lens _arscStateChangedAt (\ s a -> s{_arscStateChangedAt = a}) . _Time
 
 -- | The assessment run state.
 arscState :: Lens' AssessmentRunStateChange AssessmentRunState
-arscState = lens _arscState (\ s a -> s{_arscState = a});
+arscState = lens _arscState (\ s a -> s{_arscState = a})
 
 instance FromJSON AssessmentRunStateChange where
         parseJSON
@@ -639,33 +696,33 @@
     -> AssessmentTarget
 assessmentTarget pArn_ pName_ pResourceGroupARN_ pCreatedAt_ pUpdatedAt_ =
   AssessmentTarget'
-  { _aArn = pArn_
-  , _aName = pName_
-  , _aResourceGroupARN = pResourceGroupARN_
-  , _aCreatedAt = _Time # pCreatedAt_
-  , _aUpdatedAt = _Time # pUpdatedAt_
-  }
+    { _aArn = pArn_
+    , _aName = pName_
+    , _aResourceGroupARN = pResourceGroupARN_
+    , _aCreatedAt = _Time # pCreatedAt_
+    , _aUpdatedAt = _Time # pUpdatedAt_
+    }
 
 
 -- | The ARN that specifies the Amazon Inspector assessment target.
 aArn :: Lens' AssessmentTarget Text
-aArn = lens _aArn (\ s a -> s{_aArn = a});
+aArn = lens _aArn (\ s a -> s{_aArn = a})
 
 -- | The name of the Amazon Inspector assessment target.
 aName :: Lens' AssessmentTarget Text
-aName = lens _aName (\ s a -> s{_aName = a});
+aName = lens _aName (\ s a -> s{_aName = a})
 
 -- | The ARN that specifies the resource group that is associated with the assessment target.
 aResourceGroupARN :: Lens' AssessmentTarget Text
-aResourceGroupARN = lens _aResourceGroupARN (\ s a -> s{_aResourceGroupARN = a});
+aResourceGroupARN = lens _aResourceGroupARN (\ s a -> s{_aResourceGroupARN = a})
 
 -- | The time at which the assessment target is created.
 aCreatedAt :: Lens' AssessmentTarget UTCTime
-aCreatedAt = lens _aCreatedAt (\ s a -> s{_aCreatedAt = a}) . _Time;
+aCreatedAt = lens _aCreatedAt (\ s a -> s{_aCreatedAt = a}) . _Time
 
 -- | The time at which 'UpdateAssessmentTarget' is called.
 aUpdatedAt :: Lens' AssessmentTarget UTCTime
-aUpdatedAt = lens _aUpdatedAt (\ s a -> s{_aUpdatedAt = a}) . _Time;
+aUpdatedAt = lens _aUpdatedAt (\ s a -> s{_aUpdatedAt = a}) . _Time
 
 instance FromJSON AssessmentTarget where
         parseJSON
@@ -704,7 +761,7 @@
 
 -- | For a record to match a filter, an explicit value or a string that contains a wildcard that is specified for this data type property must match the value of the __assessmentTargetName__ property of the 'AssessmentTarget' data type.
 atfAssessmentTargetNamePattern :: Lens' AssessmentTargetFilter (Maybe Text)
-atfAssessmentTargetNamePattern = lens _atfAssessmentTargetNamePattern (\ s a -> s{_atfAssessmentTargetNamePattern = a});
+atfAssessmentTargetNamePattern = lens _atfAssessmentTargetNamePattern (\ s a -> s{_atfAssessmentTargetNamePattern = a})
 
 instance Hashable AssessmentTargetFilter where
 
@@ -723,12 +780,14 @@
 --
 -- /See:/ 'assessmentTemplate' smart constructor.
 data AssessmentTemplate = AssessmentTemplate'
-  { _atArn                       :: !Text
+  { _atLastAssessmentRunARN      :: !(Maybe Text)
+  , _atArn                       :: !Text
   , _atName                      :: !Text
   , _atAssessmentTargetARN       :: !Text
   , _atDurationInSeconds         :: !Nat
   , _atRulesPackageARNs          :: ![Text]
   , _atUserAttributesForFindings :: ![Attribute]
+  , _atAssessmentRunCount        :: !Int
   , _atCreatedAt                 :: !POSIX
   } deriving (Eq, Read, Show, Data, Typeable, Generic)
 
@@ -737,6 +796,8 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'atLastAssessmentRunARN' - The Amazon Resource Name (ARN) of the most recent assessment run associated with this assessment template. This value exists only when the value of assessmentRunCount is greater than zero.
+--
 -- * 'atArn' - The ARN of the assessment template.
 --
 -- * 'atName' - The name of the assessment template.
@@ -749,64 +810,79 @@
 --
 -- * 'atUserAttributesForFindings' - The user-defined attributes that are assigned to every generated finding from the assessment run that uses this assessment template.
 --
+-- * 'atAssessmentRunCount' - The number of existing assessment runs associated with this assessment template. This value can be zero or a positive integer.
+--
 -- * 'atCreatedAt' - The time at which the assessment template is created.
 assessmentTemplate
     :: Text -- ^ 'atArn'
     -> Text -- ^ 'atName'
     -> Text -- ^ 'atAssessmentTargetARN'
     -> Natural -- ^ 'atDurationInSeconds'
+    -> Int -- ^ 'atAssessmentRunCount'
     -> UTCTime -- ^ 'atCreatedAt'
     -> AssessmentTemplate
-assessmentTemplate pArn_ pName_ pAssessmentTargetARN_ pDurationInSeconds_ pCreatedAt_ =
+assessmentTemplate pArn_ pName_ pAssessmentTargetARN_ pDurationInSeconds_ pAssessmentRunCount_ pCreatedAt_ =
   AssessmentTemplate'
-  { _atArn = pArn_
-  , _atName = pName_
-  , _atAssessmentTargetARN = pAssessmentTargetARN_
-  , _atDurationInSeconds = _Nat # pDurationInSeconds_
-  , _atRulesPackageARNs = mempty
-  , _atUserAttributesForFindings = mempty
-  , _atCreatedAt = _Time # pCreatedAt_
-  }
+    { _atLastAssessmentRunARN = Nothing
+    , _atArn = pArn_
+    , _atName = pName_
+    , _atAssessmentTargetARN = pAssessmentTargetARN_
+    , _atDurationInSeconds = _Nat # pDurationInSeconds_
+    , _atRulesPackageARNs = mempty
+    , _atUserAttributesForFindings = mempty
+    , _atAssessmentRunCount = pAssessmentRunCount_
+    , _atCreatedAt = _Time # pCreatedAt_
+    }
 
 
+-- | The Amazon Resource Name (ARN) of the most recent assessment run associated with this assessment template. This value exists only when the value of assessmentRunCount is greater than zero.
+atLastAssessmentRunARN :: Lens' AssessmentTemplate (Maybe Text)
+atLastAssessmentRunARN = lens _atLastAssessmentRunARN (\ s a -> s{_atLastAssessmentRunARN = a})
+
 -- | The ARN of the assessment template.
 atArn :: Lens' AssessmentTemplate Text
-atArn = lens _atArn (\ s a -> s{_atArn = a});
+atArn = lens _atArn (\ s a -> s{_atArn = a})
 
 -- | The name of the assessment template.
 atName :: Lens' AssessmentTemplate Text
-atName = lens _atName (\ s a -> s{_atName = a});
+atName = lens _atName (\ s a -> s{_atName = a})
 
 -- | The ARN of the assessment target that corresponds to this assessment template.
 atAssessmentTargetARN :: Lens' AssessmentTemplate Text
-atAssessmentTargetARN = lens _atAssessmentTargetARN (\ s a -> s{_atAssessmentTargetARN = a});
+atAssessmentTargetARN = lens _atAssessmentTargetARN (\ s a -> s{_atAssessmentTargetARN = a})
 
 -- | The duration in seconds specified for this assessment tempate. The default value is 3600 seconds (one hour). The maximum value is 86400 seconds (one day).
 atDurationInSeconds :: Lens' AssessmentTemplate Natural
-atDurationInSeconds = lens _atDurationInSeconds (\ s a -> s{_atDurationInSeconds = a}) . _Nat;
+atDurationInSeconds = lens _atDurationInSeconds (\ s a -> s{_atDurationInSeconds = a}) . _Nat
 
 -- | The rules packages that are specified for this assessment template.
 atRulesPackageARNs :: Lens' AssessmentTemplate [Text]
-atRulesPackageARNs = lens _atRulesPackageARNs (\ s a -> s{_atRulesPackageARNs = a}) . _Coerce;
+atRulesPackageARNs = lens _atRulesPackageARNs (\ s a -> s{_atRulesPackageARNs = a}) . _Coerce
 
 -- | The user-defined attributes that are assigned to every generated finding from the assessment run that uses this assessment template.
 atUserAttributesForFindings :: Lens' AssessmentTemplate [Attribute]
-atUserAttributesForFindings = lens _atUserAttributesForFindings (\ s a -> s{_atUserAttributesForFindings = a}) . _Coerce;
+atUserAttributesForFindings = lens _atUserAttributesForFindings (\ s a -> s{_atUserAttributesForFindings = a}) . _Coerce
 
+-- | The number of existing assessment runs associated with this assessment template. This value can be zero or a positive integer.
+atAssessmentRunCount :: Lens' AssessmentTemplate Int
+atAssessmentRunCount = lens _atAssessmentRunCount (\ s a -> s{_atAssessmentRunCount = a})
+
 -- | The time at which the assessment template is created.
 atCreatedAt :: Lens' AssessmentTemplate UTCTime
-atCreatedAt = lens _atCreatedAt (\ s a -> s{_atCreatedAt = a}) . _Time;
+atCreatedAt = lens _atCreatedAt (\ s a -> s{_atCreatedAt = a}) . _Time
 
 instance FromJSON AssessmentTemplate where
         parseJSON
           = withObject "AssessmentTemplate"
               (\ x ->
                  AssessmentTemplate' <$>
-                   (x .: "arn") <*> (x .: "name") <*>
-                     (x .: "assessmentTargetArn")
+                   (x .:? "lastAssessmentRunArn") <*> (x .: "arn") <*>
+                     (x .: "name")
+                     <*> (x .: "assessmentTargetArn")
                      <*> (x .: "durationInSeconds")
                      <*> (x .:? "rulesPackageArns" .!= mempty)
                      <*> (x .:? "userAttributesForFindings" .!= mempty)
+                     <*> (x .: "assessmentRunCount")
                      <*> (x .: "createdAt"))
 
 instance Hashable AssessmentTemplate where
@@ -838,23 +914,23 @@
     :: AssessmentTemplateFilter
 assessmentTemplateFilter =
   AssessmentTemplateFilter'
-  { _atfNamePattern = Nothing
-  , _atfRulesPackageARNs = Nothing
-  , _atfDurationRange = Nothing
-  }
+    { _atfNamePattern = Nothing
+    , _atfRulesPackageARNs = Nothing
+    , _atfDurationRange = Nothing
+    }
 
 
 -- | For a record to match a filter, an explicit value or a string that contains a wildcard that is specified for this data type property must match the value of the __assessmentTemplateName__ property of the 'AssessmentTemplate' data type.
 atfNamePattern :: Lens' AssessmentTemplateFilter (Maybe Text)
-atfNamePattern = lens _atfNamePattern (\ s a -> s{_atfNamePattern = a});
+atfNamePattern = lens _atfNamePattern (\ s a -> s{_atfNamePattern = a})
 
 -- | For a record to match a filter, the values that are specified for this data type property must be contained in the list of values of the __rulesPackageArns__ property of the 'AssessmentTemplate' data type.
 atfRulesPackageARNs :: Lens' AssessmentTemplateFilter [Text]
-atfRulesPackageARNs = lens _atfRulesPackageARNs (\ s a -> s{_atfRulesPackageARNs = a}) . _Default . _Coerce;
+atfRulesPackageARNs = lens _atfRulesPackageARNs (\ s a -> s{_atfRulesPackageARNs = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, the value specified for this data type property must inclusively match any value between the specified minimum and maximum values of the __durationInSeconds__ property of the 'AssessmentTemplate' data type.
 atfDurationRange :: Lens' AssessmentTemplateFilter (Maybe DurationRange)
-atfDurationRange = lens _atfDurationRange (\ s a -> s{_atfDurationRange = a});
+atfDurationRange = lens _atfDurationRange (\ s a -> s{_atfDurationRange = a})
 
 instance Hashable AssessmentTemplateFilter where
 
@@ -903,38 +979,38 @@
     -> AssetAttributes
 assetAttributes pSchemaVersion_ =
   AssetAttributes'
-  { _aaHostname = Nothing
-  , _aaAutoScalingGroup = Nothing
-  , _aaIpv4Addresses = Nothing
-  , _aaAgentId = Nothing
-  , _aaAmiId = Nothing
-  , _aaSchemaVersion = _Nat # pSchemaVersion_
-  }
+    { _aaHostname = Nothing
+    , _aaAutoScalingGroup = Nothing
+    , _aaIpv4Addresses = Nothing
+    , _aaAgentId = Nothing
+    , _aaAmiId = Nothing
+    , _aaSchemaVersion = _Nat # pSchemaVersion_
+    }
 
 
 -- | The hostname of the EC2 instance where the finding is generated.
 aaHostname :: Lens' AssetAttributes (Maybe Text)
-aaHostname = lens _aaHostname (\ s a -> s{_aaHostname = a});
+aaHostname = lens _aaHostname (\ s a -> s{_aaHostname = a})
 
 -- | The Auto Scaling group of the EC2 instance where the finding is generated.
 aaAutoScalingGroup :: Lens' AssetAttributes (Maybe Text)
-aaAutoScalingGroup = lens _aaAutoScalingGroup (\ s a -> s{_aaAutoScalingGroup = a});
+aaAutoScalingGroup = lens _aaAutoScalingGroup (\ s a -> s{_aaAutoScalingGroup = a})
 
 -- | The list of IP v4 addresses of the EC2 instance where the finding is generated.
 aaIpv4Addresses :: Lens' AssetAttributes [Text]
-aaIpv4Addresses = lens _aaIpv4Addresses (\ s a -> s{_aaIpv4Addresses = a}) . _Default . _Coerce;
+aaIpv4Addresses = lens _aaIpv4Addresses (\ s a -> s{_aaIpv4Addresses = a}) . _Default . _Coerce
 
 -- | The ID of the agent that is installed on the EC2 instance where the finding is generated.
 aaAgentId :: Lens' AssetAttributes (Maybe Text)
-aaAgentId = lens _aaAgentId (\ s a -> s{_aaAgentId = a});
+aaAgentId = lens _aaAgentId (\ s a -> s{_aaAgentId = a})
 
 -- | The ID of the Amazon Machine Image (AMI) that is installed on the EC2 instance where the finding is generated.
 aaAmiId :: Lens' AssetAttributes (Maybe Text)
-aaAmiId = lens _aaAmiId (\ s a -> s{_aaAmiId = a});
+aaAmiId = lens _aaAmiId (\ s a -> s{_aaAmiId = a})
 
 -- | The schema version of this data type.
 aaSchemaVersion :: Lens' AssetAttributes Natural
-aaSchemaVersion = lens _aaSchemaVersion (\ s a -> s{_aaSchemaVersion = a}) . _Nat;
+aaSchemaVersion = lens _aaSchemaVersion (\ s a -> s{_aaSchemaVersion = a}) . _Nat
 
 instance FromJSON AssetAttributes where
         parseJSON
@@ -977,11 +1053,11 @@
 
 -- | The value assigned to the attribute key.
 aValue :: Lens' Attribute (Maybe Text)
-aValue = lens _aValue (\ s a -> s{_aValue = a});
+aValue = lens _aValue (\ s a -> s{_aValue = a})
 
 -- | The attribute key.
 aKey :: Lens' Attribute Text
-aKey = lens _aKey (\ s a -> s{_aKey = a});
+aKey = lens _aKey (\ s a -> s{_aKey = a})
 
 instance FromJSON Attribute where
         parseJSON
@@ -1025,11 +1101,11 @@
 
 -- | The minimum value of the duration range. Must be greater than zero.
 drMinSeconds :: Lens' DurationRange (Maybe Natural)
-drMinSeconds = lens _drMinSeconds (\ s a -> s{_drMinSeconds = a}) . mapping _Nat;
+drMinSeconds = lens _drMinSeconds (\ s a -> s{_drMinSeconds = a}) . mapping _Nat
 
 -- | The maximum value of the duration range. Must be less than or equal to 604800 seconds (1 week).
 drMaxSeconds :: Lens' DurationRange (Maybe Natural)
-drMaxSeconds = lens _drMaxSeconds (\ s a -> s{_drMaxSeconds = a}) . mapping _Nat;
+drMaxSeconds = lens _drMaxSeconds (\ s a -> s{_drMaxSeconds = a}) . mapping _Nat
 
 instance Hashable DurationRange where
 
@@ -1066,16 +1142,16 @@
     -> EventSubscription
 eventSubscription pEvent_ pSubscribedAt_ =
   EventSubscription'
-  {_esEvent = pEvent_, _esSubscribedAt = _Time # pSubscribedAt_}
+    {_esEvent = pEvent_, _esSubscribedAt = _Time # pSubscribedAt_}
 
 
 -- | The event for which Amazon Simple Notification Service (SNS) notifications are sent.
 esEvent :: Lens' EventSubscription InspectorEvent
-esEvent = lens _esEvent (\ s a -> s{_esEvent = a});
+esEvent = lens _esEvent (\ s a -> s{_esEvent = a})
 
 -- | The time at which 'SubscribeToEvent' is called.
 esSubscribedAt :: Lens' EventSubscription UTCTime
-esSubscribedAt = lens _esSubscribedAt (\ s a -> s{_esSubscribedAt = a}) . _Time;
+esSubscribedAt = lens _esSubscribedAt (\ s a -> s{_esSubscribedAt = a}) . _Time
 
 instance FromJSON EventSubscription where
         parseJSON
@@ -1112,16 +1188,16 @@
     -> FailedItemDetails
 failedItemDetails pFailureCode_ pRetryable_ =
   FailedItemDetails'
-  {_fidFailureCode = pFailureCode_, _fidRetryable = pRetryable_}
+    {_fidFailureCode = pFailureCode_, _fidRetryable = pRetryable_}
 
 
 -- | The status code of a failed item.
 fidFailureCode :: Lens' FailedItemDetails FailedItemErrorCode
-fidFailureCode = lens _fidFailureCode (\ s a -> s{_fidFailureCode = a});
+fidFailureCode = lens _fidFailureCode (\ s a -> s{_fidFailureCode = a})
 
 -- | Indicates whether you can immediately retry a request for this item for a specified resource.
 fidRetryable :: Lens' FailedItemDetails Bool
-fidRetryable = lens _fidRetryable (\ s a -> s{_fidRetryable = a});
+fidRetryable = lens _fidRetryable (\ s a -> s{_fidRetryable = a})
 
 instance FromJSON FailedItemDetails where
         parseJSON
@@ -1207,98 +1283,98 @@
     -> Finding
 finding pArn_ pCreatedAt_ pUpdatedAt_ =
   Finding'
-  { _fService = Nothing
-  , _fSeverity = Nothing
-  , _fSchemaVersion = Nothing
-  , _fConfidence = Nothing
-  , _fAssetAttributes = Nothing
-  , _fServiceAttributes = Nothing
-  , _fId = Nothing
-  , _fNumericSeverity = Nothing
-  , _fAssetType = Nothing
-  , _fTitle = Nothing
-  , _fIndicatorOfCompromise = Nothing
-  , _fDescription = Nothing
-  , _fRecommendation = Nothing
-  , _fArn = pArn_
-  , _fAttributes = mempty
-  , _fUserAttributes = mempty
-  , _fCreatedAt = _Time # pCreatedAt_
-  , _fUpdatedAt = _Time # pUpdatedAt_
-  }
+    { _fService = Nothing
+    , _fSeverity = Nothing
+    , _fSchemaVersion = Nothing
+    , _fConfidence = Nothing
+    , _fAssetAttributes = Nothing
+    , _fServiceAttributes = Nothing
+    , _fId = Nothing
+    , _fNumericSeverity = Nothing
+    , _fAssetType = Nothing
+    , _fTitle = Nothing
+    , _fIndicatorOfCompromise = Nothing
+    , _fDescription = Nothing
+    , _fRecommendation = Nothing
+    , _fArn = pArn_
+    , _fAttributes = mempty
+    , _fUserAttributes = mempty
+    , _fCreatedAt = _Time # pCreatedAt_
+    , _fUpdatedAt = _Time # pUpdatedAt_
+    }
 
 
 -- | The data element is set to "Inspector".
 fService :: Lens' Finding (Maybe Text)
-fService = lens _fService (\ s a -> s{_fService = a});
+fService = lens _fService (\ s a -> s{_fService = a})
 
 -- | The finding severity. Values can be set to High, Medium, Low, and Informational.
 fSeverity :: Lens' Finding (Maybe Severity)
-fSeverity = lens _fSeverity (\ s a -> s{_fSeverity = a});
+fSeverity = lens _fSeverity (\ s a -> s{_fSeverity = a})
 
 -- | The schema version of this data type.
 fSchemaVersion :: Lens' Finding (Maybe Natural)
-fSchemaVersion = lens _fSchemaVersion (\ s a -> s{_fSchemaVersion = a}) . mapping _Nat;
+fSchemaVersion = lens _fSchemaVersion (\ s a -> s{_fSchemaVersion = a}) . mapping _Nat
 
 -- | This data element is currently not used.
 fConfidence :: Lens' Finding (Maybe Natural)
-fConfidence = lens _fConfidence (\ s a -> s{_fConfidence = a}) . mapping _Nat;
+fConfidence = lens _fConfidence (\ s a -> s{_fConfidence = a}) . mapping _Nat
 
 -- | A collection of attributes of the host from which the finding is generated.
 fAssetAttributes :: Lens' Finding (Maybe AssetAttributes)
-fAssetAttributes = lens _fAssetAttributes (\ s a -> s{_fAssetAttributes = a});
+fAssetAttributes = lens _fAssetAttributes (\ s a -> s{_fAssetAttributes = a})
 
 -- | This data type is used in the 'Finding' data type.
 fServiceAttributes :: Lens' Finding (Maybe InspectorServiceAttributes)
-fServiceAttributes = lens _fServiceAttributes (\ s a -> s{_fServiceAttributes = a});
+fServiceAttributes = lens _fServiceAttributes (\ s a -> s{_fServiceAttributes = a})
 
 -- | The ID of the finding.
 fId :: Lens' Finding (Maybe Text)
-fId = lens _fId (\ s a -> s{_fId = a});
+fId = lens _fId (\ s a -> s{_fId = a})
 
 -- | The numeric value of the finding severity.
 fNumericSeverity :: Lens' Finding (Maybe Double)
-fNumericSeverity = lens _fNumericSeverity (\ s a -> s{_fNumericSeverity = a});
+fNumericSeverity = lens _fNumericSeverity (\ s a -> s{_fNumericSeverity = a})
 
 -- | The type of the host from which the finding is generated.
 fAssetType :: Lens' Finding (Maybe AssetType)
-fAssetType = lens _fAssetType (\ s a -> s{_fAssetType = a});
+fAssetType = lens _fAssetType (\ s a -> s{_fAssetType = a})
 
 -- | The name of the finding.
 fTitle :: Lens' Finding (Maybe Text)
-fTitle = lens _fTitle (\ s a -> s{_fTitle = a});
+fTitle = lens _fTitle (\ s a -> s{_fTitle = a})
 
 -- | This data element is currently not used.
 fIndicatorOfCompromise :: Lens' Finding (Maybe Bool)
-fIndicatorOfCompromise = lens _fIndicatorOfCompromise (\ s a -> s{_fIndicatorOfCompromise = a});
+fIndicatorOfCompromise = lens _fIndicatorOfCompromise (\ s a -> s{_fIndicatorOfCompromise = a})
 
 -- | The description of the finding.
 fDescription :: Lens' Finding (Maybe Text)
-fDescription = lens _fDescription (\ s a -> s{_fDescription = a});
+fDescription = lens _fDescription (\ s a -> s{_fDescription = a})
 
 -- | The recommendation for the finding.
 fRecommendation :: Lens' Finding (Maybe Text)
-fRecommendation = lens _fRecommendation (\ s a -> s{_fRecommendation = a});
+fRecommendation = lens _fRecommendation (\ s a -> s{_fRecommendation = a})
 
 -- | The ARN that specifies the finding.
 fArn :: Lens' Finding Text
-fArn = lens _fArn (\ s a -> s{_fArn = a});
+fArn = lens _fArn (\ s a -> s{_fArn = a})
 
 -- | The system-defined attributes for the finding.
 fAttributes :: Lens' Finding [Attribute]
-fAttributes = lens _fAttributes (\ s a -> s{_fAttributes = a}) . _Coerce;
+fAttributes = lens _fAttributes (\ s a -> s{_fAttributes = a}) . _Coerce
 
 -- | The user-defined attributes that are assigned to the finding.
 fUserAttributes :: Lens' Finding [Attribute]
-fUserAttributes = lens _fUserAttributes (\ s a -> s{_fUserAttributes = a}) . _Coerce;
+fUserAttributes = lens _fUserAttributes (\ s a -> s{_fUserAttributes = a}) . _Coerce
 
 -- | The time when the finding was generated.
 fCreatedAt :: Lens' Finding UTCTime
-fCreatedAt = lens _fCreatedAt (\ s a -> s{_fCreatedAt = a}) . _Time;
+fCreatedAt = lens _fCreatedAt (\ s a -> s{_fCreatedAt = a}) . _Time
 
 -- | The time when 'AddAttributesToFindings' is called.
 fUpdatedAt :: Lens' Finding UTCTime
-fUpdatedAt = lens _fUpdatedAt (\ s a -> s{_fUpdatedAt = a}) . _Time;
+fUpdatedAt = lens _fUpdatedAt (\ s a -> s{_fUpdatedAt = a}) . _Time
 
 instance FromJSON Finding where
         parseJSON
@@ -1367,48 +1443,48 @@
     :: FindingFilter
 findingFilter =
   FindingFilter'
-  { _ffAgentIds = Nothing
-  , _ffRuleNames = Nothing
-  , _ffUserAttributes = Nothing
-  , _ffRulesPackageARNs = Nothing
-  , _ffAttributes = Nothing
-  , _ffSeverities = Nothing
-  , _ffCreationTimeRange = Nothing
-  , _ffAutoScalingGroups = Nothing
-  }
+    { _ffAgentIds = Nothing
+    , _ffRuleNames = Nothing
+    , _ffUserAttributes = Nothing
+    , _ffRulesPackageARNs = Nothing
+    , _ffAttributes = Nothing
+    , _ffSeverities = Nothing
+    , _ffCreationTimeRange = Nothing
+    , _ffAutoScalingGroups = Nothing
+    }
 
 
 -- | For a record to match a filter, one of the values that is specified for this data type property must be the exact match of the value of the __agentId__ property of the 'Finding' data type.
 ffAgentIds :: Lens' FindingFilter [Text]
-ffAgentIds = lens _ffAgentIds (\ s a -> s{_ffAgentIds = a}) . _Default . _Coerce;
+ffAgentIds = lens _ffAgentIds (\ s a -> s{_ffAgentIds = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, one of the values that is specified for this data type property must be the exact match of the value of the __ruleName__ property of the 'Finding' data type.
 ffRuleNames :: Lens' FindingFilter [Text]
-ffRuleNames = lens _ffRuleNames (\ s a -> s{_ffRuleNames = a}) . _Default . _Coerce;
+ffRuleNames = lens _ffRuleNames (\ s a -> s{_ffRuleNames = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, the value that is specified for this data type property must be contained in the list of values of the __userAttributes__ property of the 'Finding' data type.
 ffUserAttributes :: Lens' FindingFilter [Attribute]
-ffUserAttributes = lens _ffUserAttributes (\ s a -> s{_ffUserAttributes = a}) . _Default . _Coerce;
+ffUserAttributes = lens _ffUserAttributes (\ s a -> s{_ffUserAttributes = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, one of the values that is specified for this data type property must be the exact match of the value of the __rulesPackageArn__ property of the 'Finding' data type.
 ffRulesPackageARNs :: Lens' FindingFilter [Text]
-ffRulesPackageARNs = lens _ffRulesPackageARNs (\ s a -> s{_ffRulesPackageARNs = a}) . _Default . _Coerce;
+ffRulesPackageARNs = lens _ffRulesPackageARNs (\ s a -> s{_ffRulesPackageARNs = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, the list of values that are specified for this data type property must be contained in the list of values of the __attributes__ property of the 'Finding' data type.
 ffAttributes :: Lens' FindingFilter [Attribute]
-ffAttributes = lens _ffAttributes (\ s a -> s{_ffAttributes = a}) . _Default . _Coerce;
+ffAttributes = lens _ffAttributes (\ s a -> s{_ffAttributes = a}) . _Default . _Coerce
 
 -- | For a record to match a filter, one of the values that is specified for this data type property must be the exact match of the value of the __severity__ property of the 'Finding' data type.
 ffSeverities :: Lens' FindingFilter [Severity]
-ffSeverities = lens _ffSeverities (\ s a -> s{_ffSeverities = a}) . _Default . _Coerce;
+ffSeverities = lens _ffSeverities (\ s a -> s{_ffSeverities = a}) . _Default . _Coerce
 
 -- | The time range during which the finding is generated.
 ffCreationTimeRange :: Lens' FindingFilter (Maybe TimestampRange)
-ffCreationTimeRange = lens _ffCreationTimeRange (\ s a -> s{_ffCreationTimeRange = a});
+ffCreationTimeRange = lens _ffCreationTimeRange (\ s a -> s{_ffCreationTimeRange = a})
 
 -- | For a record to match a filter, one of the values that is specified for this data type property must be the exact match of the value of the __autoScalingGroup__ property of the 'Finding' data type.
 ffAutoScalingGroups :: Lens' FindingFilter [Text]
-ffAutoScalingGroups = lens _ffAutoScalingGroups (\ s a -> s{_ffAutoScalingGroups = a}) . _Default . _Coerce;
+ffAutoScalingGroups = lens _ffAutoScalingGroups (\ s a -> s{_ffAutoScalingGroups = a}) . _Default . _Coerce
 
 instance Hashable FindingFilter where
 
@@ -1453,23 +1529,23 @@
     -> InspectorServiceAttributes
 inspectorServiceAttributes pSchemaVersion_ =
   InspectorServiceAttributes'
-  { _isaRulesPackageARN = Nothing
-  , _isaAssessmentRunARN = Nothing
-  , _isaSchemaVersion = _Nat # pSchemaVersion_
-  }
+    { _isaRulesPackageARN = Nothing
+    , _isaAssessmentRunARN = Nothing
+    , _isaSchemaVersion = _Nat # pSchemaVersion_
+    }
 
 
 -- | The ARN of the rules package that is used to generate the finding.
 isaRulesPackageARN :: Lens' InspectorServiceAttributes (Maybe Text)
-isaRulesPackageARN = lens _isaRulesPackageARN (\ s a -> s{_isaRulesPackageARN = a});
+isaRulesPackageARN = lens _isaRulesPackageARN (\ s a -> s{_isaRulesPackageARN = a})
 
 -- | The ARN of the assessment run during which the finding is generated.
 isaAssessmentRunARN :: Lens' InspectorServiceAttributes (Maybe Text)
-isaAssessmentRunARN = lens _isaAssessmentRunARN (\ s a -> s{_isaAssessmentRunARN = a});
+isaAssessmentRunARN = lens _isaAssessmentRunARN (\ s a -> s{_isaAssessmentRunARN = a})
 
 -- | The schema version of this data type.
 isaSchemaVersion :: Lens' InspectorServiceAttributes Natural
-isaSchemaVersion = lens _isaSchemaVersion (\ s a -> s{_isaSchemaVersion = a}) . _Nat;
+isaSchemaVersion = lens _isaSchemaVersion (\ s a -> s{_isaSchemaVersion = a}) . _Nat
 
 instance FromJSON InspectorServiceAttributes where
         parseJSON
@@ -1512,23 +1588,23 @@
     -> ResourceGroup
 resourceGroup pArn_ pTags_ pCreatedAt_ =
   ResourceGroup'
-  { _rgArn = pArn_
-  , _rgTags = _List1 # pTags_
-  , _rgCreatedAt = _Time # pCreatedAt_
-  }
+    { _rgArn = pArn_
+    , _rgTags = _List1 # pTags_
+    , _rgCreatedAt = _Time # pCreatedAt_
+    }
 
 
 -- | The ARN of the resource group.
 rgArn :: Lens' ResourceGroup Text
-rgArn = lens _rgArn (\ s a -> s{_rgArn = a});
+rgArn = lens _rgArn (\ s a -> s{_rgArn = a})
 
 -- | The tags (key and value pairs) of the resource group. This data type property is used in the 'CreateResourceGroup' action.
 rgTags :: Lens' ResourceGroup (NonEmpty ResourceGroupTag)
-rgTags = lens _rgTags (\ s a -> s{_rgTags = a}) . _List1;
+rgTags = lens _rgTags (\ s a -> s{_rgTags = a}) . _List1
 
 -- | The time at which resource group is created.
 rgCreatedAt :: Lens' ResourceGroup UTCTime
-rgCreatedAt = lens _rgCreatedAt (\ s a -> s{_rgCreatedAt = a}) . _Time;
+rgCreatedAt = lens _rgCreatedAt (\ s a -> s{_rgCreatedAt = a}) . _Time
 
 instance FromJSON ResourceGroup where
         parseJSON
@@ -1569,11 +1645,11 @@
 
 -- | The value assigned to a tag key.
 rgtValue :: Lens' ResourceGroupTag (Maybe Text)
-rgtValue = lens _rgtValue (\ s a -> s{_rgtValue = a});
+rgtValue = lens _rgtValue (\ s a -> s{_rgtValue = a})
 
 -- | A tag key.
 rgtKey :: Lens' ResourceGroupTag Text
-rgtKey = lens _rgtKey (\ s a -> s{_rgtKey = a});
+rgtKey = lens _rgtKey (\ s a -> s{_rgtKey = a})
 
 instance FromJSON ResourceGroupTag where
         parseJSON
@@ -1628,33 +1704,33 @@
     -> RulesPackage
 rulesPackage pArn_ pName_ pVersion_ pProvider_ =
   RulesPackage'
-  { _rpDescription = Nothing
-  , _rpArn = pArn_
-  , _rpName = pName_
-  , _rpVersion = pVersion_
-  , _rpProvider = pProvider_
-  }
+    { _rpDescription = Nothing
+    , _rpArn = pArn_
+    , _rpName = pName_
+    , _rpVersion = pVersion_
+    , _rpProvider = pProvider_
+    }
 
 
 -- | The description of the rules package.
 rpDescription :: Lens' RulesPackage (Maybe Text)
-rpDescription = lens _rpDescription (\ s a -> s{_rpDescription = a});
+rpDescription = lens _rpDescription (\ s a -> s{_rpDescription = a})
 
 -- | The ARN of the rules package.
 rpArn :: Lens' RulesPackage Text
-rpArn = lens _rpArn (\ s a -> s{_rpArn = a});
+rpArn = lens _rpArn (\ s a -> s{_rpArn = a})
 
 -- | The name of the rules package.
 rpName :: Lens' RulesPackage Text
-rpName = lens _rpName (\ s a -> s{_rpName = a});
+rpName = lens _rpName (\ s a -> s{_rpName = a})
 
 -- | The version ID of the rules package.
 rpVersion :: Lens' RulesPackage Text
-rpVersion = lens _rpVersion (\ s a -> s{_rpVersion = a});
+rpVersion = lens _rpVersion (\ s a -> s{_rpVersion = a})
 
 -- | The provider of the rules package.
 rpProvider :: Lens' RulesPackage Text
-rpProvider = lens _rpProvider (\ s a -> s{_rpProvider = a});
+rpProvider = lens _rpProvider (\ s a -> s{_rpProvider = a})
 
 instance FromJSON RulesPackage where
         parseJSON
@@ -1698,23 +1774,23 @@
     -> Subscription
 subscription pResourceARN_ pTopicARN_ pEventSubscriptions_ =
   Subscription'
-  { _sResourceARN = pResourceARN_
-  , _sTopicARN = pTopicARN_
-  , _sEventSubscriptions = _List1 # pEventSubscriptions_
-  }
+    { _sResourceARN = pResourceARN_
+    , _sTopicARN = pTopicARN_
+    , _sEventSubscriptions = _List1 # pEventSubscriptions_
+    }
 
 
 -- | The ARN of the assessment template that is used during the event for which the SNS notification is sent.
 sResourceARN :: Lens' Subscription Text
-sResourceARN = lens _sResourceARN (\ s a -> s{_sResourceARN = a});
+sResourceARN = lens _sResourceARN (\ s a -> s{_sResourceARN = a})
 
 -- | The ARN of the Amazon Simple Notification Service (SNS) topic to which the SNS notifications are sent.
 sTopicARN :: Lens' Subscription Text
-sTopicARN = lens _sTopicARN (\ s a -> s{_sTopicARN = a});
+sTopicARN = lens _sTopicARN (\ s a -> s{_sTopicARN = a})
 
 -- | The list of existing event subscriptions.
 sEventSubscriptions :: Lens' Subscription (NonEmpty EventSubscription)
-sEventSubscriptions = lens _sEventSubscriptions (\ s a -> s{_sEventSubscriptions = a}) . _List1;
+sEventSubscriptions = lens _sEventSubscriptions (\ s a -> s{_sEventSubscriptions = a}) . _List1
 
 instance FromJSON Subscription where
         parseJSON
@@ -1754,11 +1830,11 @@
 
 -- | A value assigned to a tag key.
 tagValue :: Lens' Tag (Maybe Text)
-tagValue = lens _tagValue (\ s a -> s{_tagValue = a});
+tagValue = lens _tagValue (\ s a -> s{_tagValue = a})
 
 -- | A tag key.
 tagKey :: Lens' Tag Text
-tagKey = lens _tagKey (\ s a -> s{_tagKey = a});
+tagKey = lens _tagKey (\ s a -> s{_tagKey = a})
 
 instance FromJSON Tag where
         parseJSON
@@ -1803,20 +1879,20 @@
     -> TelemetryMetadata
 telemetryMetadata pMessageType_ pCount_ =
   TelemetryMetadata'
-  {_tmDataSize = Nothing, _tmMessageType = pMessageType_, _tmCount = pCount_}
+    {_tmDataSize = Nothing, _tmMessageType = pMessageType_, _tmCount = pCount_}
 
 
 -- | The data size of messages that the agent sends to the Amazon Inspector service.
 tmDataSize :: Lens' TelemetryMetadata (Maybe Integer)
-tmDataSize = lens _tmDataSize (\ s a -> s{_tmDataSize = a});
+tmDataSize = lens _tmDataSize (\ s a -> s{_tmDataSize = a})
 
 -- | A specific type of behavioral data that is collected by the agent.
 tmMessageType :: Lens' TelemetryMetadata Text
-tmMessageType = lens _tmMessageType (\ s a -> s{_tmMessageType = a});
+tmMessageType = lens _tmMessageType (\ s a -> s{_tmMessageType = a})
 
 -- | The count of messages that the agent sends to the Amazon Inspector service.
 tmCount :: Lens' TelemetryMetadata Integer
-tmCount = lens _tmCount (\ s a -> s{_tmCount = a});
+tmCount = lens _tmCount (\ s a -> s{_tmCount = a})
 
 instance FromJSON TelemetryMetadata where
         parseJSON
@@ -1855,11 +1931,11 @@
 
 -- | The maximum value of the timestamp range.
 trEndDate :: Lens' TimestampRange (Maybe UTCTime)
-trEndDate = lens _trEndDate (\ s a -> s{_trEndDate = a}) . mapping _Time;
+trEndDate = lens _trEndDate (\ s a -> s{_trEndDate = a}) . mapping _Time
 
 -- | The minimum value of the timestamp range.
 trBeginDate :: Lens' TimestampRange (Maybe UTCTime)
-trBeginDate = lens _trBeginDate (\ s a -> s{_trBeginDate = a}) . mapping _Time;
+trBeginDate = lens _trBeginDate (\ s a -> s{_trBeginDate = a}) . mapping _Time
 
 instance Hashable TimestampRange where
 
diff --git a/gen/Network/AWS/Inspector/Types/Sum.hs b/gen/Network/AWS/Inspector/Types/Sum.hs
--- a/gen/Network/AWS/Inspector/Types/Sum.hs
+++ b/gen/Network/AWS/Inspector/Types/Sum.hs
@@ -9,7 +9,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.Types.Sum
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -22,6 +22,7 @@
 data AgentHealth
   = AHHealthy
   | AHUnhealthy
+  | AHUnknown
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Typeable, Generic)
 
 
@@ -29,13 +30,15 @@
     parser = takeLowerText >>= \case
         "healthy" -> pure AHHealthy
         "unhealthy" -> pure AHUnhealthy
+        "unknown" -> pure AHUnknown
         e -> fromTextError $ "Failure parsing AgentHealth from value: '" <> e
-           <> "'. Accepted values: healthy, unhealthy"
+           <> "'. Accepted values: healthy, unhealthy, unknown"
 
 instance ToText AgentHealth where
     toText = \case
         AHHealthy -> "HEALTHY"
         AHUnhealthy -> "UNHEALTHY"
+        AHUnknown -> "UNKNOWN"
 
 instance Hashable     AgentHealth
 instance NFData       AgentHealth
diff --git a/gen/Network/AWS/Inspector/UnsubscribeFromEvent.hs b/gen/Network/AWS/Inspector/UnsubscribeFromEvent.hs
--- a/gen/Network/AWS/Inspector/UnsubscribeFromEvent.hs
+++ b/gen/Network/AWS/Inspector/UnsubscribeFromEvent.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.UnsubscribeFromEvent
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -67,23 +67,23 @@
     -> UnsubscribeFromEvent
 unsubscribeFromEvent pResourceARN_ pEvent_ pTopicARN_ =
   UnsubscribeFromEvent'
-  { _ufeResourceARN = pResourceARN_
-  , _ufeEvent = pEvent_
-  , _ufeTopicARN = pTopicARN_
-  }
+    { _ufeResourceARN = pResourceARN_
+    , _ufeEvent = pEvent_
+    , _ufeTopicARN = pTopicARN_
+    }
 
 
 -- | The ARN of the assessment template that is used during the event for which you want to stop receiving SNS notifications.
 ufeResourceARN :: Lens' UnsubscribeFromEvent Text
-ufeResourceARN = lens _ufeResourceARN (\ s a -> s{_ufeResourceARN = a});
+ufeResourceARN = lens _ufeResourceARN (\ s a -> s{_ufeResourceARN = a})
 
 -- | The event for which you want to stop receiving SNS notifications.
 ufeEvent :: Lens' UnsubscribeFromEvent InspectorEvent
-ufeEvent = lens _ufeEvent (\ s a -> s{_ufeEvent = a});
+ufeEvent = lens _ufeEvent (\ s a -> s{_ufeEvent = a})
 
 -- | The ARN of the SNS topic to which SNS notifications are sent.
 ufeTopicARN :: Lens' UnsubscribeFromEvent Text
-ufeTopicARN = lens _ufeTopicARN (\ s a -> s{_ufeTopicARN = a});
+ufeTopicARN = lens _ufeTopicARN (\ s a -> s{_ufeTopicARN = a})
 
 instance AWSRequest UnsubscribeFromEvent where
         type Rs UnsubscribeFromEvent =
diff --git a/gen/Network/AWS/Inspector/UpdateAssessmentTarget.hs b/gen/Network/AWS/Inspector/UpdateAssessmentTarget.hs
--- a/gen/Network/AWS/Inspector/UpdateAssessmentTarget.hs
+++ b/gen/Network/AWS/Inspector/UpdateAssessmentTarget.hs
@@ -12,7 +12,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.UpdateAssessmentTarget
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
@@ -67,23 +67,23 @@
     -> UpdateAssessmentTarget
 updateAssessmentTarget pAssessmentTargetARN_ pAssessmentTargetName_ pResourceGroupARN_ =
   UpdateAssessmentTarget'
-  { _uatAssessmentTargetARN = pAssessmentTargetARN_
-  , _uatAssessmentTargetName = pAssessmentTargetName_
-  , _uatResourceGroupARN = pResourceGroupARN_
-  }
+    { _uatAssessmentTargetARN = pAssessmentTargetARN_
+    , _uatAssessmentTargetName = pAssessmentTargetName_
+    , _uatResourceGroupARN = pResourceGroupARN_
+    }
 
 
 -- | The ARN of the assessment target that you want to update.
 uatAssessmentTargetARN :: Lens' UpdateAssessmentTarget Text
-uatAssessmentTargetARN = lens _uatAssessmentTargetARN (\ s a -> s{_uatAssessmentTargetARN = a});
+uatAssessmentTargetARN = lens _uatAssessmentTargetARN (\ s a -> s{_uatAssessmentTargetARN = a})
 
 -- | The name of the assessment target that you want to update.
 uatAssessmentTargetName :: Lens' UpdateAssessmentTarget Text
-uatAssessmentTargetName = lens _uatAssessmentTargetName (\ s a -> s{_uatAssessmentTargetName = a});
+uatAssessmentTargetName = lens _uatAssessmentTargetName (\ s a -> s{_uatAssessmentTargetName = a})
 
 -- | The ARN of the resource group that is used to specify the new resource group to associate with the assessment target.
 uatResourceGroupARN :: Lens' UpdateAssessmentTarget Text
-uatResourceGroupARN = lens _uatResourceGroupARN (\ s a -> s{_uatResourceGroupARN = a});
+uatResourceGroupARN = lens _uatResourceGroupARN (\ s a -> s{_uatResourceGroupARN = a})
 
 instance AWSRequest UpdateAssessmentTarget where
         type Rs UpdateAssessmentTarget =
diff --git a/gen/Network/AWS/Inspector/Waiters.hs b/gen/Network/AWS/Inspector/Waiters.hs
--- a/gen/Network/AWS/Inspector/Waiters.hs
+++ b/gen/Network/AWS/Inspector/Waiters.hs
@@ -7,7 +7,7 @@
 
 -- |
 -- Module      : Network.AWS.Inspector.Waiters
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Main.hs b/test/Main.hs
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -2,7 +2,7 @@
 
 -- |
 -- Module      : Main
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/Gen/Inspector.hs b/test/Test/AWS/Gen/Inspector.hs
--- a/test/Test/AWS/Gen/Inspector.hs
+++ b/test/Test/AWS/Gen/Inspector.hs
@@ -5,7 +5,7 @@
 
 -- |
 -- Module      : Test.AWS.Gen.Inspector
--- Copyright   : (c) 2013-2017 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : Mozilla Public License, v. 2.0.
 -- Maintainer  : Brendan Hay <brendan.g.hay+amazonka@gmail.com>
 -- Stability   : auto-generated
diff --git a/test/Test/AWS/Inspector.hs b/test/Test/AWS/Inspector.hs
--- a/test/Test/AWS/Inspector.hs
+++ b/test/Test/AWS/Inspector.hs
@@ -3,7 +3,7 @@
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
 -- Module      : Test.AWS.Inspector
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : This Source Code Form is subject to the terms of
 --               the Mozilla Public License, v. 2.0.
 --               A copy of the MPL can be found in the LICENSE file or
diff --git a/test/Test/AWS/Inspector/Internal.hs b/test/Test/AWS/Inspector/Internal.hs
--- a/test/Test/AWS/Inspector/Internal.hs
+++ b/test/Test/AWS/Inspector/Internal.hs
@@ -3,7 +3,7 @@
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 
 -- Module      : Test.AWS.Inspector.Internal
--- Copyright   : (c) 2013-2016 Brendan Hay
+-- Copyright   : (c) 2013-2018 Brendan Hay
 -- License     : This Source Code Form is subject to the terms of
 --               the Mozilla Public License, v. 2.0.
 --               A copy of the MPL can be found in the LICENSE file or
