From 12f3db40fbc628c005b975f1912c90bbbea0e654 Mon Sep 17 00:00:00 2001
From: aws-sdk-cpp-automation <aws-sdk-cpp-automation@github.com>
Date: Wed, 22 Apr 2020 19:10:42 +0000
Subject: [PATCH] Add support for code review and recommendation feedback APIs.

This release is to support AWS Firewall Manager policy with Organizational Unit scope.

Amazon Redshift support for usage limits

This change adds a new field 'OptionalDeployment' to ServiceSoftwareOptions to indicate whether a service software update is optional or mandatory. If True, it indicates that the update is optional, and the service software is not automatically updated. If False, the service software is automatically updated after AutomatedUpdateDate.

Adding ServiceUnavailableException as one of the expected exceptions
---
 .../CodeGuruReviewerClient.h                  | 237 +++++-
 .../model/AssociateRepositoryRequest.h        | 216 +++---
 .../aws/codeguru-reviewer/model/CodeReview.h  | 574 +++++++++++++++
 .../model/CodeReviewSummary.h                 | 496 +++++++++++++
 .../model/CommitDiffSourceCodeType.h          | 142 ++++
 .../model/DescribeCodeReviewRequest.h         |  93 +++
 .../model/DescribeCodeReviewResult.h          |  77 ++
 .../DescribeRecommendationFeedbackRequest.h   | 203 ++++++
 .../DescribeRecommendationFeedbackResult.h    |  77 ++
 .../DescribeRepositoryAssociationRequest.h    |  24 +-
 .../aws/codeguru-reviewer/model/JobState.h    |  43 ++
 .../model/ListCodeReviewsRequest.h            | 367 ++++++++++
 .../model/ListCodeReviewsResult.h             | 127 ++++
 .../model/ListRecommendationFeedbackRequest.h | 330 +++++++++
 .../model/ListRecommendationFeedbackResult.h  | 148 ++++
 .../model/ListRecommendationsRequest.h        | 171 +++++
 .../model/ListRecommendationsResult.h         | 127 ++++
 .../model/ListRepositoryAssociationsRequest.h | 163 +++--
 .../aws/codeguru-reviewer/model/Metrics.h     | 101 +++
 .../codeguru-reviewer/model/MetricsSummary.h  | 100 +++
 .../model/PutRecommendationFeedbackRequest.h  | 199 +++++
 .../model/PutRecommendationFeedbackResult.h   |  46 ++
 .../aws/codeguru-reviewer/model/Reaction.h    |  41 ++
 .../model/RecommendationFeedback.h            | 318 ++++++++
 .../model/RecommendationFeedbackSummary.h     | 197 +++++
 .../model/RecommendationSummary.h             | 262 +++++++
 .../model/RepositoryAssociation.h             |  16 +-
 .../model/RepositoryAssociationSummary.h      |  18 +-
 .../codeguru-reviewer/model/SourceCodeType.h  |  88 +++
 .../aws/codeguru-reviewer/model/Type.h        |  40 +
 .../source/CodeGuruReviewerClient.cpp         | 252 +++++++
 .../source/model/CodeReview.cpp               | 250 +++++++
 .../source/model/CodeReviewSummary.cpp        | 220 ++++++
 .../source/model/CommitDiffSourceCodeType.cpp |  84 +++
 .../model/DescribeCodeReviewRequest.cpp       |  37 +
 .../source/model/DescribeCodeReviewResult.cpp |  50 ++
 .../DescribeRecommendationFeedbackRequest.cpp |  60 ++
 .../DescribeRecommendationFeedbackResult.cpp  |  50 ++
 .../source/model/JobState.cpp                 |  94 +++
 .../source/model/ListCodeReviewsRequest.cpp   | 102 +++
 .../source/model/ListCodeReviewsResult.cpp    |  59 ++
 .../ListRecommendationFeedbackRequest.cpp     |  83 +++
 .../ListRecommendationFeedbackResult.cpp      |  59 ++
 .../model/ListRecommendationsRequest.cpp      |  61 ++
 .../model/ListRecommendationsResult.cpp       |  59 ++
 .../source/model/Metrics.cpp                  |  88 +++
 .../source/model/MetricsSummary.cpp           |  88 +++
 .../PutRecommendationFeedbackRequest.cpp      |  64 ++
 .../model/PutRecommendationFeedbackResult.cpp |  44 ++
 .../source/model/Reaction.cpp                 |  80 ++
 .../source/model/RecommendationFeedback.cpp   | 150 ++++
 .../model/RecommendationFeedbackSummary.cpp   | 107 +++
 .../source/model/RecommendationSummary.cpp    | 133 ++++
 .../source/model/SourceCodeType.cpp           |  69 ++
 .../source/model/Type.cpp                     |  73 ++
 .../include/aws/core/VersionConfig.h          |   2 +-
 .../aws/es/model/ServiceSoftwareOptions.h     |  32 +
 .../source/model/ServiceSoftwareOptions.cpp   |  21 +-
 aws-cpp-sdk-fms/include/aws/fms/FMSClient.h   |  54 +-
 .../aws/fms/model/CustomerPolicyScopeIdType.h |   3 +-
 .../include/aws/fms/model/Policy.h            | 520 +++++++++----
 .../aws/fms/model/SecurityServicePolicyData.h | 144 +---
 .../model/CustomerPolicyScopeIdType.cpp       |   7 +
 .../include/aws/redshift/RedshiftClient.h     | 162 ++++
 .../include/aws/redshift/RedshiftErrors.h     |   5 +-
 .../redshift/model/CreateUsageLimitRequest.h  | 347 +++++++++
 .../redshift/model/CreateUsageLimitResult.h   | 356 +++++++++
 .../redshift/model/DeleteUsageLimitRequest.h  |  97 +++
 .../model/DescribeUsageLimitsRequest.h        | 501 +++++++++++++
 .../model/DescribeUsageLimitsResult.h         | 181 +++++
 .../redshift/model/ModifyUsageLimitRequest.h  | 166 +++++
 .../redshift/model/ModifyUsageLimitResult.h   | 356 +++++++++
 .../model/RestoreFromClusterSnapshotRequest.h |  16 +-
 .../include/aws/redshift/model/UsageLimit.h   | 417 +++++++++++
 .../redshift/model/UsageLimitBreachAction.h   |  42 ++
 .../redshift/model/UsageLimitFeatureType.h    |  41 ++
 .../aws/redshift/model/UsageLimitLimitType.h  |  41 ++
 .../aws/redshift/model/UsageLimitPeriod.h     |  42 ++
 .../source/RedshiftClient.cpp                 | 144 ++++
 .../source/RedshiftErrors.cpp                 |  15 +
 .../source/model/CreateUsageLimitRequest.cpp  |  91 +++
 .../source/model/CreateUsageLimitResult.cpp   | 115 +++
 .../source/model/DeleteUsageLimitRequest.cpp  |  45 ++
 .../model/DescribeUsageLimitsRequest.cpp      |  95 +++
 .../model/DescribeUsageLimitsResult.cpp       |  75 ++
 .../source/model/ModifyUsageLimitRequest.cpp  |  59 ++
 .../source/model/ModifyUsageLimitResult.cpp   | 115 +++
 .../source/model/UsageLimit.cpp               | 242 ++++++
 .../source/model/UsageLimitBreachAction.cpp   |  87 +++
 .../source/model/UsageLimitFeatureType.cpp    |  80 ++
 .../source/model/UsageLimitLimitType.cpp      |  80 ++
 .../source/model/UsageLimitPeriod.cpp         |  87 +++
 .../model/TranscriptResultStream.h            |  35 +
 .../model/StartStreamTranscriptionHandler.cpp |   2 +-
 .../codeguru-reviewer-2019-09-19.normal.json  | 689 +++++++++++++++++-
 .../es-2015-01-01.normal.json                 |   4 +
 .../fms-2018-01-01.normal.json                |  13 +-
 .../redshift-2012-12-01.normal.json           | 293 +++++++-
 ...ranscribe-streaming-2017-10-26.normal.json |  16 +-
 99 files changed, 12862 insertions(+), 530 deletions(-)
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReview.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReviewSummary.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CommitDiffSourceCodeType.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewRequest.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewResult.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackRequest.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackResult.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/JobState.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsRequest.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsResult.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsRequest.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsResult.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Metrics.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/MetricsSummary.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackRequest.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackResult.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Reaction.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedback.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedbackSummary.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationSummary.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/SourceCodeType.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Type.h
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/CodeReview.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/CodeReviewSummary.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/CommitDiffSourceCodeType.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewRequest.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewResult.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackRequest.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackResult.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/JobState.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsRequest.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsResult.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackRequest.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackResult.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsRequest.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsResult.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/Metrics.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/MetricsSummary.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackRequest.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackResult.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/Reaction.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedback.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedbackSummary.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationSummary.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/SourceCodeType.cpp
 create mode 100644 aws-cpp-sdk-codeguru-reviewer/source/model/Type.cpp
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitRequest.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitResult.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/DeleteUsageLimitRequest.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsRequest.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsResult.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitRequest.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitResult.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimit.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitBreachAction.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitFeatureType.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitLimitType.h
 create mode 100644 aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitPeriod.h
 create mode 100644 aws-cpp-sdk-redshift/source/model/CreateUsageLimitRequest.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/CreateUsageLimitResult.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/DeleteUsageLimitRequest.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsRequest.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsResult.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/ModifyUsageLimitRequest.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/ModifyUsageLimitResult.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/UsageLimit.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/UsageLimitBreachAction.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/UsageLimitFeatureType.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/UsageLimitLimitType.cpp
 create mode 100644 aws-cpp-sdk-redshift/source/model/UsageLimitPeriod.cpp

diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/CodeGuruReviewerClient.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/CodeGuruReviewerClient.h
index 3eb06ac09a3..aaaa40ffd43 100644
--- a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/CodeGuruReviewerClient.h
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/CodeGuruReviewerClient.h
@@ -22,9 +22,15 @@
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/json/JsonSerializer.h>
 #include <aws/codeguru-reviewer/model/AssociateRepositoryResult.h>
+#include <aws/codeguru-reviewer/model/DescribeCodeReviewResult.h>
+#include <aws/codeguru-reviewer/model/DescribeRecommendationFeedbackResult.h>
 #include <aws/codeguru-reviewer/model/DescribeRepositoryAssociationResult.h>
 #include <aws/codeguru-reviewer/model/DisassociateRepositoryResult.h>
+#include <aws/codeguru-reviewer/model/ListCodeReviewsResult.h>
+#include <aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h>
+#include <aws/codeguru-reviewer/model/ListRecommendationsResult.h>
 #include <aws/codeguru-reviewer/model/ListRepositoryAssociationsResult.h>
+#include <aws/codeguru-reviewer/model/PutRecommendationFeedbackResult.h>
 #include <aws/core/client/AsyncCallerContext.h>
 #include <aws/core/http/HttpTypes.h>
 #include <future>
@@ -65,27 +71,51 @@ namespace CodeGuruReviewer
 namespace Model
 {
         class AssociateRepositoryRequest;
+        class DescribeCodeReviewRequest;
+        class DescribeRecommendationFeedbackRequest;
         class DescribeRepositoryAssociationRequest;
         class DisassociateRepositoryRequest;
+        class ListCodeReviewsRequest;
+        class ListRecommendationFeedbackRequest;
+        class ListRecommendationsRequest;
         class ListRepositoryAssociationsRequest;
+        class PutRecommendationFeedbackRequest;
 
         typedef Aws::Utils::Outcome<AssociateRepositoryResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> AssociateRepositoryOutcome;
+        typedef Aws::Utils::Outcome<DescribeCodeReviewResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> DescribeCodeReviewOutcome;
+        typedef Aws::Utils::Outcome<DescribeRecommendationFeedbackResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> DescribeRecommendationFeedbackOutcome;
         typedef Aws::Utils::Outcome<DescribeRepositoryAssociationResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> DescribeRepositoryAssociationOutcome;
         typedef Aws::Utils::Outcome<DisassociateRepositoryResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> DisassociateRepositoryOutcome;
+        typedef Aws::Utils::Outcome<ListCodeReviewsResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> ListCodeReviewsOutcome;
+        typedef Aws::Utils::Outcome<ListRecommendationFeedbackResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> ListRecommendationFeedbackOutcome;
+        typedef Aws::Utils::Outcome<ListRecommendationsResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> ListRecommendationsOutcome;
         typedef Aws::Utils::Outcome<ListRepositoryAssociationsResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> ListRepositoryAssociationsOutcome;
+        typedef Aws::Utils::Outcome<PutRecommendationFeedbackResult, Aws::Client::AWSError<CodeGuruReviewerErrors>> PutRecommendationFeedbackOutcome;
 
         typedef std::future<AssociateRepositoryOutcome> AssociateRepositoryOutcomeCallable;
+        typedef std::future<DescribeCodeReviewOutcome> DescribeCodeReviewOutcomeCallable;
+        typedef std::future<DescribeRecommendationFeedbackOutcome> DescribeRecommendationFeedbackOutcomeCallable;
         typedef std::future<DescribeRepositoryAssociationOutcome> DescribeRepositoryAssociationOutcomeCallable;
         typedef std::future<DisassociateRepositoryOutcome> DisassociateRepositoryOutcomeCallable;
+        typedef std::future<ListCodeReviewsOutcome> ListCodeReviewsOutcomeCallable;
+        typedef std::future<ListRecommendationFeedbackOutcome> ListRecommendationFeedbackOutcomeCallable;
+        typedef std::future<ListRecommendationsOutcome> ListRecommendationsOutcomeCallable;
         typedef std::future<ListRepositoryAssociationsOutcome> ListRepositoryAssociationsOutcomeCallable;
+        typedef std::future<PutRecommendationFeedbackOutcome> PutRecommendationFeedbackOutcomeCallable;
 } // namespace Model
 
   class CodeGuruReviewerClient;
 
     typedef std::function<void(const CodeGuruReviewerClient*, const Model::AssociateRepositoryRequest&, const Model::AssociateRepositoryOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > AssociateRepositoryResponseReceivedHandler;
+    typedef std::function<void(const CodeGuruReviewerClient*, const Model::DescribeCodeReviewRequest&, const Model::DescribeCodeReviewOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCodeReviewResponseReceivedHandler;
+    typedef std::function<void(const CodeGuruReviewerClient*, const Model::DescribeRecommendationFeedbackRequest&, const Model::DescribeRecommendationFeedbackOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeRecommendationFeedbackResponseReceivedHandler;
     typedef std::function<void(const CodeGuruReviewerClient*, const Model::DescribeRepositoryAssociationRequest&, const Model::DescribeRepositoryAssociationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeRepositoryAssociationResponseReceivedHandler;
     typedef std::function<void(const CodeGuruReviewerClient*, const Model::DisassociateRepositoryRequest&, const Model::DisassociateRepositoryOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DisassociateRepositoryResponseReceivedHandler;
+    typedef std::function<void(const CodeGuruReviewerClient*, const Model::ListCodeReviewsRequest&, const Model::ListCodeReviewsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListCodeReviewsResponseReceivedHandler;
+    typedef std::function<void(const CodeGuruReviewerClient*, const Model::ListRecommendationFeedbackRequest&, const Model::ListRecommendationFeedbackOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListRecommendationFeedbackResponseReceivedHandler;
+    typedef std::function<void(const CodeGuruReviewerClient*, const Model::ListRecommendationsRequest&, const Model::ListRecommendationsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListRecommendationsResponseReceivedHandler;
     typedef std::function<void(const CodeGuruReviewerClient*, const Model::ListRepositoryAssociationsRequest&, const Model::ListRepositoryAssociationsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListRepositoryAssociationsResponseReceivedHandler;
+    typedef std::function<void(const CodeGuruReviewerClient*, const Model::PutRecommendationFeedbackRequest&, const Model::PutRecommendationFeedbackOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PutRecommendationFeedbackResponseReceivedHandler;
 
   /**
    * <p>This section provides documentation for the Amazon CodeGuru Reviewer API
@@ -123,10 +153,10 @@ namespace Model
         /**
          * <p>Associates an AWS CodeCommit repository with Amazon CodeGuru Reviewer. When
          * you associate an AWS CodeCommit repository with Amazon CodeGuru Reviewer, Amazon
-         * CodeGuru Reviewer will provide recommendations for each pull request. You can
-         * view recommendations in the AWS CodeCommit repository.</p> <p>You can associate
-         * a GitHub repository using the Amazon CodeGuru Reviewer console.</p><p><h3>See
-         * Also:</h3>   <a
+         * CodeGuru Reviewer will provide recommendations for each pull request raised
+         * within the repository. You can view recommendations in the AWS CodeCommit
+         * repository.</p> <p>You can associate a GitHub repository using the Amazon
+         * CodeGuru Reviewer console.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/AssociateRepository">AWS
          * API Reference</a></p>
          */
@@ -135,10 +165,10 @@ namespace Model
         /**
          * <p>Associates an AWS CodeCommit repository with Amazon CodeGuru Reviewer. When
          * you associate an AWS CodeCommit repository with Amazon CodeGuru Reviewer, Amazon
-         * CodeGuru Reviewer will provide recommendations for each pull request. You can
-         * view recommendations in the AWS CodeCommit repository.</p> <p>You can associate
-         * a GitHub repository using the Amazon CodeGuru Reviewer console.</p><p><h3>See
-         * Also:</h3>   <a
+         * CodeGuru Reviewer will provide recommendations for each pull request raised
+         * within the repository. You can view recommendations in the AWS CodeCommit
+         * repository.</p> <p>You can associate a GitHub repository using the Amazon
+         * CodeGuru Reviewer console.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/AssociateRepository">AWS
          * API Reference</a></p>
          *
@@ -149,10 +179,10 @@ namespace Model
         /**
          * <p>Associates an AWS CodeCommit repository with Amazon CodeGuru Reviewer. When
          * you associate an AWS CodeCommit repository with Amazon CodeGuru Reviewer, Amazon
-         * CodeGuru Reviewer will provide recommendations for each pull request. You can
-         * view recommendations in the AWS CodeCommit repository.</p> <p>You can associate
-         * a GitHub repository using the Amazon CodeGuru Reviewer console.</p><p><h3>See
-         * Also:</h3>   <a
+         * CodeGuru Reviewer will provide recommendations for each pull request raised
+         * within the repository. You can view recommendations in the AWS CodeCommit
+         * repository.</p> <p>You can associate a GitHub repository using the Amazon
+         * CodeGuru Reviewer console.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/AssociateRepository">AWS
          * API Reference</a></p>
          *
@@ -160,6 +190,62 @@ namespace Model
          */
         virtual void AssociateRepositoryAsync(const Model::AssociateRepositoryRequest& request, const AssociateRepositoryResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p> Returns the metadaata associated with the code review along with its
+         * status.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeCodeReview">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DescribeCodeReviewOutcome DescribeCodeReview(const Model::DescribeCodeReviewRequest& request) const;
+
+        /**
+         * <p> Returns the metadaata associated with the code review along with its
+         * status.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeCodeReview">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::DescribeCodeReviewOutcomeCallable DescribeCodeReviewCallable(const Model::DescribeCodeReviewRequest& request) const;
+
+        /**
+         * <p> Returns the metadaata associated with the code review along with its
+         * status.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeCodeReview">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void DescribeCodeReviewAsync(const Model::DescribeCodeReviewRequest& request, const DescribeCodeReviewResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
+        /**
+         * <p> Describes the customer feedback for a CodeGuru Reviewer recommendation.
+         * </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeRecommendationFeedback">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DescribeRecommendationFeedbackOutcome DescribeRecommendationFeedback(const Model::DescribeRecommendationFeedbackRequest& request) const;
+
+        /**
+         * <p> Describes the customer feedback for a CodeGuru Reviewer recommendation.
+         * </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeRecommendationFeedback">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::DescribeRecommendationFeedbackOutcomeCallable DescribeRecommendationFeedbackCallable(const Model::DescribeRecommendationFeedbackRequest& request) const;
+
+        /**
+         * <p> Describes the customer feedback for a CodeGuru Reviewer recommendation.
+         * </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeRecommendationFeedback">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void DescribeRecommendationFeedbackAsync(const Model::DescribeRecommendationFeedbackRequest& request, const DescribeRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
         /**
          * <p>Describes a repository association.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/DescribeRepositoryAssociation">AWS
@@ -213,6 +299,96 @@ namespace Model
          */
         virtual void DisassociateRepositoryAsync(const Model::DisassociateRepositoryRequest& request, const DisassociateRepositoryResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p> Lists all the code reviews that the customer has created in the past 90
+         * days. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListCodeReviews">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ListCodeReviewsOutcome ListCodeReviews(const Model::ListCodeReviewsRequest& request) const;
+
+        /**
+         * <p> Lists all the code reviews that the customer has created in the past 90
+         * days. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListCodeReviews">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::ListCodeReviewsOutcomeCallable ListCodeReviewsCallable(const Model::ListCodeReviewsRequest& request) const;
+
+        /**
+         * <p> Lists all the code reviews that the customer has created in the past 90
+         * days. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListCodeReviews">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void ListCodeReviewsAsync(const Model::ListCodeReviewsRequest& request, const ListCodeReviewsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
+        /**
+         * <p> Lists the customer feedback for a CodeGuru Reviewer recommendation for all
+         * users. This API will be used from the console to extract the previously given
+         * feedback by the user to pre-populate the feedback emojis for all
+         * recommendations. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListRecommendationFeedback">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ListRecommendationFeedbackOutcome ListRecommendationFeedback(const Model::ListRecommendationFeedbackRequest& request) const;
+
+        /**
+         * <p> Lists the customer feedback for a CodeGuru Reviewer recommendation for all
+         * users. This API will be used from the console to extract the previously given
+         * feedback by the user to pre-populate the feedback emojis for all
+         * recommendations. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListRecommendationFeedback">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::ListRecommendationFeedbackOutcomeCallable ListRecommendationFeedbackCallable(const Model::ListRecommendationFeedbackRequest& request) const;
+
+        /**
+         * <p> Lists the customer feedback for a CodeGuru Reviewer recommendation for all
+         * users. This API will be used from the console to extract the previously given
+         * feedback by the user to pre-populate the feedback emojis for all
+         * recommendations. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListRecommendationFeedback">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void ListRecommendationFeedbackAsync(const Model::ListRecommendationFeedbackRequest& request, const ListRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
+        /**
+         * <p> Returns the list of all recommendations for a completed code review.
+         * </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListRecommendations">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ListRecommendationsOutcome ListRecommendations(const Model::ListRecommendationsRequest& request) const;
+
+        /**
+         * <p> Returns the list of all recommendations for a completed code review.
+         * </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListRecommendations">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::ListRecommendationsOutcomeCallable ListRecommendationsCallable(const Model::ListRecommendationsRequest& request) const;
+
+        /**
+         * <p> Returns the list of all recommendations for a completed code review.
+         * </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/ListRecommendations">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void ListRecommendationsAsync(const Model::ListRecommendationsRequest& request, const ListRecommendationsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
         /**
          * <p>Lists repository associations. You can optionally filter on one or more of
          * the following recommendation properties: provider types, states, names, and
@@ -244,14 +420,51 @@ namespace Model
          */
         virtual void ListRepositoryAssociationsAsync(const Model::ListRepositoryAssociationsRequest& request, const ListRepositoryAssociationsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p> Stores customer feedback for a CodeGuru-Reviewer recommendation. When this
+         * API is called again with different reactions the previous feedback is
+         * overwritten. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/PutRecommendationFeedback">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::PutRecommendationFeedbackOutcome PutRecommendationFeedback(const Model::PutRecommendationFeedbackRequest& request) const;
+
+        /**
+         * <p> Stores customer feedback for a CodeGuru-Reviewer recommendation. When this
+         * API is called again with different reactions the previous feedback is
+         * overwritten. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/PutRecommendationFeedback">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::PutRecommendationFeedbackOutcomeCallable PutRecommendationFeedbackCallable(const Model::PutRecommendationFeedbackRequest& request) const;
+
+        /**
+         * <p> Stores customer feedback for a CodeGuru-Reviewer recommendation. When this
+         * API is called again with different reactions the previous feedback is
+         * overwritten. </p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/PutRecommendationFeedback">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void PutRecommendationFeedbackAsync(const Model::PutRecommendationFeedbackRequest& request, const PutRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
 
       void OverrideEndpoint(const Aws::String& endpoint);
     private:
       void init(const Aws::Client::ClientConfiguration& clientConfiguration);
         void AssociateRepositoryAsyncHelper(const Model::AssociateRepositoryRequest& request, const AssociateRepositoryResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void DescribeCodeReviewAsyncHelper(const Model::DescribeCodeReviewRequest& request, const DescribeCodeReviewResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void DescribeRecommendationFeedbackAsyncHelper(const Model::DescribeRecommendationFeedbackRequest& request, const DescribeRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DescribeRepositoryAssociationAsyncHelper(const Model::DescribeRepositoryAssociationRequest& request, const DescribeRepositoryAssociationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DisassociateRepositoryAsyncHelper(const Model::DisassociateRepositoryRequest& request, const DisassociateRepositoryResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void ListCodeReviewsAsyncHelper(const Model::ListCodeReviewsRequest& request, const ListCodeReviewsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void ListRecommendationFeedbackAsyncHelper(const Model::ListRecommendationFeedbackRequest& request, const ListRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void ListRecommendationsAsyncHelper(const Model::ListRecommendationsRequest& request, const ListRecommendationsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void ListRepositoryAssociationsAsyncHelper(const Model::ListRepositoryAssociationsRequest& request, const ListRepositoryAssociationsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void PutRecommendationFeedbackAsyncHelper(const Model::PutRecommendationFeedbackRequest& request, const PutRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
 
       Aws::String m_uri;
       Aws::String m_configScheme;
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/AssociateRepositoryRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/AssociateRepositoryRequest.h
index 2f1c926f044..be7f5ffe649 100644
--- a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/AssociateRepositoryRequest.h
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/AssociateRepositoryRequest.h
@@ -77,153 +77,145 @@ namespace Model
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline const Aws::String& GetClientRequestToken() const{ return m_clientRequestToken; }
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline bool ClientRequestTokenHasBeenSet() const { return m_clientRequestTokenHasBeenSet; }
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline void SetClientRequestToken(const Aws::String& value) { m_clientRequestTokenHasBeenSet = true; m_clientRequestToken = value; }
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline void SetClientRequestToken(Aws::String&& value) { m_clientRequestTokenHasBeenSet = true; m_clientRequestToken = std::move(value); }
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline void SetClientRequestToken(const char* value) { m_clientRequestTokenHasBeenSet = true; m_clientRequestToken.assign(value); }
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline AssociateRepositoryRequest& WithClientRequestToken(const Aws::String& value) { SetClientRequestToken(value); return *this;}
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline AssociateRepositoryRequest& WithClientRequestToken(Aws::String&& value) { SetClientRequestToken(std::move(value)); return *this;}
 
     /**
      * <p>Unique, case-sensitive identifier that you provide to ensure the idempotency
-     * of the request.</p> <p>If you want to add a new repository association, this
-     * parameter specifies a unique identifier for the new repository association that
-     * helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to
-     * call this operation, then you can leave this parameter empty. The CLI or SDK
-     * generates a random UUID for you and includes that in the request. If you don't
-     * use the SDK and instead generate a raw HTTP request to the Secrets Manager
-     * service endpoint, then you must generate a ClientRequestToken yourself for new
-     * versions and include that value in the request.</p> <p>You typically only need
-     * to interact with this value if you implement your own retry logic and want to
-     * ensure that a given repository association is not created twice. We recommend
-     * that you generate a UUID-type value to ensure uniqueness within the specified
-     * repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to
-     * prevent the accidental creation of duplicate repository associations if there
-     * are failures and retries. </p>
+     * of the request.</p> <p>To add a new repository association, this parameter
+     * specifies a unique identifier for the new repository association that helps
+     * ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call
+     * this operation, you can leave this parameter empty. The CLI or SDK generates a
+     * random UUID for you and includes that in the request. If you don't use the SDK
+     * and instead generate a raw HTTP request to the Secrets Manager service endpoint,
+     * you must generate a ClientRequestToken yourself for new versions and include
+     * that value in the request.</p> <p>You typically interact with this value if you
+     * implement your own retry logic and want to ensure that a given repository
+     * association is not created twice. We recommend that you generate a UUID-type
+     * value to ensure uniqueness within the specified repository association.</p>
+     * <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation
+     * of duplicate repository associations if there are failures and retries. </p>
      */
     inline AssociateRepositoryRequest& WithClientRequestToken(const char* value) { SetClientRequestToken(value); return *this;}
 
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReview.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReview.h
new file mode 100644
index 00000000000..0ab83d57adb
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReview.h
@@ -0,0 +1,574 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/codeguru-reviewer/model/ProviderType.h>
+#include <aws/codeguru-reviewer/model/JobState.h>
+#include <aws/core/utils/DateTime.h>
+#include <aws/codeguru-reviewer/model/Type.h>
+#include <aws/codeguru-reviewer/model/SourceCodeType.h>
+#include <aws/codeguru-reviewer/model/Metrics.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about a code review. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/CodeReview">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API CodeReview
+  {
+  public:
+    CodeReview();
+    CodeReview(Aws::Utils::Json::JsonView jsonValue);
+    CodeReview& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline const Aws::String& GetName() const{ return m_name; }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline bool NameHasBeenSet() const { return m_nameHasBeenSet; }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline CodeReview& WithName(const Aws::String& value) { SetName(value); return *this;}
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline CodeReview& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline CodeReview& WithName(const char* value) { SetName(value); return *this;}
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline CodeReview& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline CodeReview& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline CodeReview& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline const Aws::String& GetRepositoryName() const{ return m_repositoryName; }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline bool RepositoryNameHasBeenSet() const { return m_repositoryNameHasBeenSet; }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline void SetRepositoryName(const Aws::String& value) { m_repositoryNameHasBeenSet = true; m_repositoryName = value; }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline void SetRepositoryName(Aws::String&& value) { m_repositoryNameHasBeenSet = true; m_repositoryName = std::move(value); }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline void SetRepositoryName(const char* value) { m_repositoryNameHasBeenSet = true; m_repositoryName.assign(value); }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline CodeReview& WithRepositoryName(const Aws::String& value) { SetRepositoryName(value); return *this;}
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline CodeReview& WithRepositoryName(Aws::String&& value) { SetRepositoryName(std::move(value)); return *this;}
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline CodeReview& WithRepositoryName(const char* value) { SetRepositoryName(value); return *this;}
+
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline const Aws::String& GetOwner() const{ return m_owner; }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline bool OwnerHasBeenSet() const { return m_ownerHasBeenSet; }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline void SetOwner(const Aws::String& value) { m_ownerHasBeenSet = true; m_owner = value; }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline void SetOwner(Aws::String&& value) { m_ownerHasBeenSet = true; m_owner = std::move(value); }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline void SetOwner(const char* value) { m_ownerHasBeenSet = true; m_owner.assign(value); }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline CodeReview& WithOwner(const Aws::String& value) { SetOwner(value); return *this;}
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline CodeReview& WithOwner(Aws::String&& value) { SetOwner(std::move(value)); return *this;}
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline CodeReview& WithOwner(const char* value) { SetOwner(value); return *this;}
+
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline const ProviderType& GetProviderType() const{ return m_providerType; }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline bool ProviderTypeHasBeenSet() const { return m_providerTypeHasBeenSet; }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline void SetProviderType(const ProviderType& value) { m_providerTypeHasBeenSet = true; m_providerType = value; }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline void SetProviderType(ProviderType&& value) { m_providerTypeHasBeenSet = true; m_providerType = std::move(value); }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline CodeReview& WithProviderType(const ProviderType& value) { SetProviderType(value); return *this;}
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline CodeReview& WithProviderType(ProviderType&& value) { SetProviderType(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline const JobState& GetState() const{ return m_state; }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline bool StateHasBeenSet() const { return m_stateHasBeenSet; }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline void SetState(const JobState& value) { m_stateHasBeenSet = true; m_state = value; }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline void SetState(JobState&& value) { m_stateHasBeenSet = true; m_state = std::move(value); }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline CodeReview& WithState(const JobState& value) { SetState(value); return *this;}
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline CodeReview& WithState(JobState&& value) { SetState(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline const Aws::String& GetStateReason() const{ return m_stateReason; }
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline bool StateReasonHasBeenSet() const { return m_stateReasonHasBeenSet; }
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline void SetStateReason(const Aws::String& value) { m_stateReasonHasBeenSet = true; m_stateReason = value; }
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline void SetStateReason(Aws::String&& value) { m_stateReasonHasBeenSet = true; m_stateReason = std::move(value); }
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline void SetStateReason(const char* value) { m_stateReasonHasBeenSet = true; m_stateReason.assign(value); }
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline CodeReview& WithStateReason(const Aws::String& value) { SetStateReason(value); return *this;}
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline CodeReview& WithStateReason(Aws::String&& value) { SetStateReason(std::move(value)); return *this;}
+
+    /**
+     * <p> The reason for the state of the code review. </p>
+     */
+    inline CodeReview& WithStateReason(const char* value) { SetStateReason(value); return *this;}
+
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline const Aws::Utils::DateTime& GetCreatedTimeStamp() const{ return m_createdTimeStamp; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline bool CreatedTimeStampHasBeenSet() const { return m_createdTimeStampHasBeenSet; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline void SetCreatedTimeStamp(const Aws::Utils::DateTime& value) { m_createdTimeStampHasBeenSet = true; m_createdTimeStamp = value; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline void SetCreatedTimeStamp(Aws::Utils::DateTime&& value) { m_createdTimeStampHasBeenSet = true; m_createdTimeStamp = std::move(value); }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline CodeReview& WithCreatedTimeStamp(const Aws::Utils::DateTime& value) { SetCreatedTimeStamp(value); return *this;}
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline CodeReview& WithCreatedTimeStamp(Aws::Utils::DateTime&& value) { SetCreatedTimeStamp(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline const Aws::Utils::DateTime& GetLastUpdatedTimeStamp() const{ return m_lastUpdatedTimeStamp; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline bool LastUpdatedTimeStampHasBeenSet() const { return m_lastUpdatedTimeStampHasBeenSet; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline void SetLastUpdatedTimeStamp(const Aws::Utils::DateTime& value) { m_lastUpdatedTimeStampHasBeenSet = true; m_lastUpdatedTimeStamp = value; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline void SetLastUpdatedTimeStamp(Aws::Utils::DateTime&& value) { m_lastUpdatedTimeStampHasBeenSet = true; m_lastUpdatedTimeStamp = std::move(value); }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline CodeReview& WithLastUpdatedTimeStamp(const Aws::Utils::DateTime& value) { SetLastUpdatedTimeStamp(value); return *this;}
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline CodeReview& WithLastUpdatedTimeStamp(Aws::Utils::DateTime&& value) { SetLastUpdatedTimeStamp(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The type of code review. </p>
+     */
+    inline const Type& GetType() const{ return m_type; }
+
+    /**
+     * <p> The type of code review. </p>
+     */
+    inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }
+
+    /**
+     * <p> The type of code review. </p>
+     */
+    inline void SetType(const Type& value) { m_typeHasBeenSet = true; m_type = value; }
+
+    /**
+     * <p> The type of code review. </p>
+     */
+    inline void SetType(Type&& value) { m_typeHasBeenSet = true; m_type = std::move(value); }
+
+    /**
+     * <p> The type of code review. </p>
+     */
+    inline CodeReview& WithType(const Type& value) { SetType(value); return *this;}
+
+    /**
+     * <p> The type of code review. </p>
+     */
+    inline CodeReview& WithType(Type&& value) { SetType(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline const Aws::String& GetPullRequestId() const{ return m_pullRequestId; }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline bool PullRequestIdHasBeenSet() const { return m_pullRequestIdHasBeenSet; }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline void SetPullRequestId(const Aws::String& value) { m_pullRequestIdHasBeenSet = true; m_pullRequestId = value; }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline void SetPullRequestId(Aws::String&& value) { m_pullRequestIdHasBeenSet = true; m_pullRequestId = std::move(value); }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline void SetPullRequestId(const char* value) { m_pullRequestIdHasBeenSet = true; m_pullRequestId.assign(value); }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline CodeReview& WithPullRequestId(const Aws::String& value) { SetPullRequestId(value); return *this;}
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline CodeReview& WithPullRequestId(Aws::String&& value) { SetPullRequestId(std::move(value)); return *this;}
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline CodeReview& WithPullRequestId(const char* value) { SetPullRequestId(value); return *this;}
+
+
+    /**
+     * <p> The type of the source code for the code review. </p>
+     */
+    inline const SourceCodeType& GetSourceCodeType() const{ return m_sourceCodeType; }
+
+    /**
+     * <p> The type of the source code for the code review. </p>
+     */
+    inline bool SourceCodeTypeHasBeenSet() const { return m_sourceCodeTypeHasBeenSet; }
+
+    /**
+     * <p> The type of the source code for the code review. </p>
+     */
+    inline void SetSourceCodeType(const SourceCodeType& value) { m_sourceCodeTypeHasBeenSet = true; m_sourceCodeType = value; }
+
+    /**
+     * <p> The type of the source code for the code review. </p>
+     */
+    inline void SetSourceCodeType(SourceCodeType&& value) { m_sourceCodeTypeHasBeenSet = true; m_sourceCodeType = std::move(value); }
+
+    /**
+     * <p> The type of the source code for the code review. </p>
+     */
+    inline CodeReview& WithSourceCodeType(const SourceCodeType& value) { SetSourceCodeType(value); return *this;}
+
+    /**
+     * <p> The type of the source code for the code review. </p>
+     */
+    inline CodeReview& WithSourceCodeType(SourceCodeType&& value) { SetSourceCodeType(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline const Metrics& GetMetrics() const{ return m_metrics; }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline bool MetricsHasBeenSet() const { return m_metricsHasBeenSet; }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline void SetMetrics(const Metrics& value) { m_metricsHasBeenSet = true; m_metrics = value; }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline void SetMetrics(Metrics&& value) { m_metricsHasBeenSet = true; m_metrics = std::move(value); }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline CodeReview& WithMetrics(const Metrics& value) { SetMetrics(value); return *this;}
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline CodeReview& WithMetrics(Metrics&& value) { SetMetrics(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_name;
+    bool m_nameHasBeenSet;
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+
+    Aws::String m_repositoryName;
+    bool m_repositoryNameHasBeenSet;
+
+    Aws::String m_owner;
+    bool m_ownerHasBeenSet;
+
+    ProviderType m_providerType;
+    bool m_providerTypeHasBeenSet;
+
+    JobState m_state;
+    bool m_stateHasBeenSet;
+
+    Aws::String m_stateReason;
+    bool m_stateReasonHasBeenSet;
+
+    Aws::Utils::DateTime m_createdTimeStamp;
+    bool m_createdTimeStampHasBeenSet;
+
+    Aws::Utils::DateTime m_lastUpdatedTimeStamp;
+    bool m_lastUpdatedTimeStampHasBeenSet;
+
+    Type m_type;
+    bool m_typeHasBeenSet;
+
+    Aws::String m_pullRequestId;
+    bool m_pullRequestIdHasBeenSet;
+
+    SourceCodeType m_sourceCodeType;
+    bool m_sourceCodeTypeHasBeenSet;
+
+    Metrics m_metrics;
+    bool m_metricsHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReviewSummary.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReviewSummary.h
new file mode 100644
index 00000000000..150fe52cd03
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CodeReviewSummary.h
@@ -0,0 +1,496 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/codeguru-reviewer/model/ProviderType.h>
+#include <aws/codeguru-reviewer/model/JobState.h>
+#include <aws/core/utils/DateTime.h>
+#include <aws/codeguru-reviewer/model/Type.h>
+#include <aws/codeguru-reviewer/model/MetricsSummary.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about the summary of the code review. </p><p><h3>See Also:</h3> 
+   * <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/CodeReviewSummary">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API CodeReviewSummary
+  {
+  public:
+    CodeReviewSummary();
+    CodeReviewSummary(Aws::Utils::Json::JsonView jsonValue);
+    CodeReviewSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline const Aws::String& GetName() const{ return m_name; }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline bool NameHasBeenSet() const { return m_nameHasBeenSet; }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline CodeReviewSummary& WithName(const Aws::String& value) { SetName(value); return *this;}
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline CodeReviewSummary& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
+
+    /**
+     * <p> The name of the code review. </p>
+     */
+    inline CodeReviewSummary& WithName(const char* value) { SetName(value); return *this;}
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline CodeReviewSummary& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline CodeReviewSummary& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline CodeReviewSummary& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline const Aws::String& GetRepositoryName() const{ return m_repositoryName; }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline bool RepositoryNameHasBeenSet() const { return m_repositoryNameHasBeenSet; }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline void SetRepositoryName(const Aws::String& value) { m_repositoryNameHasBeenSet = true; m_repositoryName = value; }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline void SetRepositoryName(Aws::String&& value) { m_repositoryNameHasBeenSet = true; m_repositoryName = std::move(value); }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline void SetRepositoryName(const char* value) { m_repositoryNameHasBeenSet = true; m_repositoryName.assign(value); }
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline CodeReviewSummary& WithRepositoryName(const Aws::String& value) { SetRepositoryName(value); return *this;}
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline CodeReviewSummary& WithRepositoryName(Aws::String&& value) { SetRepositoryName(std::move(value)); return *this;}
+
+    /**
+     * <p> The name of the repository. </p>
+     */
+    inline CodeReviewSummary& WithRepositoryName(const char* value) { SetRepositoryName(value); return *this;}
+
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline const Aws::String& GetOwner() const{ return m_owner; }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline bool OwnerHasBeenSet() const { return m_ownerHasBeenSet; }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline void SetOwner(const Aws::String& value) { m_ownerHasBeenSet = true; m_owner = value; }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline void SetOwner(Aws::String&& value) { m_ownerHasBeenSet = true; m_owner = std::move(value); }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline void SetOwner(const char* value) { m_ownerHasBeenSet = true; m_owner.assign(value); }
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline CodeReviewSummary& WithOwner(const Aws::String& value) { SetOwner(value); return *this;}
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline CodeReviewSummary& WithOwner(Aws::String&& value) { SetOwner(std::move(value)); return *this;}
+
+    /**
+     * <p> The owner of the repository. </p>
+     */
+    inline CodeReviewSummary& WithOwner(const char* value) { SetOwner(value); return *this;}
+
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline const ProviderType& GetProviderType() const{ return m_providerType; }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline bool ProviderTypeHasBeenSet() const { return m_providerTypeHasBeenSet; }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline void SetProviderType(const ProviderType& value) { m_providerTypeHasBeenSet = true; m_providerType = value; }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline void SetProviderType(ProviderType&& value) { m_providerTypeHasBeenSet = true; m_providerType = std::move(value); }
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline CodeReviewSummary& WithProviderType(const ProviderType& value) { SetProviderType(value); return *this;}
+
+    /**
+     * <p> The provider type of the repository association. </p>
+     */
+    inline CodeReviewSummary& WithProviderType(ProviderType&& value) { SetProviderType(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline const JobState& GetState() const{ return m_state; }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline bool StateHasBeenSet() const { return m_stateHasBeenSet; }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline void SetState(const JobState& value) { m_stateHasBeenSet = true; m_state = value; }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline void SetState(JobState&& value) { m_stateHasBeenSet = true; m_state = std::move(value); }
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline CodeReviewSummary& WithState(const JobState& value) { SetState(value); return *this;}
+
+    /**
+     * <p> The state of the code review. </p>
+     */
+    inline CodeReviewSummary& WithState(JobState&& value) { SetState(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline const Aws::Utils::DateTime& GetCreatedTimeStamp() const{ return m_createdTimeStamp; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline bool CreatedTimeStampHasBeenSet() const { return m_createdTimeStampHasBeenSet; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline void SetCreatedTimeStamp(const Aws::Utils::DateTime& value) { m_createdTimeStampHasBeenSet = true; m_createdTimeStamp = value; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline void SetCreatedTimeStamp(Aws::Utils::DateTime&& value) { m_createdTimeStampHasBeenSet = true; m_createdTimeStamp = std::move(value); }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline CodeReviewSummary& WithCreatedTimeStamp(const Aws::Utils::DateTime& value) { SetCreatedTimeStamp(value); return *this;}
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was created.
+     * </p>
+     */
+    inline CodeReviewSummary& WithCreatedTimeStamp(Aws::Utils::DateTime&& value) { SetCreatedTimeStamp(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline const Aws::Utils::DateTime& GetLastUpdatedTimeStamp() const{ return m_lastUpdatedTimeStamp; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline bool LastUpdatedTimeStampHasBeenSet() const { return m_lastUpdatedTimeStampHasBeenSet; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline void SetLastUpdatedTimeStamp(const Aws::Utils::DateTime& value) { m_lastUpdatedTimeStampHasBeenSet = true; m_lastUpdatedTimeStamp = value; }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline void SetLastUpdatedTimeStamp(Aws::Utils::DateTime&& value) { m_lastUpdatedTimeStampHasBeenSet = true; m_lastUpdatedTimeStamp = std::move(value); }
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline CodeReviewSummary& WithLastUpdatedTimeStamp(const Aws::Utils::DateTime& value) { SetLastUpdatedTimeStamp(value); return *this;}
+
+    /**
+     * <p> The time, in milliseconds since the epoch, when the code review was last
+     * updated. </p>
+     */
+    inline CodeReviewSummary& WithLastUpdatedTimeStamp(Aws::Utils::DateTime&& value) { SetLastUpdatedTimeStamp(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The type of the code review. </p>
+     */
+    inline const Type& GetType() const{ return m_type; }
+
+    /**
+     * <p> The type of the code review. </p>
+     */
+    inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }
+
+    /**
+     * <p> The type of the code review. </p>
+     */
+    inline void SetType(const Type& value) { m_typeHasBeenSet = true; m_type = value; }
+
+    /**
+     * <p> The type of the code review. </p>
+     */
+    inline void SetType(Type&& value) { m_typeHasBeenSet = true; m_type = std::move(value); }
+
+    /**
+     * <p> The type of the code review. </p>
+     */
+    inline CodeReviewSummary& WithType(const Type& value) { SetType(value); return *this;}
+
+    /**
+     * <p> The type of the code review. </p>
+     */
+    inline CodeReviewSummary& WithType(Type&& value) { SetType(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline const Aws::String& GetPullRequestId() const{ return m_pullRequestId; }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline bool PullRequestIdHasBeenSet() const { return m_pullRequestIdHasBeenSet; }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline void SetPullRequestId(const Aws::String& value) { m_pullRequestIdHasBeenSet = true; m_pullRequestId = value; }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline void SetPullRequestId(Aws::String&& value) { m_pullRequestIdHasBeenSet = true; m_pullRequestId = std::move(value); }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline void SetPullRequestId(const char* value) { m_pullRequestIdHasBeenSet = true; m_pullRequestId.assign(value); }
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline CodeReviewSummary& WithPullRequestId(const Aws::String& value) { SetPullRequestId(value); return *this;}
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline CodeReviewSummary& WithPullRequestId(Aws::String&& value) { SetPullRequestId(std::move(value)); return *this;}
+
+    /**
+     * <p> The pull request ID for the code review. </p>
+     */
+    inline CodeReviewSummary& WithPullRequestId(const char* value) { SetPullRequestId(value); return *this;}
+
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline const MetricsSummary& GetMetricsSummary() const{ return m_metricsSummary; }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline bool MetricsSummaryHasBeenSet() const { return m_metricsSummaryHasBeenSet; }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline void SetMetricsSummary(const MetricsSummary& value) { m_metricsSummaryHasBeenSet = true; m_metricsSummary = value; }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline void SetMetricsSummary(MetricsSummary&& value) { m_metricsSummaryHasBeenSet = true; m_metricsSummary = std::move(value); }
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline CodeReviewSummary& WithMetricsSummary(const MetricsSummary& value) { SetMetricsSummary(value); return *this;}
+
+    /**
+     * <p> The statistics from the code review. </p>
+     */
+    inline CodeReviewSummary& WithMetricsSummary(MetricsSummary&& value) { SetMetricsSummary(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_name;
+    bool m_nameHasBeenSet;
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+
+    Aws::String m_repositoryName;
+    bool m_repositoryNameHasBeenSet;
+
+    Aws::String m_owner;
+    bool m_ownerHasBeenSet;
+
+    ProviderType m_providerType;
+    bool m_providerTypeHasBeenSet;
+
+    JobState m_state;
+    bool m_stateHasBeenSet;
+
+    Aws::Utils::DateTime m_createdTimeStamp;
+    bool m_createdTimeStampHasBeenSet;
+
+    Aws::Utils::DateTime m_lastUpdatedTimeStamp;
+    bool m_lastUpdatedTimeStampHasBeenSet;
+
+    Type m_type;
+    bool m_typeHasBeenSet;
+
+    Aws::String m_pullRequestId;
+    bool m_pullRequestIdHasBeenSet;
+
+    MetricsSummary m_metricsSummary;
+    bool m_metricsSummaryHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CommitDiffSourceCodeType.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CommitDiffSourceCodeType.h
new file mode 100644
index 00000000000..aebffebe9ef
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/CommitDiffSourceCodeType.h
@@ -0,0 +1,142 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> The commit diff for the pull request. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/CommitDiffSourceCodeType">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API CommitDiffSourceCodeType
+  {
+  public:
+    CommitDiffSourceCodeType();
+    CommitDiffSourceCodeType(Aws::Utils::Json::JsonView jsonValue);
+    CommitDiffSourceCodeType& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline const Aws::String& GetSourceCommit() const{ return m_sourceCommit; }
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline bool SourceCommitHasBeenSet() const { return m_sourceCommitHasBeenSet; }
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline void SetSourceCommit(const Aws::String& value) { m_sourceCommitHasBeenSet = true; m_sourceCommit = value; }
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline void SetSourceCommit(Aws::String&& value) { m_sourceCommitHasBeenSet = true; m_sourceCommit = std::move(value); }
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline void SetSourceCommit(const char* value) { m_sourceCommitHasBeenSet = true; m_sourceCommit.assign(value); }
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline CommitDiffSourceCodeType& WithSourceCommit(const Aws::String& value) { SetSourceCommit(value); return *this;}
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline CommitDiffSourceCodeType& WithSourceCommit(Aws::String&& value) { SetSourceCommit(std::move(value)); return *this;}
+
+    /**
+     * <p> Source Commit SHA. </p>
+     */
+    inline CommitDiffSourceCodeType& WithSourceCommit(const char* value) { SetSourceCommit(value); return *this;}
+
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline const Aws::String& GetDestinationCommit() const{ return m_destinationCommit; }
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline bool DestinationCommitHasBeenSet() const { return m_destinationCommitHasBeenSet; }
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline void SetDestinationCommit(const Aws::String& value) { m_destinationCommitHasBeenSet = true; m_destinationCommit = value; }
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline void SetDestinationCommit(Aws::String&& value) { m_destinationCommitHasBeenSet = true; m_destinationCommit = std::move(value); }
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline void SetDestinationCommit(const char* value) { m_destinationCommitHasBeenSet = true; m_destinationCommit.assign(value); }
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline CommitDiffSourceCodeType& WithDestinationCommit(const Aws::String& value) { SetDestinationCommit(value); return *this;}
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline CommitDiffSourceCodeType& WithDestinationCommit(Aws::String&& value) { SetDestinationCommit(std::move(value)); return *this;}
+
+    /**
+     * <p> Destination Commit SHA </p>
+     */
+    inline CommitDiffSourceCodeType& WithDestinationCommit(const char* value) { SetDestinationCommit(value); return *this;}
+
+  private:
+
+    Aws::String m_sourceCommit;
+    bool m_sourceCommitHasBeenSet;
+
+    Aws::String m_destinationCommit;
+    bool m_destinationCommitHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewRequest.h
new file mode 100644
index 00000000000..d1883ebc747
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewRequest.h
@@ -0,0 +1,93 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_CODEGURUREVIEWER_API DescribeCodeReviewRequest : public CodeGuruReviewerRequest
+  {
+  public:
+    DescribeCodeReviewRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "DescribeCodeReview"; }
+
+    Aws::String SerializePayload() const override;
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline DescribeCodeReviewRequest& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline DescribeCodeReviewRequest& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline DescribeCodeReviewRequest& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+  private:
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewResult.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewResult.h
new file mode 100644
index 00000000000..a7392963220
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeCodeReviewResult.h
@@ -0,0 +1,77 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/model/CodeReview.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  class AWS_CODEGURUREVIEWER_API DescribeCodeReviewResult
+  {
+  public:
+    DescribeCodeReviewResult();
+    DescribeCodeReviewResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    DescribeCodeReviewResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p> Information about the code review. </p>
+     */
+    inline const CodeReview& GetCodeReview() const{ return m_codeReview; }
+
+    /**
+     * <p> Information about the code review. </p>
+     */
+    inline void SetCodeReview(const CodeReview& value) { m_codeReview = value; }
+
+    /**
+     * <p> Information about the code review. </p>
+     */
+    inline void SetCodeReview(CodeReview&& value) { m_codeReview = std::move(value); }
+
+    /**
+     * <p> Information about the code review. </p>
+     */
+    inline DescribeCodeReviewResult& WithCodeReview(const CodeReview& value) { SetCodeReview(value); return *this;}
+
+    /**
+     * <p> Information about the code review. </p>
+     */
+    inline DescribeCodeReviewResult& WithCodeReview(CodeReview&& value) { SetCodeReview(std::move(value)); return *this;}
+
+  private:
+
+    CodeReview m_codeReview;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackRequest.h
new file mode 100644
index 00000000000..aee49feb21a
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackRequest.h
@@ -0,0 +1,203 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Http
+{
+    class URI;
+} //namespace Http
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_CODEGURUREVIEWER_API DescribeRecommendationFeedbackRequest : public CodeGuruReviewerRequest
+  {
+  public:
+    DescribeRecommendationFeedbackRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "DescribeRecommendationFeedback"; }
+
+    Aws::String SerializePayload() const override;
+
+    void AddQueryStringParameters(Aws::Http::URI& uri) const override;
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline const Aws::String& GetRecommendationId() const{ return m_recommendationId; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline bool RecommendationIdHasBeenSet() const { return m_recommendationIdHasBeenSet; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const Aws::String& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = value; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(Aws::String&& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = std::move(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const char* value) { m_recommendationIdHasBeenSet = true; m_recommendationId.assign(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithRecommendationId(const Aws::String& value) { SetRecommendationId(value); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithRecommendationId(Aws::String&& value) { SetRecommendationId(std::move(value)); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithRecommendationId(const char* value) { SetRecommendationId(value); return *this;}
+
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline const Aws::String& GetUserId() const{ return m_userId; }
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline bool UserIdHasBeenSet() const { return m_userIdHasBeenSet; }
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline void SetUserId(const Aws::String& value) { m_userIdHasBeenSet = true; m_userId = value; }
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline void SetUserId(Aws::String&& value) { m_userIdHasBeenSet = true; m_userId = std::move(value); }
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline void SetUserId(const char* value) { m_userIdHasBeenSet = true; m_userId.assign(value); }
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithUserId(const Aws::String& value) { SetUserId(value); return *this;}
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithUserId(Aws::String&& value) { SetUserId(std::move(value)); return *this;}
+
+    /**
+     * <p> Optional parameter to describe the feedback for a given user. If this is not
+     * supplied, it defaults to the user making the request. </p>
+     */
+    inline DescribeRecommendationFeedbackRequest& WithUserId(const char* value) { SetUserId(value); return *this;}
+
+  private:
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+
+    Aws::String m_recommendationId;
+    bool m_recommendationIdHasBeenSet;
+
+    Aws::String m_userId;
+    bool m_userIdHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackResult.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackResult.h
new file mode 100644
index 00000000000..0259422f805
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRecommendationFeedbackResult.h
@@ -0,0 +1,77 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/model/RecommendationFeedback.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  class AWS_CODEGURUREVIEWER_API DescribeRecommendationFeedbackResult
+  {
+  public:
+    DescribeRecommendationFeedbackResult();
+    DescribeRecommendationFeedbackResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    DescribeRecommendationFeedbackResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p> The recommendation feedback given by the user. </p>
+     */
+    inline const RecommendationFeedback& GetRecommendationFeedback() const{ return m_recommendationFeedback; }
+
+    /**
+     * <p> The recommendation feedback given by the user. </p>
+     */
+    inline void SetRecommendationFeedback(const RecommendationFeedback& value) { m_recommendationFeedback = value; }
+
+    /**
+     * <p> The recommendation feedback given by the user. </p>
+     */
+    inline void SetRecommendationFeedback(RecommendationFeedback&& value) { m_recommendationFeedback = std::move(value); }
+
+    /**
+     * <p> The recommendation feedback given by the user. </p>
+     */
+    inline DescribeRecommendationFeedbackResult& WithRecommendationFeedback(const RecommendationFeedback& value) { SetRecommendationFeedback(value); return *this;}
+
+    /**
+     * <p> The recommendation feedback given by the user. </p>
+     */
+    inline DescribeRecommendationFeedbackResult& WithRecommendationFeedback(RecommendationFeedback&& value) { SetRecommendationFeedback(std::move(value)); return *this;}
+
+  private:
+
+    RecommendationFeedback m_recommendationFeedback;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRepositoryAssociationRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRepositoryAssociationRequest.h
index 2341371bc0d..15bfca975f0 100644
--- a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRepositoryAssociationRequest.h
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/DescribeRepositoryAssociationRequest.h
@@ -43,42 +43,50 @@ namespace Model
 
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline const Aws::String& GetAssociationArn() const{ return m_associationArn; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline bool AssociationArnHasBeenSet() const { return m_associationArnHasBeenSet; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline void SetAssociationArn(const Aws::String& value) { m_associationArnHasBeenSet = true; m_associationArn = value; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline void SetAssociationArn(Aws::String&& value) { m_associationArnHasBeenSet = true; m_associationArn = std::move(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline void SetAssociationArn(const char* value) { m_associationArnHasBeenSet = true; m_associationArn.assign(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline DescribeRepositoryAssociationRequest& WithAssociationArn(const Aws::String& value) { SetAssociationArn(value); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline DescribeRepositoryAssociationRequest& WithAssociationArn(Aws::String&& value) { SetAssociationArn(std::move(value)); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) identifying the association.</p>
+     * <p>The Amazon Resource Name (ARN) identifying the association. You can retrieve
+     * this ARN by calling <code>ListRepositories</code>.</p>
      */
     inline DescribeRepositoryAssociationRequest& WithAssociationArn(const char* value) { SetAssociationArn(value); return *this;}
 
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/JobState.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/JobState.h
new file mode 100644
index 00000000000..cd9f920fca5
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/JobState.h
@@ -0,0 +1,43 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  enum class JobState
+  {
+    NOT_SET,
+    Completed,
+    Pending,
+    Failed,
+    Deleting
+  };
+
+namespace JobStateMapper
+{
+AWS_CODEGURUREVIEWER_API JobState GetJobStateForName(const Aws::String& name);
+
+AWS_CODEGURUREVIEWER_API Aws::String GetNameForJobState(JobState value);
+} // namespace JobStateMapper
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsRequest.h
new file mode 100644
index 00000000000..0422a75bd23
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsRequest.h
@@ -0,0 +1,367 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/codeguru-reviewer/model/Type.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/codeguru-reviewer/model/ProviderType.h>
+#include <aws/codeguru-reviewer/model/JobState.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Http
+{
+    class URI;
+} //namespace Http
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_CODEGURUREVIEWER_API ListCodeReviewsRequest : public CodeGuruReviewerRequest
+  {
+  public:
+    ListCodeReviewsRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ListCodeReviews"; }
+
+    Aws::String SerializePayload() const override;
+
+    void AddQueryStringParameters(Aws::Http::URI& uri) const override;
+
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline const Aws::Vector<ProviderType>& GetProviderTypes() const{ return m_providerTypes; }
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline bool ProviderTypesHasBeenSet() const { return m_providerTypesHasBeenSet; }
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline void SetProviderTypes(const Aws::Vector<ProviderType>& value) { m_providerTypesHasBeenSet = true; m_providerTypes = value; }
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline void SetProviderTypes(Aws::Vector<ProviderType>&& value) { m_providerTypesHasBeenSet = true; m_providerTypes = std::move(value); }
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline ListCodeReviewsRequest& WithProviderTypes(const Aws::Vector<ProviderType>& value) { SetProviderTypes(value); return *this;}
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline ListCodeReviewsRequest& WithProviderTypes(Aws::Vector<ProviderType>&& value) { SetProviderTypes(std::move(value)); return *this;}
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline ListCodeReviewsRequest& AddProviderTypes(const ProviderType& value) { m_providerTypesHasBeenSet = true; m_providerTypes.push_back(value); return *this; }
+
+    /**
+     * <p> List of provider types for filtering that needs to be applied before
+     * displaying the result. For example, "providerTypes=[GitHub]" will list code
+     * reviews from GitHub. </p>
+     */
+    inline ListCodeReviewsRequest& AddProviderTypes(ProviderType&& value) { m_providerTypesHasBeenSet = true; m_providerTypes.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline const Aws::Vector<JobState>& GetStates() const{ return m_states; }
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline bool StatesHasBeenSet() const { return m_statesHasBeenSet; }
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline void SetStates(const Aws::Vector<JobState>& value) { m_statesHasBeenSet = true; m_states = value; }
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline void SetStates(Aws::Vector<JobState>&& value) { m_statesHasBeenSet = true; m_states = std::move(value); }
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline ListCodeReviewsRequest& WithStates(const Aws::Vector<JobState>& value) { SetStates(value); return *this;}
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline ListCodeReviewsRequest& WithStates(Aws::Vector<JobState>&& value) { SetStates(std::move(value)); return *this;}
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline ListCodeReviewsRequest& AddStates(const JobState& value) { m_statesHasBeenSet = true; m_states.push_back(value); return *this; }
+
+    /**
+     * <p> List of states for filtering that needs to be applied before displaying the
+     * result. For example, "states=[Pending]" will list code reviews in the Pending
+     * state. </p>
+     */
+    inline ListCodeReviewsRequest& AddStates(JobState&& value) { m_statesHasBeenSet = true; m_states.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline const Aws::Vector<Aws::String>& GetRepositoryNames() const{ return m_repositoryNames; }
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline bool RepositoryNamesHasBeenSet() const { return m_repositoryNamesHasBeenSet; }
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline void SetRepositoryNames(const Aws::Vector<Aws::String>& value) { m_repositoryNamesHasBeenSet = true; m_repositoryNames = value; }
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline void SetRepositoryNames(Aws::Vector<Aws::String>&& value) { m_repositoryNamesHasBeenSet = true; m_repositoryNames = std::move(value); }
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline ListCodeReviewsRequest& WithRepositoryNames(const Aws::Vector<Aws::String>& value) { SetRepositoryNames(value); return *this;}
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline ListCodeReviewsRequest& WithRepositoryNames(Aws::Vector<Aws::String>&& value) { SetRepositoryNames(std::move(value)); return *this;}
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline ListCodeReviewsRequest& AddRepositoryNames(const Aws::String& value) { m_repositoryNamesHasBeenSet = true; m_repositoryNames.push_back(value); return *this; }
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline ListCodeReviewsRequest& AddRepositoryNames(Aws::String&& value) { m_repositoryNamesHasBeenSet = true; m_repositoryNames.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p> List of repository names for filtering that needs to be applied before
+     * displaying the result. </p>
+     */
+    inline ListCodeReviewsRequest& AddRepositoryNames(const char* value) { m_repositoryNamesHasBeenSet = true; m_repositoryNames.push_back(value); return *this; }
+
+
+    /**
+     * <p> The type of code reviews to list in the response. </p>
+     */
+    inline const Type& GetType() const{ return m_type; }
+
+    /**
+     * <p> The type of code reviews to list in the response. </p>
+     */
+    inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }
+
+    /**
+     * <p> The type of code reviews to list in the response. </p>
+     */
+    inline void SetType(const Type& value) { m_typeHasBeenSet = true; m_type = value; }
+
+    /**
+     * <p> The type of code reviews to list in the response. </p>
+     */
+    inline void SetType(Type&& value) { m_typeHasBeenSet = true; m_type = std::move(value); }
+
+    /**
+     * <p> The type of code reviews to list in the response. </p>
+     */
+    inline ListCodeReviewsRequest& WithType(const Type& value) { SetType(value); return *this;}
+
+    /**
+     * <p> The type of code reviews to list in the response. </p>
+     */
+    inline ListCodeReviewsRequest& WithType(Type&& value) { SetType(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline int GetMaxResults() const{ return m_maxResults; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline bool MaxResultsHasBeenSet() const { return m_maxResultsHasBeenSet; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline void SetMaxResults(int value) { m_maxResultsHasBeenSet = true; m_maxResults = value; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline ListCodeReviewsRequest& WithMaxResults(int value) { SetMaxResults(value); return *this;}
+
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline bool NextTokenHasBeenSet() const { return m_nextTokenHasBeenSet; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(const Aws::String& value) { m_nextTokenHasBeenSet = true; m_nextToken = value; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(Aws::String&& value) { m_nextTokenHasBeenSet = true; m_nextToken = std::move(value); }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(const char* value) { m_nextTokenHasBeenSet = true; m_nextToken.assign(value); }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListCodeReviewsRequest& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListCodeReviewsRequest& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListCodeReviewsRequest& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+
+  private:
+
+    Aws::Vector<ProviderType> m_providerTypes;
+    bool m_providerTypesHasBeenSet;
+
+    Aws::Vector<JobState> m_states;
+    bool m_statesHasBeenSet;
+
+    Aws::Vector<Aws::String> m_repositoryNames;
+    bool m_repositoryNamesHasBeenSet;
+
+    Type m_type;
+    bool m_typeHasBeenSet;
+
+    int m_maxResults;
+    bool m_maxResultsHasBeenSet;
+
+    Aws::String m_nextToken;
+    bool m_nextTokenHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsResult.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsResult.h
new file mode 100644
index 00000000000..1f0dddfd813
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListCodeReviewsResult.h
@@ -0,0 +1,127 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/codeguru-reviewer/model/CodeReviewSummary.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  class AWS_CODEGURUREVIEWER_API ListCodeReviewsResult
+  {
+  public:
+    ListCodeReviewsResult();
+    ListCodeReviewsResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    ListCodeReviewsResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline const Aws::Vector<CodeReviewSummary>& GetCodeReviewSummaries() const{ return m_codeReviewSummaries; }
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline void SetCodeReviewSummaries(const Aws::Vector<CodeReviewSummary>& value) { m_codeReviewSummaries = value; }
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline void SetCodeReviewSummaries(Aws::Vector<CodeReviewSummary>&& value) { m_codeReviewSummaries = std::move(value); }
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline ListCodeReviewsResult& WithCodeReviewSummaries(const Aws::Vector<CodeReviewSummary>& value) { SetCodeReviewSummaries(value); return *this;}
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline ListCodeReviewsResult& WithCodeReviewSummaries(Aws::Vector<CodeReviewSummary>&& value) { SetCodeReviewSummaries(std::move(value)); return *this;}
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline ListCodeReviewsResult& AddCodeReviewSummaries(const CodeReviewSummary& value) { m_codeReviewSummaries.push_back(value); return *this; }
+
+    /**
+     * <p> A list of code reviews that meet the criteria of the request. </p>
+     */
+    inline ListCodeReviewsResult& AddCodeReviewSummaries(CodeReviewSummary&& value) { m_codeReviewSummaries.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(const Aws::String& value) { m_nextToken = value; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(Aws::String&& value) { m_nextToken = std::move(value); }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(const char* value) { m_nextToken.assign(value); }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListCodeReviewsResult& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListCodeReviewsResult& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListCodeReviewsResult& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+
+  private:
+
+    Aws::Vector<CodeReviewSummary> m_codeReviewSummaries;
+
+    Aws::String m_nextToken;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h
new file mode 100644
index 00000000000..d2bb5f78e40
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h
@@ -0,0 +1,330 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Http
+{
+    class URI;
+} //namespace Http
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_CODEGURUREVIEWER_API ListRecommendationFeedbackRequest : public CodeGuruReviewerRequest
+  {
+  public:
+    ListRecommendationFeedbackRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ListRecommendationFeedback"; }
+
+    Aws::String SerializePayload() const override;
+
+    void AddQueryStringParameters(Aws::Http::URI& uri) const override;
+
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline bool NextTokenHasBeenSet() const { return m_nextTokenHasBeenSet; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(const Aws::String& value) { m_nextTokenHasBeenSet = true; m_nextToken = value; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(Aws::String&& value) { m_nextTokenHasBeenSet = true; m_nextToken = std::move(value); }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(const char* value) { m_nextTokenHasBeenSet = true; m_nextToken.assign(value); }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline int GetMaxResults() const{ return m_maxResults; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline bool MaxResultsHasBeenSet() const { return m_maxResultsHasBeenSet; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline void SetMaxResults(int value) { m_maxResultsHasBeenSet = true; m_maxResults = value; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithMaxResults(int value) { SetMaxResults(value); return *this;}
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline const Aws::Vector<Aws::String>& GetUserIds() const{ return m_userIds; }
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline bool UserIdsHasBeenSet() const { return m_userIdsHasBeenSet; }
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline void SetUserIds(const Aws::Vector<Aws::String>& value) { m_userIdsHasBeenSet = true; m_userIds = value; }
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline void SetUserIds(Aws::Vector<Aws::String>&& value) { m_userIdsHasBeenSet = true; m_userIds = std::move(value); }
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithUserIds(const Aws::Vector<Aws::String>& value) { SetUserIds(value); return *this;}
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithUserIds(Aws::Vector<Aws::String>&& value) { SetUserIds(std::move(value)); return *this;}
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline ListRecommendationFeedbackRequest& AddUserIds(const Aws::String& value) { m_userIdsHasBeenSet = true; m_userIds.push_back(value); return *this; }
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline ListRecommendationFeedbackRequest& AddUserIds(Aws::String&& value) { m_userIdsHasBeenSet = true; m_userIds.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p> Filter on userIds that need to be applied before displaying the result. This
+     * can be used to query all the recommendation feedback for a code review from a
+     * given user. </p>
+     */
+    inline ListRecommendationFeedbackRequest& AddUserIds(const char* value) { m_userIdsHasBeenSet = true; m_userIds.push_back(value); return *this; }
+
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline const Aws::Vector<Aws::String>& GetRecommendationIds() const{ return m_recommendationIds; }
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline bool RecommendationIdsHasBeenSet() const { return m_recommendationIdsHasBeenSet; }
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline void SetRecommendationIds(const Aws::Vector<Aws::String>& value) { m_recommendationIdsHasBeenSet = true; m_recommendationIds = value; }
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline void SetRecommendationIds(Aws::Vector<Aws::String>&& value) { m_recommendationIdsHasBeenSet = true; m_recommendationIds = std::move(value); }
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithRecommendationIds(const Aws::Vector<Aws::String>& value) { SetRecommendationIds(value); return *this;}
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline ListRecommendationFeedbackRequest& WithRecommendationIds(Aws::Vector<Aws::String>&& value) { SetRecommendationIds(std::move(value)); return *this;}
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline ListRecommendationFeedbackRequest& AddRecommendationIds(const Aws::String& value) { m_recommendationIdsHasBeenSet = true; m_recommendationIds.push_back(value); return *this; }
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline ListRecommendationFeedbackRequest& AddRecommendationIds(Aws::String&& value) { m_recommendationIdsHasBeenSet = true; m_recommendationIds.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p> Filter on recommendationIds that need to be applied before displaying the
+     * result. This can be used to query all the recommendation feedback for a given
+     * recommendation. </p>
+     */
+    inline ListRecommendationFeedbackRequest& AddRecommendationIds(const char* value) { m_recommendationIdsHasBeenSet = true; m_recommendationIds.push_back(value); return *this; }
+
+  private:
+
+    Aws::String m_nextToken;
+    bool m_nextTokenHasBeenSet;
+
+    int m_maxResults;
+    bool m_maxResultsHasBeenSet;
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+
+    Aws::Vector<Aws::String> m_userIds;
+    bool m_userIdsHasBeenSet;
+
+    Aws::Vector<Aws::String> m_recommendationIds;
+    bool m_recommendationIdsHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h
new file mode 100644
index 00000000000..740f0595e8b
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h
@@ -0,0 +1,148 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/codeguru-reviewer/model/RecommendationFeedbackSummary.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  class AWS_CODEGURUREVIEWER_API ListRecommendationFeedbackResult
+  {
+  public:
+    ListRecommendationFeedbackResult();
+    ListRecommendationFeedbackResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    ListRecommendationFeedbackResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline const Aws::Vector<RecommendationFeedbackSummary>& GetRecommendationFeedbackSummaries() const{ return m_recommendationFeedbackSummaries; }
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline void SetRecommendationFeedbackSummaries(const Aws::Vector<RecommendationFeedbackSummary>& value) { m_recommendationFeedbackSummaries = value; }
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline void SetRecommendationFeedbackSummaries(Aws::Vector<RecommendationFeedbackSummary>&& value) { m_recommendationFeedbackSummaries = std::move(value); }
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline ListRecommendationFeedbackResult& WithRecommendationFeedbackSummaries(const Aws::Vector<RecommendationFeedbackSummary>& value) { SetRecommendationFeedbackSummaries(value); return *this;}
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline ListRecommendationFeedbackResult& WithRecommendationFeedbackSummaries(Aws::Vector<RecommendationFeedbackSummary>&& value) { SetRecommendationFeedbackSummaries(std::move(value)); return *this;}
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline ListRecommendationFeedbackResult& AddRecommendationFeedbackSummaries(const RecommendationFeedbackSummary& value) { m_recommendationFeedbackSummaries.push_back(value); return *this; }
+
+    /**
+     * <p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>
+     */
+    inline ListRecommendationFeedbackResult& AddRecommendationFeedbackSummaries(RecommendationFeedbackSummary&& value) { m_recommendationFeedbackSummaries.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(const Aws::String& value) { m_nextToken = value; }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(Aws::String&& value) { m_nextToken = std::move(value); }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline void SetNextToken(const char* value) { m_nextToken.assign(value); }
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListRecommendationFeedbackResult& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListRecommendationFeedbackResult& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+
+    /**
+     * <p> If nextToken is returned, there are more results available. The value of
+     * nextToken is a unique pagination token for each page. Make the call again using
+     * the returned token to retrieve the next page. Keep all other arguments
+     * unchanged. </p>
+     */
+    inline ListRecommendationFeedbackResult& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+
+  private:
+
+    Aws::Vector<RecommendationFeedbackSummary> m_recommendationFeedbackSummaries;
+
+    Aws::String m_nextToken;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsRequest.h
new file mode 100644
index 00000000000..a16b910f88e
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsRequest.h
@@ -0,0 +1,171 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Http
+{
+    class URI;
+} //namespace Http
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_CODEGURUREVIEWER_API ListRecommendationsRequest : public CodeGuruReviewerRequest
+  {
+  public:
+    ListRecommendationsRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ListRecommendations"; }
+
+    Aws::String SerializePayload() const override;
+
+    void AddQueryStringParameters(Aws::Http::URI& uri) const override;
+
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline bool NextTokenHasBeenSet() const { return m_nextTokenHasBeenSet; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(const Aws::String& value) { m_nextTokenHasBeenSet = true; m_nextToken = value; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(Aws::String&& value) { m_nextTokenHasBeenSet = true; m_nextToken = std::move(value); }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(const char* value) { m_nextTokenHasBeenSet = true; m_nextToken.assign(value); }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListRecommendationsRequest& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListRecommendationsRequest& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListRecommendationsRequest& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline int GetMaxResults() const{ return m_maxResults; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline bool MaxResultsHasBeenSet() const { return m_maxResultsHasBeenSet; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline void SetMaxResults(int value) { m_maxResultsHasBeenSet = true; m_maxResults = value; }
+
+    /**
+     * <p> The maximum number of results that are returned per call. The default is
+     * 100. </p>
+     */
+    inline ListRecommendationsRequest& WithMaxResults(int value) { SetMaxResults(value); return *this;}
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline ListRecommendationsRequest& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline ListRecommendationsRequest& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) of the code review to describe. </p>
+     */
+    inline ListRecommendationsRequest& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+  private:
+
+    Aws::String m_nextToken;
+    bool m_nextTokenHasBeenSet;
+
+    int m_maxResults;
+    bool m_maxResultsHasBeenSet;
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsResult.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsResult.h
new file mode 100644
index 00000000000..4c6be9c4c7a
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRecommendationsResult.h
@@ -0,0 +1,127 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/codeguru-reviewer/model/RecommendationSummary.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  class AWS_CODEGURUREVIEWER_API ListRecommendationsResult
+  {
+  public:
+    ListRecommendationsResult();
+    ListRecommendationsResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    ListRecommendationsResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline const Aws::Vector<RecommendationSummary>& GetRecommendationSummaries() const{ return m_recommendationSummaries; }
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline void SetRecommendationSummaries(const Aws::Vector<RecommendationSummary>& value) { m_recommendationSummaries = value; }
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline void SetRecommendationSummaries(Aws::Vector<RecommendationSummary>&& value) { m_recommendationSummaries = std::move(value); }
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline ListRecommendationsResult& WithRecommendationSummaries(const Aws::Vector<RecommendationSummary>& value) { SetRecommendationSummaries(value); return *this;}
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline ListRecommendationsResult& WithRecommendationSummaries(Aws::Vector<RecommendationSummary>&& value) { SetRecommendationSummaries(std::move(value)); return *this;}
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline ListRecommendationsResult& AddRecommendationSummaries(const RecommendationSummary& value) { m_recommendationSummaries.push_back(value); return *this; }
+
+    /**
+     * <p> List of recommendations for the requested code review. </p>
+     */
+    inline ListRecommendationsResult& AddRecommendationSummaries(RecommendationSummary&& value) { m_recommendationSummaries.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(const Aws::String& value) { m_nextToken = value; }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(Aws::String&& value) { m_nextToken = std::move(value); }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline void SetNextToken(const char* value) { m_nextToken.assign(value); }
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListRecommendationsResult& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListRecommendationsResult& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+
+    /**
+     * <p> Pagination token. </p>
+     */
+    inline ListRecommendationsResult& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+
+  private:
+
+    Aws::Vector<RecommendationSummary> m_recommendationSummaries;
+
+    Aws::String m_nextToken;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRepositoryAssociationsRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRepositoryAssociationsRequest.h
index a00b6206ced..d7bed66fb63 100644
--- a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRepositoryAssociationsRequest.h
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/ListRepositoryAssociationsRequest.h
@@ -134,102 +134,111 @@ namespace Model
 
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline const Aws::Vector<Aws::String>& GetNames() const{ return m_names; }
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline bool NamesHasBeenSet() const { return m_namesHasBeenSet; }
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline void SetNames(const Aws::Vector<Aws::String>& value) { m_namesHasBeenSet = true; m_names = value; }
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline void SetNames(Aws::Vector<Aws::String>&& value) { m_namesHasBeenSet = true; m_names = std::move(value); }
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline ListRepositoryAssociationsRequest& WithNames(const Aws::Vector<Aws::String>& value) { SetNames(value); return *this;}
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline ListRepositoryAssociationsRequest& WithNames(Aws::Vector<Aws::String>&& value) { SetNames(std::move(value)); return *this;}
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline ListRepositoryAssociationsRequest& AddNames(const Aws::String& value) { m_namesHasBeenSet = true; m_names.push_back(value); return *this; }
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline ListRepositoryAssociationsRequest& AddNames(Aws::String&& value) { m_namesHasBeenSet = true; m_names.push_back(std::move(value)); return *this; }
 
     /**
-     * <p>List of names to use as a filter.</p>
+     * <p>List of repository names to use as a filter.</p>
      */
     inline ListRepositoryAssociationsRequest& AddNames(const char* value) { m_namesHasBeenSet = true; m_names.push_back(value); return *this; }
 
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline const Aws::Vector<Aws::String>& GetOwners() const{ return m_owners; }
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline bool OwnersHasBeenSet() const { return m_ownersHasBeenSet; }
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline void SetOwners(const Aws::Vector<Aws::String>& value) { m_ownersHasBeenSet = true; m_owners = value; }
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline void SetOwners(Aws::Vector<Aws::String>&& value) { m_ownersHasBeenSet = true; m_owners = std::move(value); }
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline ListRepositoryAssociationsRequest& WithOwners(const Aws::Vector<Aws::String>& value) { SetOwners(value); return *this;}
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline ListRepositoryAssociationsRequest& WithOwners(Aws::Vector<Aws::String>&& value) { SetOwners(std::move(value)); return *this;}
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline ListRepositoryAssociationsRequest& AddOwners(const Aws::String& value) { m_ownersHasBeenSet = true; m_owners.push_back(value); return *this; }
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline ListRepositoryAssociationsRequest& AddOwners(Aws::String&& value) { m_ownersHasBeenSet = true; m_owners.push_back(std::move(value)); return *this; }
 
     /**
-     * <p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS
-     * account id. For GitHub, it is the GitHub account name.</p>
+     * <p>List of owners to use as a filter. For GitHub, this is name of the GitHub
+     * account that was used to associate the repository. For AWS CodeCommit, it is the
+     * name of the CodeCommit account that was used to associate the repository.</p>
      */
     inline ListRepositoryAssociationsRequest& AddOwners(const char* value) { m_ownersHasBeenSet = true; m_owners.push_back(value); return *this; }
 
@@ -238,13 +247,12 @@ namespace Model
      * <p>The maximum number of repository association results returned by
      * <code>ListRepositoryAssociations</code> in paginated output. When this parameter
      * is used, <code>ListRepositoryAssociations</code> only returns
-     * <code>maxResults</code> results in a single page along with a
-     * <code>nextToken</code> response element. The remaining results of the initial
-     * request can be seen by sending another <code>ListRepositoryAssociations</code>
-     * request with the returned <code>nextToken</code> value. This value can be
-     * between 1 and 100. If this parameter is not used, then
-     * <code>ListRepositoryAssociations</code> returns up to 100 results and a
-     * <code>nextToken</code> value if applicable. </p>
+     * <code>maxResults</code> results in a single page with a <code>nextToken</code>
+     * response element. The remaining results of the initial request can be seen by
+     * sending another <code>ListRepositoryAssociations</code> request with the
+     * returned <code>nextToken</code> value. This value can be between 1 and 25. If
+     * this parameter is not used, <code>ListRepositoryAssociations</code> returns up
+     * to 25 results and a <code>nextToken</code> value if applicable. </p>
      */
     inline int GetMaxResults() const{ return m_maxResults; }
 
@@ -252,13 +260,12 @@ namespace Model
      * <p>The maximum number of repository association results returned by
      * <code>ListRepositoryAssociations</code> in paginated output. When this parameter
      * is used, <code>ListRepositoryAssociations</code> only returns
-     * <code>maxResults</code> results in a single page along with a
-     * <code>nextToken</code> response element. The remaining results of the initial
-     * request can be seen by sending another <code>ListRepositoryAssociations</code>
-     * request with the returned <code>nextToken</code> value. This value can be
-     * between 1 and 100. If this parameter is not used, then
-     * <code>ListRepositoryAssociations</code> returns up to 100 results and a
-     * <code>nextToken</code> value if applicable. </p>
+     * <code>maxResults</code> results in a single page with a <code>nextToken</code>
+     * response element. The remaining results of the initial request can be seen by
+     * sending another <code>ListRepositoryAssociations</code> request with the
+     * returned <code>nextToken</code> value. This value can be between 1 and 25. If
+     * this parameter is not used, <code>ListRepositoryAssociations</code> returns up
+     * to 25 results and a <code>nextToken</code> value if applicable. </p>
      */
     inline bool MaxResultsHasBeenSet() const { return m_maxResultsHasBeenSet; }
 
@@ -266,13 +273,12 @@ namespace Model
      * <p>The maximum number of repository association results returned by
      * <code>ListRepositoryAssociations</code> in paginated output. When this parameter
      * is used, <code>ListRepositoryAssociations</code> only returns
-     * <code>maxResults</code> results in a single page along with a
-     * <code>nextToken</code> response element. The remaining results of the initial
-     * request can be seen by sending another <code>ListRepositoryAssociations</code>
-     * request with the returned <code>nextToken</code> value. This value can be
-     * between 1 and 100. If this parameter is not used, then
-     * <code>ListRepositoryAssociations</code> returns up to 100 results and a
-     * <code>nextToken</code> value if applicable. </p>
+     * <code>maxResults</code> results in a single page with a <code>nextToken</code>
+     * response element. The remaining results of the initial request can be seen by
+     * sending another <code>ListRepositoryAssociations</code> request with the
+     * returned <code>nextToken</code> value. This value can be between 1 and 25. If
+     * this parameter is not used, <code>ListRepositoryAssociations</code> returns up
+     * to 25 results and a <code>nextToken</code> value if applicable. </p>
      */
     inline void SetMaxResults(int value) { m_maxResultsHasBeenSet = true; m_maxResults = value; }
 
@@ -280,13 +286,12 @@ namespace Model
      * <p>The maximum number of repository association results returned by
      * <code>ListRepositoryAssociations</code> in paginated output. When this parameter
      * is used, <code>ListRepositoryAssociations</code> only returns
-     * <code>maxResults</code> results in a single page along with a
-     * <code>nextToken</code> response element. The remaining results of the initial
-     * request can be seen by sending another <code>ListRepositoryAssociations</code>
-     * request with the returned <code>nextToken</code> value. This value can be
-     * between 1 and 100. If this parameter is not used, then
-     * <code>ListRepositoryAssociations</code> returns up to 100 results and a
-     * <code>nextToken</code> value if applicable. </p>
+     * <code>maxResults</code> results in a single page with a <code>nextToken</code>
+     * response element. The remaining results of the initial request can be seen by
+     * sending another <code>ListRepositoryAssociations</code> request with the
+     * returned <code>nextToken</code> value. This value can be between 1 and 25. If
+     * this parameter is not used, <code>ListRepositoryAssociations</code> returns up
+     * to 25 results and a <code>nextToken</code> value if applicable. </p>
      */
     inline ListRepositoryAssociationsRequest& WithMaxResults(int value) { SetMaxResults(value); return *this;}
 
@@ -296,9 +301,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline const Aws::String& GetNextToken() const{ return m_nextToken; }
 
@@ -307,9 +312,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline bool NextTokenHasBeenSet() const { return m_nextTokenHasBeenSet; }
 
@@ -318,9 +323,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline void SetNextToken(const Aws::String& value) { m_nextTokenHasBeenSet = true; m_nextToken = value; }
 
@@ -329,9 +334,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline void SetNextToken(Aws::String&& value) { m_nextTokenHasBeenSet = true; m_nextToken = std::move(value); }
 
@@ -340,9 +345,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline void SetNextToken(const char* value) { m_nextTokenHasBeenSet = true; m_nextToken.assign(value); }
 
@@ -351,9 +356,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline ListRepositoryAssociationsRequest& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
 
@@ -362,9 +367,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline ListRepositoryAssociationsRequest& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
 
@@ -373,9 +378,9 @@ namespace Model
      * <code>ListRepositoryAssociations</code> request where <code>maxResults</code>
      * was used and the results exceeded the value of that parameter. Pagination
      * continues from the end of the previous results that returned the
-     * <code>nextToken</code> value. </p> <note> <p>This token should be treated as an
-     * opaque identifier that is only used to retrieve the next items in a list and not
-     * for other programmatic purposes.</p> </note>
+     * <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque
+     * identifier that is only used to retrieve the next items in a list and not for
+     * other programmatic purposes.</p> </note>
      */
     inline ListRepositoryAssociationsRequest& WithNextToken(const char* value) { SetNextToken(value); return *this;}
 
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Metrics.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Metrics.h
new file mode 100644
index 00000000000..4055092af7b
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Metrics.h
@@ -0,0 +1,101 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about the statistics from the code review. </p><p><h3>See
+   * Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/Metrics">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API Metrics
+  {
+  public:
+    Metrics();
+    Metrics(Aws::Utils::Json::JsonView jsonValue);
+    Metrics& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline long long GetMeteredLinesOfCodeCount() const{ return m_meteredLinesOfCodeCount; }
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline bool MeteredLinesOfCodeCountHasBeenSet() const { return m_meteredLinesOfCodeCountHasBeenSet; }
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline void SetMeteredLinesOfCodeCount(long long value) { m_meteredLinesOfCodeCountHasBeenSet = true; m_meteredLinesOfCodeCount = value; }
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline Metrics& WithMeteredLinesOfCodeCount(long long value) { SetMeteredLinesOfCodeCount(value); return *this;}
+
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline long long GetFindingsCount() const{ return m_findingsCount; }
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline bool FindingsCountHasBeenSet() const { return m_findingsCountHasBeenSet; }
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline void SetFindingsCount(long long value) { m_findingsCountHasBeenSet = true; m_findingsCount = value; }
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline Metrics& WithFindingsCount(long long value) { SetFindingsCount(value); return *this;}
+
+  private:
+
+    long long m_meteredLinesOfCodeCount;
+    bool m_meteredLinesOfCodeCountHasBeenSet;
+
+    long long m_findingsCount;
+    bool m_findingsCountHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/MetricsSummary.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/MetricsSummary.h
new file mode 100644
index 00000000000..84c1def5b25
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/MetricsSummary.h
@@ -0,0 +1,100 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about metrics summaries. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/MetricsSummary">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API MetricsSummary
+  {
+  public:
+    MetricsSummary();
+    MetricsSummary(Aws::Utils::Json::JsonView jsonValue);
+    MetricsSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline long long GetMeteredLinesOfCodeCount() const{ return m_meteredLinesOfCodeCount; }
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline bool MeteredLinesOfCodeCountHasBeenSet() const { return m_meteredLinesOfCodeCountHasBeenSet; }
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline void SetMeteredLinesOfCodeCount(long long value) { m_meteredLinesOfCodeCountHasBeenSet = true; m_meteredLinesOfCodeCount = value; }
+
+    /**
+     * <p> Lines of code metered in the code review. </p>
+     */
+    inline MetricsSummary& WithMeteredLinesOfCodeCount(long long value) { SetMeteredLinesOfCodeCount(value); return *this;}
+
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline long long GetFindingsCount() const{ return m_findingsCount; }
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline bool FindingsCountHasBeenSet() const { return m_findingsCountHasBeenSet; }
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline void SetFindingsCount(long long value) { m_findingsCountHasBeenSet = true; m_findingsCount = value; }
+
+    /**
+     * <p> Total number of recommendations found in the code review. </p>
+     */
+    inline MetricsSummary& WithFindingsCount(long long value) { SetFindingsCount(value); return *this;}
+
+  private:
+
+    long long m_meteredLinesOfCodeCount;
+    bool m_meteredLinesOfCodeCountHasBeenSet;
+
+    long long m_findingsCount;
+    bool m_findingsCountHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackRequest.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackRequest.h
new file mode 100644
index 00000000000..1c59ee8ea1e
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackRequest.h
@@ -0,0 +1,199 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/codeguru-reviewer/model/Reaction.h>
+#include <utility>
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_CODEGURUREVIEWER_API PutRecommendationFeedbackRequest : public CodeGuruReviewerRequest
+  {
+  public:
+    PutRecommendationFeedbackRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "PutRecommendationFeedback"; }
+
+    Aws::String SerializePayload() const override;
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline const Aws::String& GetRecommendationId() const{ return m_recommendationId; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline bool RecommendationIdHasBeenSet() const { return m_recommendationIdHasBeenSet; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const Aws::String& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = value; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(Aws::String&& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = std::move(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const char* value) { m_recommendationIdHasBeenSet = true; m_recommendationId.assign(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithRecommendationId(const Aws::String& value) { SetRecommendationId(value); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithRecommendationId(Aws::String&& value) { SetRecommendationId(std::move(value)); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided recommendations
+     * and then to collect the feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithRecommendationId(const char* value) { SetRecommendationId(value); return *this;}
+
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline const Aws::Vector<Reaction>& GetReactions() const{ return m_reactions; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline bool ReactionsHasBeenSet() const { return m_reactionsHasBeenSet; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline void SetReactions(const Aws::Vector<Reaction>& value) { m_reactionsHasBeenSet = true; m_reactions = value; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline void SetReactions(Aws::Vector<Reaction>&& value) { m_reactionsHasBeenSet = true; m_reactions = std::move(value); }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithReactions(const Aws::Vector<Reaction>& value) { SetReactions(value); return *this;}
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& WithReactions(Aws::Vector<Reaction>&& value) { SetReactions(std::move(value)); return *this;}
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& AddReactions(const Reaction& value) { m_reactionsHasBeenSet = true; m_reactions.push_back(value); return *this; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. If you
+     * send an empty list it clears all your feedback. </p>
+     */
+    inline PutRecommendationFeedbackRequest& AddReactions(Reaction&& value) { m_reactionsHasBeenSet = true; m_reactions.push_back(std::move(value)); return *this; }
+
+  private:
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+
+    Aws::String m_recommendationId;
+    bool m_recommendationIdHasBeenSet;
+
+    Aws::Vector<Reaction> m_reactions;
+    bool m_reactionsHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackResult.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackResult.h
new file mode 100644
index 00000000000..e5a5a6977f4
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/PutRecommendationFeedbackResult.h
@@ -0,0 +1,46 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  class AWS_CODEGURUREVIEWER_API PutRecommendationFeedbackResult
+  {
+  public:
+    PutRecommendationFeedbackResult();
+    PutRecommendationFeedbackResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    PutRecommendationFeedbackResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Reaction.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Reaction.h
new file mode 100644
index 00000000000..fd2e74ae73d
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Reaction.h
@@ -0,0 +1,41 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  enum class Reaction
+  {
+    NOT_SET,
+    ThumbsUp,
+    ThumbsDown
+  };
+
+namespace ReactionMapper
+{
+AWS_CODEGURUREVIEWER_API Reaction GetReactionForName(const Aws::String& name);
+
+AWS_CODEGURUREVIEWER_API Aws::String GetNameForReaction(Reaction value);
+} // namespace ReactionMapper
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedback.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedback.h
new file mode 100644
index 00000000000..071eeb57a71
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedback.h
@@ -0,0 +1,318 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/DateTime.h>
+#include <aws/codeguru-reviewer/model/Reaction.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about the recommendation feedback. </p><p><h3>See Also:</h3>  
+   * <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/RecommendationFeedback">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API RecommendationFeedback
+  {
+  public:
+    RecommendationFeedback();
+    RecommendationFeedback(Aws::Utils::Json::JsonView jsonValue);
+    RecommendationFeedback& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline const Aws::String& GetCodeReviewArn() const{ return m_codeReviewArn; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline bool CodeReviewArnHasBeenSet() const { return m_codeReviewArnHasBeenSet; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const Aws::String& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = value; }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(Aws::String&& value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn = std::move(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline void SetCodeReviewArn(const char* value) { m_codeReviewArnHasBeenSet = true; m_codeReviewArn.assign(value); }
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline RecommendationFeedback& WithCodeReviewArn(const Aws::String& value) { SetCodeReviewArn(value); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline RecommendationFeedback& WithCodeReviewArn(Aws::String&& value) { SetCodeReviewArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The Amazon Resource Name (ARN) that identifies the code review. </p>
+     */
+    inline RecommendationFeedback& WithCodeReviewArn(const char* value) { SetCodeReviewArn(value); return *this;}
+
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline const Aws::String& GetRecommendationId() const{ return m_recommendationId; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline bool RecommendationIdHasBeenSet() const { return m_recommendationIdHasBeenSet; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const Aws::String& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = value; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(Aws::String&& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = std::move(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const char* value) { m_recommendationIdHasBeenSet = true; m_recommendationId.assign(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationFeedback& WithRecommendationId(const Aws::String& value) { SetRecommendationId(value); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationFeedback& WithRecommendationId(Aws::String&& value) { SetRecommendationId(std::move(value)); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationFeedback& WithRecommendationId(const char* value) { SetRecommendationId(value); return *this;}
+
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline const Aws::Vector<Reaction>& GetReactions() const{ return m_reactions; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline bool ReactionsHasBeenSet() const { return m_reactionsHasBeenSet; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline void SetReactions(const Aws::Vector<Reaction>& value) { m_reactionsHasBeenSet = true; m_reactions = value; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline void SetReactions(Aws::Vector<Reaction>&& value) { m_reactionsHasBeenSet = true; m_reactions = std::move(value); }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline RecommendationFeedback& WithReactions(const Aws::Vector<Reaction>& value) { SetReactions(value); return *this;}
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline RecommendationFeedback& WithReactions(Aws::Vector<Reaction>&& value) { SetReactions(std::move(value)); return *this;}
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline RecommendationFeedback& AddReactions(const Reaction& value) { m_reactionsHasBeenSet = true; m_reactions.push_back(value); return *this; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. You
+     * can send an empty list to clear off all your feedback. </p>
+     */
+    inline RecommendationFeedback& AddReactions(Reaction&& value) { m_reactionsHasBeenSet = true; m_reactions.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline const Aws::String& GetUserId() const{ return m_userId; }
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline bool UserIdHasBeenSet() const { return m_userIdHasBeenSet; }
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline void SetUserId(const Aws::String& value) { m_userIdHasBeenSet = true; m_userId = value; }
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline void SetUserId(Aws::String&& value) { m_userIdHasBeenSet = true; m_userId = std::move(value); }
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline void SetUserId(const char* value) { m_userIdHasBeenSet = true; m_userId.assign(value); }
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline RecommendationFeedback& WithUserId(const Aws::String& value) { SetUserId(value); return *this;}
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline RecommendationFeedback& WithUserId(Aws::String&& value) { SetUserId(std::move(value)); return *this;}
+
+    /**
+     * <p> The user principal that made the API call. </p>
+     */
+    inline RecommendationFeedback& WithUserId(const char* value) { SetUserId(value); return *this;}
+
+
+    /**
+     * <p> The time at which the feedback was created. </p>
+     */
+    inline const Aws::Utils::DateTime& GetCreatedTimeStamp() const{ return m_createdTimeStamp; }
+
+    /**
+     * <p> The time at which the feedback was created. </p>
+     */
+    inline bool CreatedTimeStampHasBeenSet() const { return m_createdTimeStampHasBeenSet; }
+
+    /**
+     * <p> The time at which the feedback was created. </p>
+     */
+    inline void SetCreatedTimeStamp(const Aws::Utils::DateTime& value) { m_createdTimeStampHasBeenSet = true; m_createdTimeStamp = value; }
+
+    /**
+     * <p> The time at which the feedback was created. </p>
+     */
+    inline void SetCreatedTimeStamp(Aws::Utils::DateTime&& value) { m_createdTimeStampHasBeenSet = true; m_createdTimeStamp = std::move(value); }
+
+    /**
+     * <p> The time at which the feedback was created. </p>
+     */
+    inline RecommendationFeedback& WithCreatedTimeStamp(const Aws::Utils::DateTime& value) { SetCreatedTimeStamp(value); return *this;}
+
+    /**
+     * <p> The time at which the feedback was created. </p>
+     */
+    inline RecommendationFeedback& WithCreatedTimeStamp(Aws::Utils::DateTime&& value) { SetCreatedTimeStamp(std::move(value)); return *this;}
+
+
+    /**
+     * <p> The time at which the feedback was last updated. </p>
+     */
+    inline const Aws::Utils::DateTime& GetLastUpdatedTimeStamp() const{ return m_lastUpdatedTimeStamp; }
+
+    /**
+     * <p> The time at which the feedback was last updated. </p>
+     */
+    inline bool LastUpdatedTimeStampHasBeenSet() const { return m_lastUpdatedTimeStampHasBeenSet; }
+
+    /**
+     * <p> The time at which the feedback was last updated. </p>
+     */
+    inline void SetLastUpdatedTimeStamp(const Aws::Utils::DateTime& value) { m_lastUpdatedTimeStampHasBeenSet = true; m_lastUpdatedTimeStamp = value; }
+
+    /**
+     * <p> The time at which the feedback was last updated. </p>
+     */
+    inline void SetLastUpdatedTimeStamp(Aws::Utils::DateTime&& value) { m_lastUpdatedTimeStampHasBeenSet = true; m_lastUpdatedTimeStamp = std::move(value); }
+
+    /**
+     * <p> The time at which the feedback was last updated. </p>
+     */
+    inline RecommendationFeedback& WithLastUpdatedTimeStamp(const Aws::Utils::DateTime& value) { SetLastUpdatedTimeStamp(value); return *this;}
+
+    /**
+     * <p> The time at which the feedback was last updated. </p>
+     */
+    inline RecommendationFeedback& WithLastUpdatedTimeStamp(Aws::Utils::DateTime&& value) { SetLastUpdatedTimeStamp(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_codeReviewArn;
+    bool m_codeReviewArnHasBeenSet;
+
+    Aws::String m_recommendationId;
+    bool m_recommendationIdHasBeenSet;
+
+    Aws::Vector<Reaction> m_reactions;
+    bool m_reactionsHasBeenSet;
+
+    Aws::String m_userId;
+    bool m_userIdHasBeenSet;
+
+    Aws::Utils::DateTime m_createdTimeStamp;
+    bool m_createdTimeStampHasBeenSet;
+
+    Aws::Utils::DateTime m_lastUpdatedTimeStamp;
+    bool m_lastUpdatedTimeStampHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedbackSummary.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedbackSummary.h
new file mode 100644
index 00000000000..536140e96f6
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationFeedbackSummary.h
@@ -0,0 +1,197 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/codeguru-reviewer/model/Reaction.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about recommendation feedback summaries. </p><p><h3>See
+   * Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/RecommendationFeedbackSummary">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API RecommendationFeedbackSummary
+  {
+  public:
+    RecommendationFeedbackSummary();
+    RecommendationFeedbackSummary(Aws::Utils::Json::JsonView jsonValue);
+    RecommendationFeedbackSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline const Aws::String& GetRecommendationId() const{ return m_recommendationId; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline bool RecommendationIdHasBeenSet() const { return m_recommendationIdHasBeenSet; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const Aws::String& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = value; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(Aws::String&& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = std::move(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const char* value) { m_recommendationIdHasBeenSet = true; m_recommendationId.assign(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationFeedbackSummary& WithRecommendationId(const Aws::String& value) { SetRecommendationId(value); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationFeedbackSummary& WithRecommendationId(Aws::String&& value) { SetRecommendationId(std::move(value)); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationFeedbackSummary& WithRecommendationId(const char* value) { SetRecommendationId(value); return *this;}
+
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline const Aws::Vector<Reaction>& GetReactions() const{ return m_reactions; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline bool ReactionsHasBeenSet() const { return m_reactionsHasBeenSet; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline void SetReactions(const Aws::Vector<Reaction>& value) { m_reactionsHasBeenSet = true; m_reactions = value; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline void SetReactions(Aws::Vector<Reaction>&& value) { m_reactionsHasBeenSet = true; m_reactions = std::move(value); }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline RecommendationFeedbackSummary& WithReactions(const Aws::Vector<Reaction>& value) { SetReactions(value); return *this;}
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline RecommendationFeedbackSummary& WithReactions(Aws::Vector<Reaction>&& value) { SetReactions(std::move(value)); return *this;}
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline RecommendationFeedbackSummary& AddReactions(const Reaction& value) { m_reactionsHasBeenSet = true; m_reactions.push_back(value); return *this; }
+
+    /**
+     * <p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>
+     */
+    inline RecommendationFeedbackSummary& AddReactions(Reaction&& value) { m_reactionsHasBeenSet = true; m_reactions.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline const Aws::String& GetUserId() const{ return m_userId; }
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline bool UserIdHasBeenSet() const { return m_userIdHasBeenSet; }
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline void SetUserId(const Aws::String& value) { m_userIdHasBeenSet = true; m_userId = value; }
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline void SetUserId(Aws::String&& value) { m_userIdHasBeenSet = true; m_userId = std::move(value); }
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline void SetUserId(const char* value) { m_userIdHasBeenSet = true; m_userId.assign(value); }
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline RecommendationFeedbackSummary& WithUserId(const Aws::String& value) { SetUserId(value); return *this;}
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline RecommendationFeedbackSummary& WithUserId(Aws::String&& value) { SetUserId(std::move(value)); return *this;}
+
+    /**
+     * <p> The identifier for the user that gave the feedback. </p>
+     */
+    inline RecommendationFeedbackSummary& WithUserId(const char* value) { SetUserId(value); return *this;}
+
+  private:
+
+    Aws::String m_recommendationId;
+    bool m_recommendationIdHasBeenSet;
+
+    Aws::Vector<Reaction> m_reactions;
+    bool m_reactionsHasBeenSet;
+
+    Aws::String m_userId;
+    bool m_userIdHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationSummary.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationSummary.h
new file mode 100644
index 00000000000..1e1be4fa23d
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RecommendationSummary.h
@@ -0,0 +1,262 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about recommendations. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/RecommendationSummary">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API RecommendationSummary
+  {
+  public:
+    RecommendationSummary();
+    RecommendationSummary(Aws::Utils::Json::JsonView jsonValue);
+    RecommendationSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline const Aws::String& GetFilePath() const{ return m_filePath; }
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline bool FilePathHasBeenSet() const { return m_filePathHasBeenSet; }
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline void SetFilePath(const Aws::String& value) { m_filePathHasBeenSet = true; m_filePath = value; }
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline void SetFilePath(Aws::String&& value) { m_filePathHasBeenSet = true; m_filePath = std::move(value); }
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline void SetFilePath(const char* value) { m_filePathHasBeenSet = true; m_filePath.assign(value); }
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline RecommendationSummary& WithFilePath(const Aws::String& value) { SetFilePath(value); return *this;}
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline RecommendationSummary& WithFilePath(Aws::String&& value) { SetFilePath(std::move(value)); return *this;}
+
+    /**
+     * <p>Name of the file on which a recommendation is provided.</p>
+     */
+    inline RecommendationSummary& WithFilePath(const char* value) { SetFilePath(value); return *this;}
+
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline const Aws::String& GetRecommendationId() const{ return m_recommendationId; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline bool RecommendationIdHasBeenSet() const { return m_recommendationIdHasBeenSet; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const Aws::String& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = value; }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(Aws::String&& value) { m_recommendationIdHasBeenSet = true; m_recommendationId = std::move(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline void SetRecommendationId(const char* value) { m_recommendationIdHasBeenSet = true; m_recommendationId.assign(value); }
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationSummary& WithRecommendationId(const Aws::String& value) { SetRecommendationId(value); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationSummary& WithRecommendationId(Aws::String&& value) { SetRecommendationId(std::move(value)); return *this;}
+
+    /**
+     * <p> The recommendation ID that can be used to track the provided
+     * recommendations. Later on it can be used to collect the feedback. </p>
+     */
+    inline RecommendationSummary& WithRecommendationId(const char* value) { SetRecommendationId(value); return *this;}
+
+
+    /**
+     * <p> Start line from where the recommendation is applicable in the source commit
+     * or source branch. </p>
+     */
+    inline int GetStartLine() const{ return m_startLine; }
+
+    /**
+     * <p> Start line from where the recommendation is applicable in the source commit
+     * or source branch. </p>
+     */
+    inline bool StartLineHasBeenSet() const { return m_startLineHasBeenSet; }
+
+    /**
+     * <p> Start line from where the recommendation is applicable in the source commit
+     * or source branch. </p>
+     */
+    inline void SetStartLine(int value) { m_startLineHasBeenSet = true; m_startLine = value; }
+
+    /**
+     * <p> Start line from where the recommendation is applicable in the source commit
+     * or source branch. </p>
+     */
+    inline RecommendationSummary& WithStartLine(int value) { SetStartLine(value); return *this;}
+
+
+    /**
+     * <p> Last line where the recommendation is applicable in the source commit or
+     * source branch. For a single line comment the start line and end line values will
+     * be the same. </p>
+     */
+    inline int GetEndLine() const{ return m_endLine; }
+
+    /**
+     * <p> Last line where the recommendation is applicable in the source commit or
+     * source branch. For a single line comment the start line and end line values will
+     * be the same. </p>
+     */
+    inline bool EndLineHasBeenSet() const { return m_endLineHasBeenSet; }
+
+    /**
+     * <p> Last line where the recommendation is applicable in the source commit or
+     * source branch. For a single line comment the start line and end line values will
+     * be the same. </p>
+     */
+    inline void SetEndLine(int value) { m_endLineHasBeenSet = true; m_endLine = value; }
+
+    /**
+     * <p> Last line where the recommendation is applicable in the source commit or
+     * source branch. For a single line comment the start line and end line values will
+     * be the same. </p>
+     */
+    inline RecommendationSummary& WithEndLine(int value) { SetEndLine(value); return *this;}
+
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline const Aws::String& GetDescription() const{ return m_description; }
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline bool DescriptionHasBeenSet() const { return m_descriptionHasBeenSet; }
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline void SetDescription(const Aws::String& value) { m_descriptionHasBeenSet = true; m_description = value; }
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline void SetDescription(Aws::String&& value) { m_descriptionHasBeenSet = true; m_description = std::move(value); }
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline void SetDescription(const char* value) { m_descriptionHasBeenSet = true; m_description.assign(value); }
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline RecommendationSummary& WithDescription(const Aws::String& value) { SetDescription(value); return *this;}
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline RecommendationSummary& WithDescription(Aws::String&& value) { SetDescription(std::move(value)); return *this;}
+
+    /**
+     * <p> A description of the recommendation generated by CodeGuru Reviewer for the
+     * lines of code between the start line and the end line. </p>
+     */
+    inline RecommendationSummary& WithDescription(const char* value) { SetDescription(value); return *this;}
+
+  private:
+
+    Aws::String m_filePath;
+    bool m_filePathHasBeenSet;
+
+    Aws::String m_recommendationId;
+    bool m_recommendationIdHasBeenSet;
+
+    int m_startLine;
+    bool m_startLineHasBeenSet;
+
+    int m_endLine;
+    bool m_endLineHasBeenSet;
+
+    Aws::String m_description;
+    bool m_descriptionHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociation.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociation.h
index 2df8a2b061f..b51b3c4abb0 100644
--- a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociation.h
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociation.h
@@ -51,42 +51,42 @@ namespace Model
 
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline const Aws::String& GetAssociationId() const{ return m_associationId; }
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline bool AssociationIdHasBeenSet() const { return m_associationIdHasBeenSet; }
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline void SetAssociationId(const Aws::String& value) { m_associationIdHasBeenSet = true; m_associationId = value; }
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline void SetAssociationId(Aws::String&& value) { m_associationIdHasBeenSet = true; m_associationId = std::move(value); }
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline void SetAssociationId(const char* value) { m_associationIdHasBeenSet = true; m_associationId.assign(value); }
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline RepositoryAssociation& WithAssociationId(const Aws::String& value) { SetAssociationId(value); return *this;}
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline RepositoryAssociation& WithAssociationId(Aws::String&& value) { SetAssociationId(std::move(value)); return *this;}
 
     /**
-     * <p>The id of the repository association.</p>
+     * <p>The ID of the repository association.</p>
      */
     inline RepositoryAssociation& WithAssociationId(const char* value) { SetAssociationId(value); return *this;}
 
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociationSummary.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociationSummary.h
index bb1e2e97c03..2ec1baaa769 100644
--- a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociationSummary.h
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/RepositoryAssociationSummary.h
@@ -286,8 +286,7 @@ namespace Model
      * <p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd>
      * <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd>
      * <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd>
-     * <dt>Failed</dt> <dd> <p>The association failed. For more information about
-     * troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd>
+     * <dt>Failed</dt> <dd> <p>The association failed. </p> </dd>
      * <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of
      * disassociating with the repository. </p> </dd> </dl>
      */
@@ -297,8 +296,7 @@ namespace Model
      * <p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd>
      * <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd>
      * <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd>
-     * <dt>Failed</dt> <dd> <p>The association failed. For more information about
-     * troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd>
+     * <dt>Failed</dt> <dd> <p>The association failed. </p> </dd>
      * <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of
      * disassociating with the repository. </p> </dd> </dl>
      */
@@ -308,8 +306,7 @@ namespace Model
      * <p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd>
      * <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd>
      * <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd>
-     * <dt>Failed</dt> <dd> <p>The association failed. For more information about
-     * troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd>
+     * <dt>Failed</dt> <dd> <p>The association failed. </p> </dd>
      * <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of
      * disassociating with the repository. </p> </dd> </dl>
      */
@@ -319,8 +316,7 @@ namespace Model
      * <p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd>
      * <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd>
      * <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd>
-     * <dt>Failed</dt> <dd> <p>The association failed. For more information about
-     * troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd>
+     * <dt>Failed</dt> <dd> <p>The association failed. </p> </dd>
      * <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of
      * disassociating with the repository. </p> </dd> </dl>
      */
@@ -330,8 +326,7 @@ namespace Model
      * <p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd>
      * <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd>
      * <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd>
-     * <dt>Failed</dt> <dd> <p>The association failed. For more information about
-     * troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd>
+     * <dt>Failed</dt> <dd> <p>The association failed. </p> </dd>
      * <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of
      * disassociating with the repository. </p> </dd> </dl>
      */
@@ -341,8 +336,7 @@ namespace Model
      * <p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd>
      * <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd>
      * <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd>
-     * <dt>Failed</dt> <dd> <p>The association failed. For more information about
-     * troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd>
+     * <dt>Failed</dt> <dd> <p>The association failed. </p> </dd>
      * <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of
      * disassociating with the repository. </p> </dd> </dl>
      */
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/SourceCodeType.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/SourceCodeType.h
new file mode 100644
index 00000000000..fe1556ec5af
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/SourceCodeType.h
@@ -0,0 +1,88 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/model/CommitDiffSourceCodeType.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+  /**
+   * <p> Information about the source code type. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/codeguru-reviewer-2019-09-19/SourceCodeType">AWS
+   * API Reference</a></p>
+   */
+  class AWS_CODEGURUREVIEWER_API SourceCodeType
+  {
+  public:
+    SourceCodeType();
+    SourceCodeType(Aws::Utils::Json::JsonView jsonValue);
+    SourceCodeType& operator=(Aws::Utils::Json::JsonView jsonValue);
+    Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p> The commit diff for the pull request. </p>
+     */
+    inline const CommitDiffSourceCodeType& GetCommitDiff() const{ return m_commitDiff; }
+
+    /**
+     * <p> The commit diff for the pull request. </p>
+     */
+    inline bool CommitDiffHasBeenSet() const { return m_commitDiffHasBeenSet; }
+
+    /**
+     * <p> The commit diff for the pull request. </p>
+     */
+    inline void SetCommitDiff(const CommitDiffSourceCodeType& value) { m_commitDiffHasBeenSet = true; m_commitDiff = value; }
+
+    /**
+     * <p> The commit diff for the pull request. </p>
+     */
+    inline void SetCommitDiff(CommitDiffSourceCodeType&& value) { m_commitDiffHasBeenSet = true; m_commitDiff = std::move(value); }
+
+    /**
+     * <p> The commit diff for the pull request. </p>
+     */
+    inline SourceCodeType& WithCommitDiff(const CommitDiffSourceCodeType& value) { SetCommitDiff(value); return *this;}
+
+    /**
+     * <p> The commit diff for the pull request. </p>
+     */
+    inline SourceCodeType& WithCommitDiff(CommitDiffSourceCodeType&& value) { SetCommitDiff(std::move(value)); return *this;}
+
+  private:
+
+    CommitDiffSourceCodeType m_commitDiff;
+    bool m_commitDiffHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Type.h b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Type.h
new file mode 100644
index 00000000000..fafd1b2f4c2
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/include/aws/codeguru-reviewer/model/Type.h
@@ -0,0 +1,40 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+  enum class Type
+  {
+    NOT_SET,
+    PullRequest
+  };
+
+namespace TypeMapper
+{
+AWS_CODEGURUREVIEWER_API Type GetTypeForName(const Aws::String& name);
+
+AWS_CODEGURUREVIEWER_API Aws::String GetNameForType(Type value);
+} // namespace TypeMapper
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/CodeGuruReviewerClient.cpp b/aws-cpp-sdk-codeguru-reviewer/source/CodeGuruReviewerClient.cpp
index 7531da3d99b..3d5a92cf2e6 100644
--- a/aws-cpp-sdk-codeguru-reviewer/source/CodeGuruReviewerClient.cpp
+++ b/aws-cpp-sdk-codeguru-reviewer/source/CodeGuruReviewerClient.cpp
@@ -31,9 +31,15 @@
 #include <aws/codeguru-reviewer/CodeGuruReviewerEndpoint.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewerErrorMarshaller.h>
 #include <aws/codeguru-reviewer/model/AssociateRepositoryRequest.h>
+#include <aws/codeguru-reviewer/model/DescribeCodeReviewRequest.h>
+#include <aws/codeguru-reviewer/model/DescribeRecommendationFeedbackRequest.h>
 #include <aws/codeguru-reviewer/model/DescribeRepositoryAssociationRequest.h>
 #include <aws/codeguru-reviewer/model/DisassociateRepositoryRequest.h>
+#include <aws/codeguru-reviewer/model/ListCodeReviewsRequest.h>
+#include <aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h>
+#include <aws/codeguru-reviewer/model/ListRecommendationsRequest.h>
 #include <aws/codeguru-reviewer/model/ListRepositoryAssociationsRequest.h>
+#include <aws/codeguru-reviewer/model/PutRecommendationFeedbackRequest.h>
 
 using namespace Aws;
 using namespace Aws::Auth;
@@ -142,6 +148,93 @@ void CodeGuruReviewerClient::AssociateRepositoryAsyncHelper(const AssociateRepos
   handler(this, request, AssociateRepository(request), context);
 }
 
+DescribeCodeReviewOutcome CodeGuruReviewerClient::DescribeCodeReview(const DescribeCodeReviewRequest& request) const
+{
+  if (!request.CodeReviewArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DescribeCodeReview", "Required field: CodeReviewArn, is not set");
+    return DescribeCodeReviewOutcome(Aws::Client::AWSError<CodeGuruReviewerErrors>(CodeGuruReviewerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [CodeReviewArn]", false));
+  }
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/codereviews/";
+  ss << request.GetCodeReviewArn();
+  uri.SetPath(uri.GetPath() + ss.str());
+  JsonOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER);
+  if(outcome.IsSuccess())
+  {
+    return DescribeCodeReviewOutcome(DescribeCodeReviewResult(outcome.GetResult()));
+  }
+  else
+  {
+    return DescribeCodeReviewOutcome(outcome.GetError());
+  }
+}
+
+DescribeCodeReviewOutcomeCallable CodeGuruReviewerClient::DescribeCodeReviewCallable(const DescribeCodeReviewRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< DescribeCodeReviewOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->DescribeCodeReview(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void CodeGuruReviewerClient::DescribeCodeReviewAsync(const DescribeCodeReviewRequest& request, const DescribeCodeReviewResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->DescribeCodeReviewAsyncHelper( request, handler, context ); } );
+}
+
+void CodeGuruReviewerClient::DescribeCodeReviewAsyncHelper(const DescribeCodeReviewRequest& request, const DescribeCodeReviewResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, DescribeCodeReview(request), context);
+}
+
+DescribeRecommendationFeedbackOutcome CodeGuruReviewerClient::DescribeRecommendationFeedback(const DescribeRecommendationFeedbackRequest& request) const
+{
+  if (!request.CodeReviewArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DescribeRecommendationFeedback", "Required field: CodeReviewArn, is not set");
+    return DescribeRecommendationFeedbackOutcome(Aws::Client::AWSError<CodeGuruReviewerErrors>(CodeGuruReviewerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [CodeReviewArn]", false));
+  }
+  if (!request.RecommendationIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DescribeRecommendationFeedback", "Required field: RecommendationId, is not set");
+    return DescribeRecommendationFeedbackOutcome(Aws::Client::AWSError<CodeGuruReviewerErrors>(CodeGuruReviewerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [RecommendationId]", false));
+  }
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/feedback/";
+  ss << request.GetCodeReviewArn();
+  uri.SetPath(uri.GetPath() + ss.str());
+  JsonOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER);
+  if(outcome.IsSuccess())
+  {
+    return DescribeRecommendationFeedbackOutcome(DescribeRecommendationFeedbackResult(outcome.GetResult()));
+  }
+  else
+  {
+    return DescribeRecommendationFeedbackOutcome(outcome.GetError());
+  }
+}
+
+DescribeRecommendationFeedbackOutcomeCallable CodeGuruReviewerClient::DescribeRecommendationFeedbackCallable(const DescribeRecommendationFeedbackRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< DescribeRecommendationFeedbackOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->DescribeRecommendationFeedback(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void CodeGuruReviewerClient::DescribeRecommendationFeedbackAsync(const DescribeRecommendationFeedbackRequest& request, const DescribeRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->DescribeRecommendationFeedbackAsyncHelper( request, handler, context ); } );
+}
+
+void CodeGuruReviewerClient::DescribeRecommendationFeedbackAsyncHelper(const DescribeRecommendationFeedbackRequest& request, const DescribeRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, DescribeRecommendationFeedback(request), context);
+}
+
 DescribeRepositoryAssociationOutcome CodeGuruReviewerClient::DescribeRepositoryAssociation(const DescribeRepositoryAssociationRequest& request) const
 {
   if (!request.AssociationArnHasBeenSet())
@@ -224,6 +317,130 @@ void CodeGuruReviewerClient::DisassociateRepositoryAsyncHelper(const Disassociat
   handler(this, request, DisassociateRepository(request), context);
 }
 
+ListCodeReviewsOutcome CodeGuruReviewerClient::ListCodeReviews(const ListCodeReviewsRequest& request) const
+{
+  if (!request.TypeHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ListCodeReviews", "Required field: Type, is not set");
+    return ListCodeReviewsOutcome(Aws::Client::AWSError<CodeGuruReviewerErrors>(CodeGuruReviewerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Type]", false));
+  }
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/codereviews";
+  uri.SetPath(uri.GetPath() + ss.str());
+  JsonOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER);
+  if(outcome.IsSuccess())
+  {
+    return ListCodeReviewsOutcome(ListCodeReviewsResult(outcome.GetResult()));
+  }
+  else
+  {
+    return ListCodeReviewsOutcome(outcome.GetError());
+  }
+}
+
+ListCodeReviewsOutcomeCallable CodeGuruReviewerClient::ListCodeReviewsCallable(const ListCodeReviewsRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< ListCodeReviewsOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->ListCodeReviews(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void CodeGuruReviewerClient::ListCodeReviewsAsync(const ListCodeReviewsRequest& request, const ListCodeReviewsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->ListCodeReviewsAsyncHelper( request, handler, context ); } );
+}
+
+void CodeGuruReviewerClient::ListCodeReviewsAsyncHelper(const ListCodeReviewsRequest& request, const ListCodeReviewsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, ListCodeReviews(request), context);
+}
+
+ListRecommendationFeedbackOutcome CodeGuruReviewerClient::ListRecommendationFeedback(const ListRecommendationFeedbackRequest& request) const
+{
+  if (!request.CodeReviewArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ListRecommendationFeedback", "Required field: CodeReviewArn, is not set");
+    return ListRecommendationFeedbackOutcome(Aws::Client::AWSError<CodeGuruReviewerErrors>(CodeGuruReviewerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [CodeReviewArn]", false));
+  }
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/feedback/";
+  ss << request.GetCodeReviewArn();
+  ss << "/RecommendationFeedback";
+  uri.SetPath(uri.GetPath() + ss.str());
+  JsonOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER);
+  if(outcome.IsSuccess())
+  {
+    return ListRecommendationFeedbackOutcome(ListRecommendationFeedbackResult(outcome.GetResult()));
+  }
+  else
+  {
+    return ListRecommendationFeedbackOutcome(outcome.GetError());
+  }
+}
+
+ListRecommendationFeedbackOutcomeCallable CodeGuruReviewerClient::ListRecommendationFeedbackCallable(const ListRecommendationFeedbackRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< ListRecommendationFeedbackOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->ListRecommendationFeedback(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void CodeGuruReviewerClient::ListRecommendationFeedbackAsync(const ListRecommendationFeedbackRequest& request, const ListRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->ListRecommendationFeedbackAsyncHelper( request, handler, context ); } );
+}
+
+void CodeGuruReviewerClient::ListRecommendationFeedbackAsyncHelper(const ListRecommendationFeedbackRequest& request, const ListRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, ListRecommendationFeedback(request), context);
+}
+
+ListRecommendationsOutcome CodeGuruReviewerClient::ListRecommendations(const ListRecommendationsRequest& request) const
+{
+  if (!request.CodeReviewArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ListRecommendations", "Required field: CodeReviewArn, is not set");
+    return ListRecommendationsOutcome(Aws::Client::AWSError<CodeGuruReviewerErrors>(CodeGuruReviewerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [CodeReviewArn]", false));
+  }
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/codereviews/";
+  ss << request.GetCodeReviewArn();
+  ss << "/Recommendations";
+  uri.SetPath(uri.GetPath() + ss.str());
+  JsonOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER);
+  if(outcome.IsSuccess())
+  {
+    return ListRecommendationsOutcome(ListRecommendationsResult(outcome.GetResult()));
+  }
+  else
+  {
+    return ListRecommendationsOutcome(outcome.GetError());
+  }
+}
+
+ListRecommendationsOutcomeCallable CodeGuruReviewerClient::ListRecommendationsCallable(const ListRecommendationsRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< ListRecommendationsOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->ListRecommendations(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void CodeGuruReviewerClient::ListRecommendationsAsync(const ListRecommendationsRequest& request, const ListRecommendationsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->ListRecommendationsAsyncHelper( request, handler, context ); } );
+}
+
+void CodeGuruReviewerClient::ListRecommendationsAsyncHelper(const ListRecommendationsRequest& request, const ListRecommendationsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, ListRecommendations(request), context);
+}
+
 ListRepositoryAssociationsOutcome CodeGuruReviewerClient::ListRepositoryAssociations(const ListRepositoryAssociationsRequest& request) const
 {
   Aws::Http::URI uri = m_uri;
@@ -259,3 +476,38 @@ void CodeGuruReviewerClient::ListRepositoryAssociationsAsyncHelper(const ListRep
   handler(this, request, ListRepositoryAssociations(request), context);
 }
 
+PutRecommendationFeedbackOutcome CodeGuruReviewerClient::PutRecommendationFeedback(const PutRecommendationFeedbackRequest& request) const
+{
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/feedback";
+  uri.SetPath(uri.GetPath() + ss.str());
+  JsonOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER);
+  if(outcome.IsSuccess())
+  {
+    return PutRecommendationFeedbackOutcome(PutRecommendationFeedbackResult(outcome.GetResult()));
+  }
+  else
+  {
+    return PutRecommendationFeedbackOutcome(outcome.GetError());
+  }
+}
+
+PutRecommendationFeedbackOutcomeCallable CodeGuruReviewerClient::PutRecommendationFeedbackCallable(const PutRecommendationFeedbackRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< PutRecommendationFeedbackOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->PutRecommendationFeedback(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void CodeGuruReviewerClient::PutRecommendationFeedbackAsync(const PutRecommendationFeedbackRequest& request, const PutRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->PutRecommendationFeedbackAsyncHelper( request, handler, context ); } );
+}
+
+void CodeGuruReviewerClient::PutRecommendationFeedbackAsyncHelper(const PutRecommendationFeedbackRequest& request, const PutRecommendationFeedbackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, PutRecommendationFeedback(request), context);
+}
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/CodeReview.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/CodeReview.cpp
new file mode 100644
index 00000000000..644d41aa5a6
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/CodeReview.cpp
@@ -0,0 +1,250 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/CodeReview.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+CodeReview::CodeReview() : 
+    m_nameHasBeenSet(false),
+    m_codeReviewArnHasBeenSet(false),
+    m_repositoryNameHasBeenSet(false),
+    m_ownerHasBeenSet(false),
+    m_providerType(ProviderType::NOT_SET),
+    m_providerTypeHasBeenSet(false),
+    m_state(JobState::NOT_SET),
+    m_stateHasBeenSet(false),
+    m_stateReasonHasBeenSet(false),
+    m_createdTimeStampHasBeenSet(false),
+    m_lastUpdatedTimeStampHasBeenSet(false),
+    m_type(Type::NOT_SET),
+    m_typeHasBeenSet(false),
+    m_pullRequestIdHasBeenSet(false),
+    m_sourceCodeTypeHasBeenSet(false),
+    m_metricsHasBeenSet(false)
+{
+}
+
+CodeReview::CodeReview(JsonView jsonValue) : 
+    m_nameHasBeenSet(false),
+    m_codeReviewArnHasBeenSet(false),
+    m_repositoryNameHasBeenSet(false),
+    m_ownerHasBeenSet(false),
+    m_providerType(ProviderType::NOT_SET),
+    m_providerTypeHasBeenSet(false),
+    m_state(JobState::NOT_SET),
+    m_stateHasBeenSet(false),
+    m_stateReasonHasBeenSet(false),
+    m_createdTimeStampHasBeenSet(false),
+    m_lastUpdatedTimeStampHasBeenSet(false),
+    m_type(Type::NOT_SET),
+    m_typeHasBeenSet(false),
+    m_pullRequestIdHasBeenSet(false),
+    m_sourceCodeTypeHasBeenSet(false),
+    m_metricsHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+CodeReview& CodeReview::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Name"))
+  {
+    m_name = jsonValue.GetString("Name");
+
+    m_nameHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("CodeReviewArn"))
+  {
+    m_codeReviewArn = jsonValue.GetString("CodeReviewArn");
+
+    m_codeReviewArnHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("RepositoryName"))
+  {
+    m_repositoryName = jsonValue.GetString("RepositoryName");
+
+    m_repositoryNameHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Owner"))
+  {
+    m_owner = jsonValue.GetString("Owner");
+
+    m_ownerHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("ProviderType"))
+  {
+    m_providerType = ProviderTypeMapper::GetProviderTypeForName(jsonValue.GetString("ProviderType"));
+
+    m_providerTypeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("State"))
+  {
+    m_state = JobStateMapper::GetJobStateForName(jsonValue.GetString("State"));
+
+    m_stateHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("StateReason"))
+  {
+    m_stateReason = jsonValue.GetString("StateReason");
+
+    m_stateReasonHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("CreatedTimeStamp"))
+  {
+    m_createdTimeStamp = jsonValue.GetDouble("CreatedTimeStamp");
+
+    m_createdTimeStampHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastUpdatedTimeStamp"))
+  {
+    m_lastUpdatedTimeStamp = jsonValue.GetDouble("LastUpdatedTimeStamp");
+
+    m_lastUpdatedTimeStampHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Type"))
+  {
+    m_type = TypeMapper::GetTypeForName(jsonValue.GetString("Type"));
+
+    m_typeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("PullRequestId"))
+  {
+    m_pullRequestId = jsonValue.GetString("PullRequestId");
+
+    m_pullRequestIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("SourceCodeType"))
+  {
+    m_sourceCodeType = jsonValue.GetObject("SourceCodeType");
+
+    m_sourceCodeTypeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Metrics"))
+  {
+    m_metrics = jsonValue.GetObject("Metrics");
+
+    m_metricsHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue CodeReview::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_nameHasBeenSet)
+  {
+   payload.WithString("Name", m_name);
+
+  }
+
+  if(m_codeReviewArnHasBeenSet)
+  {
+   payload.WithString("CodeReviewArn", m_codeReviewArn);
+
+  }
+
+  if(m_repositoryNameHasBeenSet)
+  {
+   payload.WithString("RepositoryName", m_repositoryName);
+
+  }
+
+  if(m_ownerHasBeenSet)
+  {
+   payload.WithString("Owner", m_owner);
+
+  }
+
+  if(m_providerTypeHasBeenSet)
+  {
+   payload.WithString("ProviderType", ProviderTypeMapper::GetNameForProviderType(m_providerType));
+  }
+
+  if(m_stateHasBeenSet)
+  {
+   payload.WithString("State", JobStateMapper::GetNameForJobState(m_state));
+  }
+
+  if(m_stateReasonHasBeenSet)
+  {
+   payload.WithString("StateReason", m_stateReason);
+
+  }
+
+  if(m_createdTimeStampHasBeenSet)
+  {
+   payload.WithDouble("CreatedTimeStamp", m_createdTimeStamp.SecondsWithMSPrecision());
+  }
+
+  if(m_lastUpdatedTimeStampHasBeenSet)
+  {
+   payload.WithDouble("LastUpdatedTimeStamp", m_lastUpdatedTimeStamp.SecondsWithMSPrecision());
+  }
+
+  if(m_typeHasBeenSet)
+  {
+   payload.WithString("Type", TypeMapper::GetNameForType(m_type));
+  }
+
+  if(m_pullRequestIdHasBeenSet)
+  {
+   payload.WithString("PullRequestId", m_pullRequestId);
+
+  }
+
+  if(m_sourceCodeTypeHasBeenSet)
+  {
+   payload.WithObject("SourceCodeType", m_sourceCodeType.Jsonize());
+
+  }
+
+  if(m_metricsHasBeenSet)
+  {
+   payload.WithObject("Metrics", m_metrics.Jsonize());
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/CodeReviewSummary.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/CodeReviewSummary.cpp
new file mode 100644
index 00000000000..bb3f54f7c6a
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/CodeReviewSummary.cpp
@@ -0,0 +1,220 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/CodeReviewSummary.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+CodeReviewSummary::CodeReviewSummary() : 
+    m_nameHasBeenSet(false),
+    m_codeReviewArnHasBeenSet(false),
+    m_repositoryNameHasBeenSet(false),
+    m_ownerHasBeenSet(false),
+    m_providerType(ProviderType::NOT_SET),
+    m_providerTypeHasBeenSet(false),
+    m_state(JobState::NOT_SET),
+    m_stateHasBeenSet(false),
+    m_createdTimeStampHasBeenSet(false),
+    m_lastUpdatedTimeStampHasBeenSet(false),
+    m_type(Type::NOT_SET),
+    m_typeHasBeenSet(false),
+    m_pullRequestIdHasBeenSet(false),
+    m_metricsSummaryHasBeenSet(false)
+{
+}
+
+CodeReviewSummary::CodeReviewSummary(JsonView jsonValue) : 
+    m_nameHasBeenSet(false),
+    m_codeReviewArnHasBeenSet(false),
+    m_repositoryNameHasBeenSet(false),
+    m_ownerHasBeenSet(false),
+    m_providerType(ProviderType::NOT_SET),
+    m_providerTypeHasBeenSet(false),
+    m_state(JobState::NOT_SET),
+    m_stateHasBeenSet(false),
+    m_createdTimeStampHasBeenSet(false),
+    m_lastUpdatedTimeStampHasBeenSet(false),
+    m_type(Type::NOT_SET),
+    m_typeHasBeenSet(false),
+    m_pullRequestIdHasBeenSet(false),
+    m_metricsSummaryHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+CodeReviewSummary& CodeReviewSummary::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Name"))
+  {
+    m_name = jsonValue.GetString("Name");
+
+    m_nameHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("CodeReviewArn"))
+  {
+    m_codeReviewArn = jsonValue.GetString("CodeReviewArn");
+
+    m_codeReviewArnHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("RepositoryName"))
+  {
+    m_repositoryName = jsonValue.GetString("RepositoryName");
+
+    m_repositoryNameHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Owner"))
+  {
+    m_owner = jsonValue.GetString("Owner");
+
+    m_ownerHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("ProviderType"))
+  {
+    m_providerType = ProviderTypeMapper::GetProviderTypeForName(jsonValue.GetString("ProviderType"));
+
+    m_providerTypeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("State"))
+  {
+    m_state = JobStateMapper::GetJobStateForName(jsonValue.GetString("State"));
+
+    m_stateHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("CreatedTimeStamp"))
+  {
+    m_createdTimeStamp = jsonValue.GetDouble("CreatedTimeStamp");
+
+    m_createdTimeStampHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastUpdatedTimeStamp"))
+  {
+    m_lastUpdatedTimeStamp = jsonValue.GetDouble("LastUpdatedTimeStamp");
+
+    m_lastUpdatedTimeStampHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Type"))
+  {
+    m_type = TypeMapper::GetTypeForName(jsonValue.GetString("Type"));
+
+    m_typeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("PullRequestId"))
+  {
+    m_pullRequestId = jsonValue.GetString("PullRequestId");
+
+    m_pullRequestIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("MetricsSummary"))
+  {
+    m_metricsSummary = jsonValue.GetObject("MetricsSummary");
+
+    m_metricsSummaryHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue CodeReviewSummary::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_nameHasBeenSet)
+  {
+   payload.WithString("Name", m_name);
+
+  }
+
+  if(m_codeReviewArnHasBeenSet)
+  {
+   payload.WithString("CodeReviewArn", m_codeReviewArn);
+
+  }
+
+  if(m_repositoryNameHasBeenSet)
+  {
+   payload.WithString("RepositoryName", m_repositoryName);
+
+  }
+
+  if(m_ownerHasBeenSet)
+  {
+   payload.WithString("Owner", m_owner);
+
+  }
+
+  if(m_providerTypeHasBeenSet)
+  {
+   payload.WithString("ProviderType", ProviderTypeMapper::GetNameForProviderType(m_providerType));
+  }
+
+  if(m_stateHasBeenSet)
+  {
+   payload.WithString("State", JobStateMapper::GetNameForJobState(m_state));
+  }
+
+  if(m_createdTimeStampHasBeenSet)
+  {
+   payload.WithDouble("CreatedTimeStamp", m_createdTimeStamp.SecondsWithMSPrecision());
+  }
+
+  if(m_lastUpdatedTimeStampHasBeenSet)
+  {
+   payload.WithDouble("LastUpdatedTimeStamp", m_lastUpdatedTimeStamp.SecondsWithMSPrecision());
+  }
+
+  if(m_typeHasBeenSet)
+  {
+   payload.WithString("Type", TypeMapper::GetNameForType(m_type));
+  }
+
+  if(m_pullRequestIdHasBeenSet)
+  {
+   payload.WithString("PullRequestId", m_pullRequestId);
+
+  }
+
+  if(m_metricsSummaryHasBeenSet)
+  {
+   payload.WithObject("MetricsSummary", m_metricsSummary.Jsonize());
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/CommitDiffSourceCodeType.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/CommitDiffSourceCodeType.cpp
new file mode 100644
index 00000000000..27d52f926df
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/CommitDiffSourceCodeType.cpp
@@ -0,0 +1,84 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/CommitDiffSourceCodeType.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+CommitDiffSourceCodeType::CommitDiffSourceCodeType() : 
+    m_sourceCommitHasBeenSet(false),
+    m_destinationCommitHasBeenSet(false)
+{
+}
+
+CommitDiffSourceCodeType::CommitDiffSourceCodeType(JsonView jsonValue) : 
+    m_sourceCommitHasBeenSet(false),
+    m_destinationCommitHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+CommitDiffSourceCodeType& CommitDiffSourceCodeType::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("SourceCommit"))
+  {
+    m_sourceCommit = jsonValue.GetString("SourceCommit");
+
+    m_sourceCommitHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("DestinationCommit"))
+  {
+    m_destinationCommit = jsonValue.GetString("DestinationCommit");
+
+    m_destinationCommitHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue CommitDiffSourceCodeType::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_sourceCommitHasBeenSet)
+  {
+   payload.WithString("SourceCommit", m_sourceCommit);
+
+  }
+
+  if(m_destinationCommitHasBeenSet)
+  {
+   payload.WithString("DestinationCommit", m_destinationCommit);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewRequest.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewRequest.cpp
new file mode 100644
index 00000000000..72d6c104166
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewRequest.cpp
@@ -0,0 +1,37 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/DescribeCodeReviewRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+DescribeCodeReviewRequest::DescribeCodeReviewRequest() : 
+    m_codeReviewArnHasBeenSet(false)
+{
+}
+
+Aws::String DescribeCodeReviewRequest::SerializePayload() const
+{
+  return {};
+}
+
+
+
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewResult.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewResult.cpp
new file mode 100644
index 00000000000..eae6f6fa499
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeCodeReviewResult.cpp
@@ -0,0 +1,50 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/DescribeCodeReviewResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+DescribeCodeReviewResult::DescribeCodeReviewResult()
+{
+}
+
+DescribeCodeReviewResult::DescribeCodeReviewResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+DescribeCodeReviewResult& DescribeCodeReviewResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("CodeReview"))
+  {
+    m_codeReview = jsonValue.GetObject("CodeReview");
+
+  }
+
+
+
+  return *this;
+}
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackRequest.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackRequest.cpp
new file mode 100644
index 00000000000..7edc48bc9de
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackRequest.cpp
@@ -0,0 +1,60 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/DescribeRecommendationFeedbackRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/http/URI.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws::Http;
+
+DescribeRecommendationFeedbackRequest::DescribeRecommendationFeedbackRequest() : 
+    m_codeReviewArnHasBeenSet(false),
+    m_recommendationIdHasBeenSet(false),
+    m_userIdHasBeenSet(false)
+{
+}
+
+Aws::String DescribeRecommendationFeedbackRequest::SerializePayload() const
+{
+  return {};
+}
+
+void DescribeRecommendationFeedbackRequest::AddQueryStringParameters(URI& uri) const
+{
+    Aws::StringStream ss;
+    if(m_recommendationIdHasBeenSet)
+    {
+      ss << m_recommendationId;
+      uri.AddQueryStringParameter("RecommendationId", ss.str());
+      ss.str("");
+    }
+
+    if(m_userIdHasBeenSet)
+    {
+      ss << m_userId;
+      uri.AddQueryStringParameter("UserId", ss.str());
+      ss.str("");
+    }
+
+}
+
+
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackResult.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackResult.cpp
new file mode 100644
index 00000000000..95e3da4ed5e
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/DescribeRecommendationFeedbackResult.cpp
@@ -0,0 +1,50 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/DescribeRecommendationFeedbackResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+DescribeRecommendationFeedbackResult::DescribeRecommendationFeedbackResult()
+{
+}
+
+DescribeRecommendationFeedbackResult::DescribeRecommendationFeedbackResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+DescribeRecommendationFeedbackResult& DescribeRecommendationFeedbackResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("RecommendationFeedback"))
+  {
+    m_recommendationFeedback = jsonValue.GetObject("RecommendationFeedback");
+
+  }
+
+
+
+  return *this;
+}
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/JobState.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/JobState.cpp
new file mode 100644
index 00000000000..6e490e6b436
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/JobState.cpp
@@ -0,0 +1,94 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/JobState.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace CodeGuruReviewer
+  {
+    namespace Model
+    {
+      namespace JobStateMapper
+      {
+
+        static const int Completed_HASH = HashingUtils::HashString("Completed");
+        static const int Pending_HASH = HashingUtils::HashString("Pending");
+        static const int Failed_HASH = HashingUtils::HashString("Failed");
+        static const int Deleting_HASH = HashingUtils::HashString("Deleting");
+
+
+        JobState GetJobStateForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == Completed_HASH)
+          {
+            return JobState::Completed;
+          }
+          else if (hashCode == Pending_HASH)
+          {
+            return JobState::Pending;
+          }
+          else if (hashCode == Failed_HASH)
+          {
+            return JobState::Failed;
+          }
+          else if (hashCode == Deleting_HASH)
+          {
+            return JobState::Deleting;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<JobState>(hashCode);
+          }
+
+          return JobState::NOT_SET;
+        }
+
+        Aws::String GetNameForJobState(JobState enumValue)
+        {
+          switch(enumValue)
+          {
+          case JobState::Completed:
+            return "Completed";
+          case JobState::Pending:
+            return "Pending";
+          case JobState::Failed:
+            return "Failed";
+          case JobState::Deleting:
+            return "Deleting";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace JobStateMapper
+    } // namespace Model
+  } // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsRequest.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsRequest.cpp
new file mode 100644
index 00000000000..9f44d0d6583
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsRequest.cpp
@@ -0,0 +1,102 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/ListCodeReviewsRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/http/URI.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws::Http;
+
+ListCodeReviewsRequest::ListCodeReviewsRequest() : 
+    m_providerTypesHasBeenSet(false),
+    m_statesHasBeenSet(false),
+    m_repositoryNamesHasBeenSet(false),
+    m_type(Type::NOT_SET),
+    m_typeHasBeenSet(false),
+    m_maxResults(0),
+    m_maxResultsHasBeenSet(false),
+    m_nextTokenHasBeenSet(false)
+{
+}
+
+Aws::String ListCodeReviewsRequest::SerializePayload() const
+{
+  return {};
+}
+
+void ListCodeReviewsRequest::AddQueryStringParameters(URI& uri) const
+{
+    Aws::StringStream ss;
+    if(m_providerTypesHasBeenSet)
+    {
+      for(const auto& item : m_providerTypes)
+      {
+        ss << ProviderTypeMapper::GetNameForProviderType(item);
+        uri.AddQueryStringParameter("ProviderTypes", ss.str());
+        ss.str("");
+      }
+    }
+
+    if(m_statesHasBeenSet)
+    {
+      for(const auto& item : m_states)
+      {
+        ss << JobStateMapper::GetNameForJobState(item);
+        uri.AddQueryStringParameter("States", ss.str());
+        ss.str("");
+      }
+    }
+
+    if(m_repositoryNamesHasBeenSet)
+    {
+      for(const auto& item : m_repositoryNames)
+      {
+        ss << item;
+        uri.AddQueryStringParameter("RepositoryNames", ss.str());
+        ss.str("");
+      }
+    }
+
+    if(m_typeHasBeenSet)
+    {
+      ss << TypeMapper::GetNameForType(m_type);
+      uri.AddQueryStringParameter("Type", ss.str());
+      ss.str("");
+    }
+
+    if(m_maxResultsHasBeenSet)
+    {
+      ss << m_maxResults;
+      uri.AddQueryStringParameter("MaxResults", ss.str());
+      ss.str("");
+    }
+
+    if(m_nextTokenHasBeenSet)
+    {
+      ss << m_nextToken;
+      uri.AddQueryStringParameter("NextToken", ss.str());
+      ss.str("");
+    }
+
+}
+
+
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsResult.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsResult.cpp
new file mode 100644
index 00000000000..ccc77b434fb
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/ListCodeReviewsResult.cpp
@@ -0,0 +1,59 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/ListCodeReviewsResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ListCodeReviewsResult::ListCodeReviewsResult()
+{
+}
+
+ListCodeReviewsResult::ListCodeReviewsResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+ListCodeReviewsResult& ListCodeReviewsResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("CodeReviewSummaries"))
+  {
+    Array<JsonView> codeReviewSummariesJsonList = jsonValue.GetArray("CodeReviewSummaries");
+    for(unsigned codeReviewSummariesIndex = 0; codeReviewSummariesIndex < codeReviewSummariesJsonList.GetLength(); ++codeReviewSummariesIndex)
+    {
+      m_codeReviewSummaries.push_back(codeReviewSummariesJsonList[codeReviewSummariesIndex].AsObject());
+    }
+  }
+
+  if(jsonValue.ValueExists("NextToken"))
+  {
+    m_nextToken = jsonValue.GetString("NextToken");
+
+  }
+
+
+
+  return *this;
+}
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackRequest.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackRequest.cpp
new file mode 100644
index 00000000000..c1d01eba68d
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackRequest.cpp
@@ -0,0 +1,83 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/http/URI.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws::Http;
+
+ListRecommendationFeedbackRequest::ListRecommendationFeedbackRequest() : 
+    m_nextTokenHasBeenSet(false),
+    m_maxResults(0),
+    m_maxResultsHasBeenSet(false),
+    m_codeReviewArnHasBeenSet(false),
+    m_userIdsHasBeenSet(false),
+    m_recommendationIdsHasBeenSet(false)
+{
+}
+
+Aws::String ListRecommendationFeedbackRequest::SerializePayload() const
+{
+  return {};
+}
+
+void ListRecommendationFeedbackRequest::AddQueryStringParameters(URI& uri) const
+{
+    Aws::StringStream ss;
+    if(m_nextTokenHasBeenSet)
+    {
+      ss << m_nextToken;
+      uri.AddQueryStringParameter("NextToken", ss.str());
+      ss.str("");
+    }
+
+    if(m_maxResultsHasBeenSet)
+    {
+      ss << m_maxResults;
+      uri.AddQueryStringParameter("MaxResults", ss.str());
+      ss.str("");
+    }
+
+    if(m_userIdsHasBeenSet)
+    {
+      for(const auto& item : m_userIds)
+      {
+        ss << item;
+        uri.AddQueryStringParameter("UserIds", ss.str());
+        ss.str("");
+      }
+    }
+
+    if(m_recommendationIdsHasBeenSet)
+    {
+      for(const auto& item : m_recommendationIds)
+      {
+        ss << item;
+        uri.AddQueryStringParameter("RecommendationIds", ss.str());
+        ss.str("");
+      }
+    }
+
+}
+
+
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackResult.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackResult.cpp
new file mode 100644
index 00000000000..77443e67c93
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationFeedbackResult.cpp
@@ -0,0 +1,59 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ListRecommendationFeedbackResult::ListRecommendationFeedbackResult()
+{
+}
+
+ListRecommendationFeedbackResult::ListRecommendationFeedbackResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+ListRecommendationFeedbackResult& ListRecommendationFeedbackResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("RecommendationFeedbackSummaries"))
+  {
+    Array<JsonView> recommendationFeedbackSummariesJsonList = jsonValue.GetArray("RecommendationFeedbackSummaries");
+    for(unsigned recommendationFeedbackSummariesIndex = 0; recommendationFeedbackSummariesIndex < recommendationFeedbackSummariesJsonList.GetLength(); ++recommendationFeedbackSummariesIndex)
+    {
+      m_recommendationFeedbackSummaries.push_back(recommendationFeedbackSummariesJsonList[recommendationFeedbackSummariesIndex].AsObject());
+    }
+  }
+
+  if(jsonValue.ValueExists("NextToken"))
+  {
+    m_nextToken = jsonValue.GetString("NextToken");
+
+  }
+
+
+
+  return *this;
+}
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsRequest.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsRequest.cpp
new file mode 100644
index 00000000000..0ae3ba97a66
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsRequest.cpp
@@ -0,0 +1,61 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/ListRecommendationsRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/http/URI.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws::Http;
+
+ListRecommendationsRequest::ListRecommendationsRequest() : 
+    m_nextTokenHasBeenSet(false),
+    m_maxResults(0),
+    m_maxResultsHasBeenSet(false),
+    m_codeReviewArnHasBeenSet(false)
+{
+}
+
+Aws::String ListRecommendationsRequest::SerializePayload() const
+{
+  return {};
+}
+
+void ListRecommendationsRequest::AddQueryStringParameters(URI& uri) const
+{
+    Aws::StringStream ss;
+    if(m_nextTokenHasBeenSet)
+    {
+      ss << m_nextToken;
+      uri.AddQueryStringParameter("NextToken", ss.str());
+      ss.str("");
+    }
+
+    if(m_maxResultsHasBeenSet)
+    {
+      ss << m_maxResults;
+      uri.AddQueryStringParameter("MaxResults", ss.str());
+      ss.str("");
+    }
+
+}
+
+
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsResult.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsResult.cpp
new file mode 100644
index 00000000000..324b498f990
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/ListRecommendationsResult.cpp
@@ -0,0 +1,59 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/ListRecommendationsResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ListRecommendationsResult::ListRecommendationsResult()
+{
+}
+
+ListRecommendationsResult::ListRecommendationsResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+ListRecommendationsResult& ListRecommendationsResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("RecommendationSummaries"))
+  {
+    Array<JsonView> recommendationSummariesJsonList = jsonValue.GetArray("RecommendationSummaries");
+    for(unsigned recommendationSummariesIndex = 0; recommendationSummariesIndex < recommendationSummariesJsonList.GetLength(); ++recommendationSummariesIndex)
+    {
+      m_recommendationSummaries.push_back(recommendationSummariesJsonList[recommendationSummariesIndex].AsObject());
+    }
+  }
+
+  if(jsonValue.ValueExists("NextToken"))
+  {
+    m_nextToken = jsonValue.GetString("NextToken");
+
+  }
+
+
+
+  return *this;
+}
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/Metrics.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/Metrics.cpp
new file mode 100644
index 00000000000..c0f952cbf6f
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/Metrics.cpp
@@ -0,0 +1,88 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/Metrics.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+Metrics::Metrics() : 
+    m_meteredLinesOfCodeCount(0),
+    m_meteredLinesOfCodeCountHasBeenSet(false),
+    m_findingsCount(0),
+    m_findingsCountHasBeenSet(false)
+{
+}
+
+Metrics::Metrics(JsonView jsonValue) : 
+    m_meteredLinesOfCodeCount(0),
+    m_meteredLinesOfCodeCountHasBeenSet(false),
+    m_findingsCount(0),
+    m_findingsCountHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+Metrics& Metrics::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("MeteredLinesOfCodeCount"))
+  {
+    m_meteredLinesOfCodeCount = jsonValue.GetInt64("MeteredLinesOfCodeCount");
+
+    m_meteredLinesOfCodeCountHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("FindingsCount"))
+  {
+    m_findingsCount = jsonValue.GetInt64("FindingsCount");
+
+    m_findingsCountHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue Metrics::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_meteredLinesOfCodeCountHasBeenSet)
+  {
+   payload.WithInt64("MeteredLinesOfCodeCount", m_meteredLinesOfCodeCount);
+
+  }
+
+  if(m_findingsCountHasBeenSet)
+  {
+   payload.WithInt64("FindingsCount", m_findingsCount);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/MetricsSummary.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/MetricsSummary.cpp
new file mode 100644
index 00000000000..b86b97f6ab4
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/MetricsSummary.cpp
@@ -0,0 +1,88 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/MetricsSummary.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+MetricsSummary::MetricsSummary() : 
+    m_meteredLinesOfCodeCount(0),
+    m_meteredLinesOfCodeCountHasBeenSet(false),
+    m_findingsCount(0),
+    m_findingsCountHasBeenSet(false)
+{
+}
+
+MetricsSummary::MetricsSummary(JsonView jsonValue) : 
+    m_meteredLinesOfCodeCount(0),
+    m_meteredLinesOfCodeCountHasBeenSet(false),
+    m_findingsCount(0),
+    m_findingsCountHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+MetricsSummary& MetricsSummary::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("MeteredLinesOfCodeCount"))
+  {
+    m_meteredLinesOfCodeCount = jsonValue.GetInt64("MeteredLinesOfCodeCount");
+
+    m_meteredLinesOfCodeCountHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("FindingsCount"))
+  {
+    m_findingsCount = jsonValue.GetInt64("FindingsCount");
+
+    m_findingsCountHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue MetricsSummary::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_meteredLinesOfCodeCountHasBeenSet)
+  {
+   payload.WithInt64("MeteredLinesOfCodeCount", m_meteredLinesOfCodeCount);
+
+  }
+
+  if(m_findingsCountHasBeenSet)
+  {
+   payload.WithInt64("FindingsCount", m_findingsCount);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackRequest.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackRequest.cpp
new file mode 100644
index 00000000000..6c4d38ebd6c
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackRequest.cpp
@@ -0,0 +1,64 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/PutRecommendationFeedbackRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+PutRecommendationFeedbackRequest::PutRecommendationFeedbackRequest() : 
+    m_codeReviewArnHasBeenSet(false),
+    m_recommendationIdHasBeenSet(false),
+    m_reactionsHasBeenSet(false)
+{
+}
+
+Aws::String PutRecommendationFeedbackRequest::SerializePayload() const
+{
+  JsonValue payload;
+
+  if(m_codeReviewArnHasBeenSet)
+  {
+   payload.WithString("CodeReviewArn", m_codeReviewArn);
+
+  }
+
+  if(m_recommendationIdHasBeenSet)
+  {
+   payload.WithString("RecommendationId", m_recommendationId);
+
+  }
+
+  if(m_reactionsHasBeenSet)
+  {
+   Array<JsonValue> reactionsJsonList(m_reactions.size());
+   for(unsigned reactionsIndex = 0; reactionsIndex < reactionsJsonList.GetLength(); ++reactionsIndex)
+   {
+     reactionsJsonList[reactionsIndex].AsString(ReactionMapper::GetNameForReaction(m_reactions[reactionsIndex]));
+   }
+   payload.WithArray("Reactions", std::move(reactionsJsonList));
+
+  }
+
+  return payload.View().WriteReadable();
+}
+
+
+
+
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackResult.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackResult.cpp
new file mode 100644
index 00000000000..c993a786fff
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/PutRecommendationFeedbackResult.cpp
@@ -0,0 +1,44 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/PutRecommendationFeedbackResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+
+#include <utility>
+
+using namespace Aws::CodeGuruReviewer::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+PutRecommendationFeedbackResult::PutRecommendationFeedbackResult()
+{
+}
+
+PutRecommendationFeedbackResult::PutRecommendationFeedbackResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+PutRecommendationFeedbackResult& PutRecommendationFeedbackResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  AWS_UNREFERENCED_PARAM(result);
+
+
+  return *this;
+}
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/Reaction.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/Reaction.cpp
new file mode 100644
index 00000000000..fba26a41b26
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/Reaction.cpp
@@ -0,0 +1,80 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/Reaction.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace CodeGuruReviewer
+  {
+    namespace Model
+    {
+      namespace ReactionMapper
+      {
+
+        static const int ThumbsUp_HASH = HashingUtils::HashString("ThumbsUp");
+        static const int ThumbsDown_HASH = HashingUtils::HashString("ThumbsDown");
+
+
+        Reaction GetReactionForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == ThumbsUp_HASH)
+          {
+            return Reaction::ThumbsUp;
+          }
+          else if (hashCode == ThumbsDown_HASH)
+          {
+            return Reaction::ThumbsDown;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<Reaction>(hashCode);
+          }
+
+          return Reaction::NOT_SET;
+        }
+
+        Aws::String GetNameForReaction(Reaction enumValue)
+        {
+          switch(enumValue)
+          {
+          case Reaction::ThumbsUp:
+            return "ThumbsUp";
+          case Reaction::ThumbsDown:
+            return "ThumbsDown";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace ReactionMapper
+    } // namespace Model
+  } // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedback.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedback.cpp
new file mode 100644
index 00000000000..09bd12217f7
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedback.cpp
@@ -0,0 +1,150 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/RecommendationFeedback.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+RecommendationFeedback::RecommendationFeedback() : 
+    m_codeReviewArnHasBeenSet(false),
+    m_recommendationIdHasBeenSet(false),
+    m_reactionsHasBeenSet(false),
+    m_userIdHasBeenSet(false),
+    m_createdTimeStampHasBeenSet(false),
+    m_lastUpdatedTimeStampHasBeenSet(false)
+{
+}
+
+RecommendationFeedback::RecommendationFeedback(JsonView jsonValue) : 
+    m_codeReviewArnHasBeenSet(false),
+    m_recommendationIdHasBeenSet(false),
+    m_reactionsHasBeenSet(false),
+    m_userIdHasBeenSet(false),
+    m_createdTimeStampHasBeenSet(false),
+    m_lastUpdatedTimeStampHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+RecommendationFeedback& RecommendationFeedback::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("CodeReviewArn"))
+  {
+    m_codeReviewArn = jsonValue.GetString("CodeReviewArn");
+
+    m_codeReviewArnHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("RecommendationId"))
+  {
+    m_recommendationId = jsonValue.GetString("RecommendationId");
+
+    m_recommendationIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Reactions"))
+  {
+    Array<JsonView> reactionsJsonList = jsonValue.GetArray("Reactions");
+    for(unsigned reactionsIndex = 0; reactionsIndex < reactionsJsonList.GetLength(); ++reactionsIndex)
+    {
+      m_reactions.push_back(ReactionMapper::GetReactionForName(reactionsJsonList[reactionsIndex].AsString()));
+    }
+    m_reactionsHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("UserId"))
+  {
+    m_userId = jsonValue.GetString("UserId");
+
+    m_userIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("CreatedTimeStamp"))
+  {
+    m_createdTimeStamp = jsonValue.GetDouble("CreatedTimeStamp");
+
+    m_createdTimeStampHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastUpdatedTimeStamp"))
+  {
+    m_lastUpdatedTimeStamp = jsonValue.GetDouble("LastUpdatedTimeStamp");
+
+    m_lastUpdatedTimeStampHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue RecommendationFeedback::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_codeReviewArnHasBeenSet)
+  {
+   payload.WithString("CodeReviewArn", m_codeReviewArn);
+
+  }
+
+  if(m_recommendationIdHasBeenSet)
+  {
+   payload.WithString("RecommendationId", m_recommendationId);
+
+  }
+
+  if(m_reactionsHasBeenSet)
+  {
+   Array<JsonValue> reactionsJsonList(m_reactions.size());
+   for(unsigned reactionsIndex = 0; reactionsIndex < reactionsJsonList.GetLength(); ++reactionsIndex)
+   {
+     reactionsJsonList[reactionsIndex].AsString(ReactionMapper::GetNameForReaction(m_reactions[reactionsIndex]));
+   }
+   payload.WithArray("Reactions", std::move(reactionsJsonList));
+
+  }
+
+  if(m_userIdHasBeenSet)
+  {
+   payload.WithString("UserId", m_userId);
+
+  }
+
+  if(m_createdTimeStampHasBeenSet)
+  {
+   payload.WithDouble("CreatedTimeStamp", m_createdTimeStamp.SecondsWithMSPrecision());
+  }
+
+  if(m_lastUpdatedTimeStampHasBeenSet)
+  {
+   payload.WithDouble("LastUpdatedTimeStamp", m_lastUpdatedTimeStamp.SecondsWithMSPrecision());
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedbackSummary.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedbackSummary.cpp
new file mode 100644
index 00000000000..25010040a38
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationFeedbackSummary.cpp
@@ -0,0 +1,107 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/RecommendationFeedbackSummary.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+RecommendationFeedbackSummary::RecommendationFeedbackSummary() : 
+    m_recommendationIdHasBeenSet(false),
+    m_reactionsHasBeenSet(false),
+    m_userIdHasBeenSet(false)
+{
+}
+
+RecommendationFeedbackSummary::RecommendationFeedbackSummary(JsonView jsonValue) : 
+    m_recommendationIdHasBeenSet(false),
+    m_reactionsHasBeenSet(false),
+    m_userIdHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+RecommendationFeedbackSummary& RecommendationFeedbackSummary::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("RecommendationId"))
+  {
+    m_recommendationId = jsonValue.GetString("RecommendationId");
+
+    m_recommendationIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Reactions"))
+  {
+    Array<JsonView> reactionsJsonList = jsonValue.GetArray("Reactions");
+    for(unsigned reactionsIndex = 0; reactionsIndex < reactionsJsonList.GetLength(); ++reactionsIndex)
+    {
+      m_reactions.push_back(ReactionMapper::GetReactionForName(reactionsJsonList[reactionsIndex].AsString()));
+    }
+    m_reactionsHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("UserId"))
+  {
+    m_userId = jsonValue.GetString("UserId");
+
+    m_userIdHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue RecommendationFeedbackSummary::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_recommendationIdHasBeenSet)
+  {
+   payload.WithString("RecommendationId", m_recommendationId);
+
+  }
+
+  if(m_reactionsHasBeenSet)
+  {
+   Array<JsonValue> reactionsJsonList(m_reactions.size());
+   for(unsigned reactionsIndex = 0; reactionsIndex < reactionsJsonList.GetLength(); ++reactionsIndex)
+   {
+     reactionsJsonList[reactionsIndex].AsString(ReactionMapper::GetNameForReaction(m_reactions[reactionsIndex]));
+   }
+   payload.WithArray("Reactions", std::move(reactionsJsonList));
+
+  }
+
+  if(m_userIdHasBeenSet)
+  {
+   payload.WithString("UserId", m_userId);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationSummary.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationSummary.cpp
new file mode 100644
index 00000000000..81b940adb8d
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/RecommendationSummary.cpp
@@ -0,0 +1,133 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/RecommendationSummary.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+RecommendationSummary::RecommendationSummary() : 
+    m_filePathHasBeenSet(false),
+    m_recommendationIdHasBeenSet(false),
+    m_startLine(0),
+    m_startLineHasBeenSet(false),
+    m_endLine(0),
+    m_endLineHasBeenSet(false),
+    m_descriptionHasBeenSet(false)
+{
+}
+
+RecommendationSummary::RecommendationSummary(JsonView jsonValue) : 
+    m_filePathHasBeenSet(false),
+    m_recommendationIdHasBeenSet(false),
+    m_startLine(0),
+    m_startLineHasBeenSet(false),
+    m_endLine(0),
+    m_endLineHasBeenSet(false),
+    m_descriptionHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+RecommendationSummary& RecommendationSummary::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("FilePath"))
+  {
+    m_filePath = jsonValue.GetString("FilePath");
+
+    m_filePathHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("RecommendationId"))
+  {
+    m_recommendationId = jsonValue.GetString("RecommendationId");
+
+    m_recommendationIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("StartLine"))
+  {
+    m_startLine = jsonValue.GetInteger("StartLine");
+
+    m_startLineHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("EndLine"))
+  {
+    m_endLine = jsonValue.GetInteger("EndLine");
+
+    m_endLineHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Description"))
+  {
+    m_description = jsonValue.GetString("Description");
+
+    m_descriptionHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue RecommendationSummary::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_filePathHasBeenSet)
+  {
+   payload.WithString("FilePath", m_filePath);
+
+  }
+
+  if(m_recommendationIdHasBeenSet)
+  {
+   payload.WithString("RecommendationId", m_recommendationId);
+
+  }
+
+  if(m_startLineHasBeenSet)
+  {
+   payload.WithInteger("StartLine", m_startLine);
+
+  }
+
+  if(m_endLineHasBeenSet)
+  {
+   payload.WithInteger("EndLine", m_endLine);
+
+  }
+
+  if(m_descriptionHasBeenSet)
+  {
+   payload.WithString("Description", m_description);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/SourceCodeType.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/SourceCodeType.cpp
new file mode 100644
index 00000000000..287374a2e05
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/SourceCodeType.cpp
@@ -0,0 +1,69 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/SourceCodeType.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CodeGuruReviewer
+{
+namespace Model
+{
+
+SourceCodeType::SourceCodeType() : 
+    m_commitDiffHasBeenSet(false)
+{
+}
+
+SourceCodeType::SourceCodeType(JsonView jsonValue) : 
+    m_commitDiffHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+SourceCodeType& SourceCodeType::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("CommitDiff"))
+  {
+    m_commitDiff = jsonValue.GetObject("CommitDiff");
+
+    m_commitDiffHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue SourceCodeType::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_commitDiffHasBeenSet)
+  {
+   payload.WithObject("CommitDiff", m_commitDiff.Jsonize());
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-codeguru-reviewer/source/model/Type.cpp b/aws-cpp-sdk-codeguru-reviewer/source/model/Type.cpp
new file mode 100644
index 00000000000..46b1e84a5a8
--- /dev/null
+++ b/aws-cpp-sdk-codeguru-reviewer/source/model/Type.cpp
@@ -0,0 +1,73 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/codeguru-reviewer/model/Type.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace CodeGuruReviewer
+  {
+    namespace Model
+    {
+      namespace TypeMapper
+      {
+
+        static const int PullRequest_HASH = HashingUtils::HashString("PullRequest");
+
+
+        Type GetTypeForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == PullRequest_HASH)
+          {
+            return Type::PullRequest;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<Type>(hashCode);
+          }
+
+          return Type::NOT_SET;
+        }
+
+        Aws::String GetNameForType(Type enumValue)
+        {
+          switch(enumValue)
+          {
+          case Type::PullRequest:
+            return "PullRequest";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace TypeMapper
+    } // namespace Model
+  } // namespace CodeGuruReviewer
+} // namespace Aws
diff --git a/aws-cpp-sdk-core/include/aws/core/VersionConfig.h b/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
index 48831801ca2..f7113ddcc4d 100644
--- a/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
+++ b/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
@@ -13,4 +13,4 @@
   * permissions and limitations under the License.
   */
 
-#define AWS_SDK_VERSION_STRING "1.7.318"
+#define AWS_SDK_VERSION_STRING "1.7.319"
diff --git a/aws-cpp-sdk-es/include/aws/es/model/ServiceSoftwareOptions.h b/aws-cpp-sdk-es/include/aws/es/model/ServiceSoftwareOptions.h
index 0a9cf9a4396..cd16903501a 100644
--- a/aws-cpp-sdk-es/include/aws/es/model/ServiceSoftwareOptions.h
+++ b/aws-cpp-sdk-es/include/aws/es/model/ServiceSoftwareOptions.h
@@ -322,6 +322,35 @@ namespace Model
      */
     inline ServiceSoftwareOptions& WithAutomatedUpdateDate(Aws::Utils::DateTime&& value) { SetAutomatedUpdateDate(std::move(value)); return *this;}
 
+
+    /**
+     * <p><code>True</code> if a service software is never automatically updated.
+     * <code>False</code> if a service software is automatically updated after
+     * <code>AutomatedUpdateDate</code>. </p>
+     */
+    inline bool GetOptionalDeployment() const{ return m_optionalDeployment; }
+
+    /**
+     * <p><code>True</code> if a service software is never automatically updated.
+     * <code>False</code> if a service software is automatically updated after
+     * <code>AutomatedUpdateDate</code>. </p>
+     */
+    inline bool OptionalDeploymentHasBeenSet() const { return m_optionalDeploymentHasBeenSet; }
+
+    /**
+     * <p><code>True</code> if a service software is never automatically updated.
+     * <code>False</code> if a service software is automatically updated after
+     * <code>AutomatedUpdateDate</code>. </p>
+     */
+    inline void SetOptionalDeployment(bool value) { m_optionalDeploymentHasBeenSet = true; m_optionalDeployment = value; }
+
+    /**
+     * <p><code>True</code> if a service software is never automatically updated.
+     * <code>False</code> if a service software is automatically updated after
+     * <code>AutomatedUpdateDate</code>. </p>
+     */
+    inline ServiceSoftwareOptions& WithOptionalDeployment(bool value) { SetOptionalDeployment(value); return *this;}
+
   private:
 
     Aws::String m_currentVersion;
@@ -344,6 +373,9 @@ namespace Model
 
     Aws::Utils::DateTime m_automatedUpdateDate;
     bool m_automatedUpdateDateHasBeenSet;
+
+    bool m_optionalDeployment;
+    bool m_optionalDeploymentHasBeenSet;
   };
 
 } // namespace Model
diff --git a/aws-cpp-sdk-es/source/model/ServiceSoftwareOptions.cpp b/aws-cpp-sdk-es/source/model/ServiceSoftwareOptions.cpp
index d7863811370..e26e62d4870 100644
--- a/aws-cpp-sdk-es/source/model/ServiceSoftwareOptions.cpp
+++ b/aws-cpp-sdk-es/source/model/ServiceSoftwareOptions.cpp
@@ -38,7 +38,9 @@ ServiceSoftwareOptions::ServiceSoftwareOptions() :
     m_updateStatus(DeploymentStatus::NOT_SET),
     m_updateStatusHasBeenSet(false),
     m_descriptionHasBeenSet(false),
-    m_automatedUpdateDateHasBeenSet(false)
+    m_automatedUpdateDateHasBeenSet(false),
+    m_optionalDeployment(false),
+    m_optionalDeploymentHasBeenSet(false)
 {
 }
 
@@ -52,7 +54,9 @@ ServiceSoftwareOptions::ServiceSoftwareOptions(JsonView jsonValue) :
     m_updateStatus(DeploymentStatus::NOT_SET),
     m_updateStatusHasBeenSet(false),
     m_descriptionHasBeenSet(false),
-    m_automatedUpdateDateHasBeenSet(false)
+    m_automatedUpdateDateHasBeenSet(false),
+    m_optionalDeployment(false),
+    m_optionalDeploymentHasBeenSet(false)
 {
   *this = jsonValue;
 }
@@ -108,6 +112,13 @@ ServiceSoftwareOptions& ServiceSoftwareOptions::operator =(JsonView jsonValue)
     m_automatedUpdateDateHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("OptionalDeployment"))
+  {
+    m_optionalDeployment = jsonValue.GetBool("OptionalDeployment");
+
+    m_optionalDeploymentHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -155,6 +166,12 @@ JsonValue ServiceSoftwareOptions::Jsonize() const
    payload.WithDouble("AutomatedUpdateDate", m_automatedUpdateDate.SecondsWithMSPrecision());
   }
 
+  if(m_optionalDeploymentHasBeenSet)
+  {
+   payload.WithBool("OptionalDeployment", m_optionalDeployment);
+
+  }
+
   return payload;
 }
 
diff --git a/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h b/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h
index 852504ff67e..cbdac711b9d 100644
--- a/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h
+++ b/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h
@@ -638,14 +638,16 @@ namespace Model
          * <p>Creates an AWS Firewall Manager policy.</p> <p>Firewall Manager provides the
          * following types of policies: </p> <ul> <li> <p>A Shield Advanced policy, which
          * applies Shield Advanced protection to specified accounts and resources</p> </li>
-         * <li> <p>An AWS WAF policy, which contains a rule group and defines which
-         * resources are to be protected by that rule group</p> </li> <li> <p>A security
-         * group policy, which manages VPC security groups across your AWS organization.
-         * </p> </li> </ul> <p>Each policy is specific to one of the three types. If you
-         * want to enforce more than one policy type across accounts, you can create
-         * multiple policies. You can create multiple policies for each type.</p> <p>You
-         * must be subscribed to Shield Advanced to create a Shield Advanced policy. For
-         * more information about subscribing to Shield Advanced, see <a
+         * <li> <p>An AWS WAF policy (type WAFV2), which defines rule groups to run first
+         * in the corresponding AWS WAF web ACL and rule groups to run last in the web
+         * ACL.</p> </li> <li> <p>An AWS WAF Classic policy (type WAF), which defines a
+         * rule group. </p> </li> <li> <p>A security group policy, which manages VPC
+         * security groups across your AWS organization. </p> </li> </ul> <p>Each policy is
+         * specific to one of the types. If you want to enforce more than one policy type
+         * across accounts, create multiple policies. You can create multiple policies for
+         * each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield
+         * Advanced policy. For more information about subscribing to Shield Advanced, see
+         * <a
          * href="https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html">CreateSubscription</a>.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/PutPolicy">AWS API
@@ -657,14 +659,16 @@ namespace Model
          * <p>Creates an AWS Firewall Manager policy.</p> <p>Firewall Manager provides the
          * following types of policies: </p> <ul> <li> <p>A Shield Advanced policy, which
          * applies Shield Advanced protection to specified accounts and resources</p> </li>
-         * <li> <p>An AWS WAF policy, which contains a rule group and defines which
-         * resources are to be protected by that rule group</p> </li> <li> <p>A security
-         * group policy, which manages VPC security groups across your AWS organization.
-         * </p> </li> </ul> <p>Each policy is specific to one of the three types. If you
-         * want to enforce more than one policy type across accounts, you can create
-         * multiple policies. You can create multiple policies for each type.</p> <p>You
-         * must be subscribed to Shield Advanced to create a Shield Advanced policy. For
-         * more information about subscribing to Shield Advanced, see <a
+         * <li> <p>An AWS WAF policy (type WAFV2), which defines rule groups to run first
+         * in the corresponding AWS WAF web ACL and rule groups to run last in the web
+         * ACL.</p> </li> <li> <p>An AWS WAF Classic policy (type WAF), which defines a
+         * rule group. </p> </li> <li> <p>A security group policy, which manages VPC
+         * security groups across your AWS organization. </p> </li> </ul> <p>Each policy is
+         * specific to one of the types. If you want to enforce more than one policy type
+         * across accounts, create multiple policies. You can create multiple policies for
+         * each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield
+         * Advanced policy. For more information about subscribing to Shield Advanced, see
+         * <a
          * href="https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html">CreateSubscription</a>.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/PutPolicy">AWS API
@@ -678,14 +682,16 @@ namespace Model
          * <p>Creates an AWS Firewall Manager policy.</p> <p>Firewall Manager provides the
          * following types of policies: </p> <ul> <li> <p>A Shield Advanced policy, which
          * applies Shield Advanced protection to specified accounts and resources</p> </li>
-         * <li> <p>An AWS WAF policy, which contains a rule group and defines which
-         * resources are to be protected by that rule group</p> </li> <li> <p>A security
-         * group policy, which manages VPC security groups across your AWS organization.
-         * </p> </li> </ul> <p>Each policy is specific to one of the three types. If you
-         * want to enforce more than one policy type across accounts, you can create
-         * multiple policies. You can create multiple policies for each type.</p> <p>You
-         * must be subscribed to Shield Advanced to create a Shield Advanced policy. For
-         * more information about subscribing to Shield Advanced, see <a
+         * <li> <p>An AWS WAF policy (type WAFV2), which defines rule groups to run first
+         * in the corresponding AWS WAF web ACL and rule groups to run last in the web
+         * ACL.</p> </li> <li> <p>An AWS WAF Classic policy (type WAF), which defines a
+         * rule group. </p> </li> <li> <p>A security group policy, which manages VPC
+         * security groups across your AWS organization. </p> </li> </ul> <p>Each policy is
+         * specific to one of the types. If you want to enforce more than one policy type
+         * across accounts, create multiple policies. You can create multiple policies for
+         * each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield
+         * Advanced policy. For more information about subscribing to Shield Advanced, see
+         * <a
          * href="https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html">CreateSubscription</a>.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/PutPolicy">AWS API
diff --git a/aws-cpp-sdk-fms/include/aws/fms/model/CustomerPolicyScopeIdType.h b/aws-cpp-sdk-fms/include/aws/fms/model/CustomerPolicyScopeIdType.h
index 4d1c414978d..cb1339c213e 100644
--- a/aws-cpp-sdk-fms/include/aws/fms/model/CustomerPolicyScopeIdType.h
+++ b/aws-cpp-sdk-fms/include/aws/fms/model/CustomerPolicyScopeIdType.h
@@ -26,7 +26,8 @@ namespace Model
   enum class CustomerPolicyScopeIdType
   {
     NOT_SET,
-    ACCOUNT
+    ACCOUNT,
+    ORG_UNIT
   };
 
 namespace CustomerPolicyScopeIdTypeMapper
diff --git a/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h b/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h
index 6a977ff6e3a..7b183f8a8c5 100644
--- a/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h
+++ b/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h
@@ -515,223 +515,463 @@ namespace Model
 
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline const Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>& GetIncludeMap() const{ return m_includeMap; }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline bool IncludeMapHasBeenSet() const { return m_includeMapHasBeenSet; }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline void SetIncludeMap(const Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>& value) { m_includeMapHasBeenSet = true; m_includeMap = value; }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline void SetIncludeMap(Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>&& value) { m_includeMapHasBeenSet = true; m_includeMap = std::move(value); }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& WithIncludeMap(const Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>& value) { SetIncludeMap(value); return *this;}
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& WithIncludeMap(Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>&& value) { SetIncludeMap(std::move(value)); return *this;}
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddIncludeMap(const CustomerPolicyScopeIdType& key, const Aws::Vector<Aws::String>& value) { m_includeMapHasBeenSet = true; m_includeMap.emplace(key, value); return *this; }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddIncludeMap(CustomerPolicyScopeIdType&& key, const Aws::Vector<Aws::String>& value) { m_includeMapHasBeenSet = true; m_includeMap.emplace(std::move(key), value); return *this; }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddIncludeMap(const CustomerPolicyScopeIdType& key, Aws::Vector<Aws::String>&& value) { m_includeMapHasBeenSet = true; m_includeMap.emplace(key, std::move(value)); return *this; }
 
     /**
-     * <p>Specifies the AWS account IDs to include in the policy. If
-     * <code>IncludeMap</code> is null, all accounts in the organization in AWS
-     * Organizations are included in the policy. If <code>IncludeMap</code> is not
-     * null, only values listed in <code>IncludeMap</code> are included in the
-     * policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid
-     * <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”,
-     * “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to include in the policy. Specifying an OU is the equivalent of specifying
+     * all accounts in the OU and in any of its child OUs, including any child OUs and
+     * accounts that are added at a later time.</p> <p>You can specify inclusions or
+     * exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS
+     * Firewall Manager applies the policy to all accounts specified by the
+     * <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code>
+     * specifications. If you do not specify an <code>IncludeMap</code>, then Firewall
+     * Manager applies the policy to all accounts except for those specified by the
+     * <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a
+     * combination: </p> <ul> <li> <p>Specify account IDs by setting the key to
+     * <code>ACCOUNT</code>. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li>
+     * <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the
+     * following is a valid map: <code>{“ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a
+     * single map, separated with a comma. For example, the following is a valid map:
+     * <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”,
+     * “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddIncludeMap(CustomerPolicyScopeIdType&& key, Aws::Vector<Aws::String>&& value) { m_includeMapHasBeenSet = true; m_includeMap.emplace(std::move(key), std::move(value)); return *this; }
 
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline const Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>& GetExcludeMap() const{ return m_excludeMap; }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline bool ExcludeMapHasBeenSet() const { return m_excludeMapHasBeenSet; }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline void SetExcludeMap(const Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>& value) { m_excludeMapHasBeenSet = true; m_excludeMap = value; }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline void SetExcludeMap(Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>&& value) { m_excludeMapHasBeenSet = true; m_excludeMap = std::move(value); }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& WithExcludeMap(const Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>& value) { SetExcludeMap(value); return *this;}
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& WithExcludeMap(Aws::Map<CustomerPolicyScopeIdType, Aws::Vector<Aws::String>>&& value) { SetExcludeMap(std::move(value)); return *this;}
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddExcludeMap(const CustomerPolicyScopeIdType& key, const Aws::Vector<Aws::String>& value) { m_excludeMapHasBeenSet = true; m_excludeMap.emplace(key, value); return *this; }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddExcludeMap(CustomerPolicyScopeIdType&& key, const Aws::Vector<Aws::String>& value) { m_excludeMapHasBeenSet = true; m_excludeMap.emplace(std::move(key), value); return *this; }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddExcludeMap(const CustomerPolicyScopeIdType& key, Aws::Vector<Aws::String>&& value) { m_excludeMapHasBeenSet = true; m_excludeMap.emplace(key, std::move(value)); return *this; }
 
     /**
-     * <p>Specifies the AWS account IDs to exclude from the policy. The
-     * <code>IncludeMap</code> values are evaluated first, with all the appropriate
-     * account IDs added to the policy. Then the accounts listed in
-     * <code>ExcludeMap</code> are removed, resulting in the final list of accounts to
-     * add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For
-     * example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” :
-     * [“accountID1”, “accountID2”]}</code>.</p>
+     * <p>Specifies the AWS account IDs and AWS Organizations organizational units
+     * (OUs) to exclude from the policy. Specifying an OU is the equivalent of
+     * specifying all accounts in the OU and in any of its child OUs, including any
+     * child OUs and accounts that are added at a later time.</p> <p>You can specify
+     * inclusions or exclusions, but not both. If you specify an
+     * <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts
+     * specified by the <code>IncludeMap</code>, and does not evaluate any
+     * <code>ExcludeMap</code> specifications. If you do not specify an
+     * <code>IncludeMap</code>, then Firewall Manager applies the policy to all
+     * accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You
+     * can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify
+     * account IDs by setting the key to <code>ACCOUNT</code>. For example, the
+     * following is a valid map: <code>{“ACCOUNT” : [“accountID1”,
+     * “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to
+     * <code>ORG_UNIT</code>. For example, the following is a valid map:
+     * <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify
+     * accounts and OUs together in a single map, separated with a comma. For example,
+     * the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”],
+     * “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>
      */
     inline Policy& AddExcludeMap(CustomerPolicyScopeIdType&& key, Aws::Vector<Aws::String>&& value) { m_excludeMapHasBeenSet = true; m_excludeMap.emplace(std::move(key), std::move(value)); return *this; }
 
diff --git a/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h b/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h
index 518a2cfbe2f..53fde5ada5f 100644
--- a/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h
+++ b/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h
@@ -114,23 +114,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -151,23 +143,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -188,23 +172,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -225,23 +201,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -262,23 +230,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -299,23 +259,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -336,23 +288,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
@@ -373,23 +317,15 @@ namespace Model
      * <p>Details about the service that are specific to the service type, in JSON
      * format. For service type <code>SHIELD_ADVANCED</code>, this is an empty
      * string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p>
-     * <code>"SecurityServicePolicyData": "{ \"type\": \"WAFV2\",
-     * \"postProcessRuleGroups\": [ { \"managedRuleGroupIdentifier\": {
-     * \"managedRuleGroupName\": \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\":
-     * \"AWS\" } \"ruleGroupARN\": \"rule group arn", \"overrideAction\": { \"type\":
-     * \"COUNT|\" }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"preProcessRuleGroups\": [ {
-     * \"managedRuleGroupIdentifier\": { \"managedRuleGroupName\":
-     * \"AWSManagedRulesAdminProtectionRuleSet\", \"vendor\": \"AWS\" }
-     * \"ruleGroupARN\": \"rule group arn\", \"overrideAction\": { \"type\": \"COUNT\"
-     * }, \"excludedRules\": [ { \"name\" : \"EntityName\" } ], \"type\":
-     * \"ManagedRuleGroup|RuleGroup\" } ], \"defaultAction\": { \"type\": \"BLOCK\" }}"
-     * </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p>
+     * <code>"ManagedServiceData":
+     * "{\"type\":\"WAFV2\",\"defaultAction\":{\"type\":\"ALLOW\"},\"preProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":null,\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"COUNT\"},\"excludedRules\":[{\"name\":\"EntityName\"}],\"ruleGroupType\":\"RuleGroup\"}],\"postProcessRuleGroups\":[{\"managedRuleGroupIdentifier\":{\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\",\"vendor\":\"AWS\"},\"ruleGroupArn\":\"rulegrouparn\",\"overrideAction\":{\"type\":\"NONE\"},\"excludedRules\":[],\"ruleGroupType\":\"ManagedRuleGroup\"}],\"overrideCustomerWebACLAssociation\":false}"</code>
+     * </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p>
      * <code>"ManagedServiceData": "{\"type\": \"WAF\", \"ruleGroups\": [{\"id\":
      * \"12345678-1bcd-9012-efga-0987654321ab\", \"overrideAction\" : {\"type\":
      * \"COUNT\"}}], \"defaultAction\": {\"type\": \"BLOCK\"}}</code> </p> </li> <li>
      * <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p>
-     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,\"securityGroups\":[{\"id\":\"
+     * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_COMMON","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
+     * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"},"RemediationEnabled":false,"ResourceType":"AWS::EC2::NetworkInterface"}</code>
      * </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p>
      * <code>"SecurityServicePolicyData":{"Type":"SECURITY_GROUPS_CONTENT_AUDIT","ManagedServiceData":"{\"type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"securityGroups\":[{\"id\":\"
diff --git a/aws-cpp-sdk-fms/source/model/CustomerPolicyScopeIdType.cpp b/aws-cpp-sdk-fms/source/model/CustomerPolicyScopeIdType.cpp
index 14fb6e6f336..e8209d34040 100644
--- a/aws-cpp-sdk-fms/source/model/CustomerPolicyScopeIdType.cpp
+++ b/aws-cpp-sdk-fms/source/model/CustomerPolicyScopeIdType.cpp
@@ -31,6 +31,7 @@ namespace Aws
       {
 
         static const int ACCOUNT_HASH = HashingUtils::HashString("ACCOUNT");
+        static const int ORG_UNIT_HASH = HashingUtils::HashString("ORG_UNIT");
 
 
         CustomerPolicyScopeIdType GetCustomerPolicyScopeIdTypeForName(const Aws::String& name)
@@ -40,6 +41,10 @@ namespace Aws
           {
             return CustomerPolicyScopeIdType::ACCOUNT;
           }
+          else if (hashCode == ORG_UNIT_HASH)
+          {
+            return CustomerPolicyScopeIdType::ORG_UNIT;
+          }
           EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
           if(overflowContainer)
           {
@@ -56,6 +61,8 @@ namespace Aws
           {
           case CustomerPolicyScopeIdType::ACCOUNT:
             return "ACCOUNT";
+          case CustomerPolicyScopeIdType::ORG_UNIT:
+            return "ORG_UNIT";
           default:
             EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
             if(overflowContainer)
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftClient.h b/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftClient.h
index 65eab798d4d..74f39091fde 100644
--- a/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftClient.h
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftClient.h
@@ -40,6 +40,7 @@
 #include <aws/redshift/model/CreateScheduledActionResult.h>
 #include <aws/redshift/model/CreateSnapshotCopyGrantResult.h>
 #include <aws/redshift/model/CreateSnapshotScheduleResult.h>
+#include <aws/redshift/model/CreateUsageLimitResult.h>
 #include <aws/redshift/model/DeleteClusterResult.h>
 #include <aws/redshift/model/DeleteClusterSnapshotResult.h>
 #include <aws/redshift/model/DescribeAccountAttributesResult.h>
@@ -70,6 +71,7 @@
 #include <aws/redshift/model/DescribeStorageResult.h>
 #include <aws/redshift/model/DescribeTableRestoreStatusResult.h>
 #include <aws/redshift/model/DescribeTagsResult.h>
+#include <aws/redshift/model/DescribeUsageLimitsResult.h>
 #include <aws/redshift/model/DisableLoggingResult.h>
 #include <aws/redshift/model/DisableSnapshotCopyResult.h>
 #include <aws/redshift/model/EnableLoggingResult.h>
@@ -87,6 +89,7 @@
 #include <aws/redshift/model/ModifyScheduledActionResult.h>
 #include <aws/redshift/model/ModifySnapshotCopyRetentionPeriodResult.h>
 #include <aws/redshift/model/ModifySnapshotScheduleResult.h>
+#include <aws/redshift/model/ModifyUsageLimitResult.h>
 #include <aws/redshift/model/PauseClusterResult.h>
 #include <aws/redshift/model/PurchaseReservedNodeOfferingResult.h>
 #include <aws/redshift/model/RebootClusterResult.h>
@@ -163,6 +166,7 @@ namespace Model
         class CreateSnapshotCopyGrantRequest;
         class CreateSnapshotScheduleRequest;
         class CreateTagsRequest;
+        class CreateUsageLimitRequest;
         class DeleteClusterRequest;
         class DeleteClusterParameterGroupRequest;
         class DeleteClusterSecurityGroupRequest;
@@ -175,6 +179,7 @@ namespace Model
         class DeleteSnapshotCopyGrantRequest;
         class DeleteSnapshotScheduleRequest;
         class DeleteTagsRequest;
+        class DeleteUsageLimitRequest;
         class DescribeAccountAttributesRequest;
         class DescribeClusterDbRevisionsRequest;
         class DescribeClusterParameterGroupsRequest;
@@ -203,6 +208,7 @@ namespace Model
         class DescribeStorageRequest;
         class DescribeTableRestoreStatusRequest;
         class DescribeTagsRequest;
+        class DescribeUsageLimitsRequest;
         class DisableLoggingRequest;
         class DisableSnapshotCopyRequest;
         class EnableLoggingRequest;
@@ -221,6 +227,7 @@ namespace Model
         class ModifyScheduledActionRequest;
         class ModifySnapshotCopyRetentionPeriodRequest;
         class ModifySnapshotScheduleRequest;
+        class ModifyUsageLimitRequest;
         class PauseClusterRequest;
         class PurchaseReservedNodeOfferingRequest;
         class RebootClusterRequest;
@@ -252,6 +259,7 @@ namespace Model
         typedef Aws::Utils::Outcome<CreateSnapshotCopyGrantResult, Aws::Client::AWSError<RedshiftErrors>> CreateSnapshotCopyGrantOutcome;
         typedef Aws::Utils::Outcome<CreateSnapshotScheduleResult, Aws::Client::AWSError<RedshiftErrors>> CreateSnapshotScheduleOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> CreateTagsOutcome;
+        typedef Aws::Utils::Outcome<CreateUsageLimitResult, Aws::Client::AWSError<RedshiftErrors>> CreateUsageLimitOutcome;
         typedef Aws::Utils::Outcome<DeleteClusterResult, Aws::Client::AWSError<RedshiftErrors>> DeleteClusterOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> DeleteClusterParameterGroupOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> DeleteClusterSecurityGroupOutcome;
@@ -264,6 +272,7 @@ namespace Model
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> DeleteSnapshotCopyGrantOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> DeleteSnapshotScheduleOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> DeleteTagsOutcome;
+        typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<RedshiftErrors>> DeleteUsageLimitOutcome;
         typedef Aws::Utils::Outcome<DescribeAccountAttributesResult, Aws::Client::AWSError<RedshiftErrors>> DescribeAccountAttributesOutcome;
         typedef Aws::Utils::Outcome<DescribeClusterDbRevisionsResult, Aws::Client::AWSError<RedshiftErrors>> DescribeClusterDbRevisionsOutcome;
         typedef Aws::Utils::Outcome<DescribeClusterParameterGroupsResult, Aws::Client::AWSError<RedshiftErrors>> DescribeClusterParameterGroupsOutcome;
@@ -292,6 +301,7 @@ namespace Model
         typedef Aws::Utils::Outcome<DescribeStorageResult, Aws::Client::AWSError<RedshiftErrors>> DescribeStorageOutcome;
         typedef Aws::Utils::Outcome<DescribeTableRestoreStatusResult, Aws::Client::AWSError<RedshiftErrors>> DescribeTableRestoreStatusOutcome;
         typedef Aws::Utils::Outcome<DescribeTagsResult, Aws::Client::AWSError<RedshiftErrors>> DescribeTagsOutcome;
+        typedef Aws::Utils::Outcome<DescribeUsageLimitsResult, Aws::Client::AWSError<RedshiftErrors>> DescribeUsageLimitsOutcome;
         typedef Aws::Utils::Outcome<DisableLoggingResult, Aws::Client::AWSError<RedshiftErrors>> DisableLoggingOutcome;
         typedef Aws::Utils::Outcome<DisableSnapshotCopyResult, Aws::Client::AWSError<RedshiftErrors>> DisableSnapshotCopyOutcome;
         typedef Aws::Utils::Outcome<EnableLoggingResult, Aws::Client::AWSError<RedshiftErrors>> EnableLoggingOutcome;
@@ -310,6 +320,7 @@ namespace Model
         typedef Aws::Utils::Outcome<ModifyScheduledActionResult, Aws::Client::AWSError<RedshiftErrors>> ModifyScheduledActionOutcome;
         typedef Aws::Utils::Outcome<ModifySnapshotCopyRetentionPeriodResult, Aws::Client::AWSError<RedshiftErrors>> ModifySnapshotCopyRetentionPeriodOutcome;
         typedef Aws::Utils::Outcome<ModifySnapshotScheduleResult, Aws::Client::AWSError<RedshiftErrors>> ModifySnapshotScheduleOutcome;
+        typedef Aws::Utils::Outcome<ModifyUsageLimitResult, Aws::Client::AWSError<RedshiftErrors>> ModifyUsageLimitOutcome;
         typedef Aws::Utils::Outcome<PauseClusterResult, Aws::Client::AWSError<RedshiftErrors>> PauseClusterOutcome;
         typedef Aws::Utils::Outcome<PurchaseReservedNodeOfferingResult, Aws::Client::AWSError<RedshiftErrors>> PurchaseReservedNodeOfferingOutcome;
         typedef Aws::Utils::Outcome<RebootClusterResult, Aws::Client::AWSError<RedshiftErrors>> RebootClusterOutcome;
@@ -341,6 +352,7 @@ namespace Model
         typedef std::future<CreateSnapshotCopyGrantOutcome> CreateSnapshotCopyGrantOutcomeCallable;
         typedef std::future<CreateSnapshotScheduleOutcome> CreateSnapshotScheduleOutcomeCallable;
         typedef std::future<CreateTagsOutcome> CreateTagsOutcomeCallable;
+        typedef std::future<CreateUsageLimitOutcome> CreateUsageLimitOutcomeCallable;
         typedef std::future<DeleteClusterOutcome> DeleteClusterOutcomeCallable;
         typedef std::future<DeleteClusterParameterGroupOutcome> DeleteClusterParameterGroupOutcomeCallable;
         typedef std::future<DeleteClusterSecurityGroupOutcome> DeleteClusterSecurityGroupOutcomeCallable;
@@ -353,6 +365,7 @@ namespace Model
         typedef std::future<DeleteSnapshotCopyGrantOutcome> DeleteSnapshotCopyGrantOutcomeCallable;
         typedef std::future<DeleteSnapshotScheduleOutcome> DeleteSnapshotScheduleOutcomeCallable;
         typedef std::future<DeleteTagsOutcome> DeleteTagsOutcomeCallable;
+        typedef std::future<DeleteUsageLimitOutcome> DeleteUsageLimitOutcomeCallable;
         typedef std::future<DescribeAccountAttributesOutcome> DescribeAccountAttributesOutcomeCallable;
         typedef std::future<DescribeClusterDbRevisionsOutcome> DescribeClusterDbRevisionsOutcomeCallable;
         typedef std::future<DescribeClusterParameterGroupsOutcome> DescribeClusterParameterGroupsOutcomeCallable;
@@ -381,6 +394,7 @@ namespace Model
         typedef std::future<DescribeStorageOutcome> DescribeStorageOutcomeCallable;
         typedef std::future<DescribeTableRestoreStatusOutcome> DescribeTableRestoreStatusOutcomeCallable;
         typedef std::future<DescribeTagsOutcome> DescribeTagsOutcomeCallable;
+        typedef std::future<DescribeUsageLimitsOutcome> DescribeUsageLimitsOutcomeCallable;
         typedef std::future<DisableLoggingOutcome> DisableLoggingOutcomeCallable;
         typedef std::future<DisableSnapshotCopyOutcome> DisableSnapshotCopyOutcomeCallable;
         typedef std::future<EnableLoggingOutcome> EnableLoggingOutcomeCallable;
@@ -399,6 +413,7 @@ namespace Model
         typedef std::future<ModifyScheduledActionOutcome> ModifyScheduledActionOutcomeCallable;
         typedef std::future<ModifySnapshotCopyRetentionPeriodOutcome> ModifySnapshotCopyRetentionPeriodOutcomeCallable;
         typedef std::future<ModifySnapshotScheduleOutcome> ModifySnapshotScheduleOutcomeCallable;
+        typedef std::future<ModifyUsageLimitOutcome> ModifyUsageLimitOutcomeCallable;
         typedef std::future<PauseClusterOutcome> PauseClusterOutcomeCallable;
         typedef std::future<PurchaseReservedNodeOfferingOutcome> PurchaseReservedNodeOfferingOutcomeCallable;
         typedef std::future<RebootClusterOutcome> RebootClusterOutcomeCallable;
@@ -433,6 +448,7 @@ namespace Model
     typedef std::function<void(const RedshiftClient*, const Model::CreateSnapshotCopyGrantRequest&, const Model::CreateSnapshotCopyGrantOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateSnapshotCopyGrantResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::CreateSnapshotScheduleRequest&, const Model::CreateSnapshotScheduleOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateSnapshotScheduleResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::CreateTagsRequest&, const Model::CreateTagsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateTagsResponseReceivedHandler;
+    typedef std::function<void(const RedshiftClient*, const Model::CreateUsageLimitRequest&, const Model::CreateUsageLimitOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateUsageLimitResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DeleteClusterRequest&, const Model::DeleteClusterOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteClusterResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DeleteClusterParameterGroupRequest&, const Model::DeleteClusterParameterGroupOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteClusterParameterGroupResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DeleteClusterSecurityGroupRequest&, const Model::DeleteClusterSecurityGroupOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteClusterSecurityGroupResponseReceivedHandler;
@@ -445,6 +461,7 @@ namespace Model
     typedef std::function<void(const RedshiftClient*, const Model::DeleteSnapshotCopyGrantRequest&, const Model::DeleteSnapshotCopyGrantOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteSnapshotCopyGrantResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DeleteSnapshotScheduleRequest&, const Model::DeleteSnapshotScheduleOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteSnapshotScheduleResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DeleteTagsRequest&, const Model::DeleteTagsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteTagsResponseReceivedHandler;
+    typedef std::function<void(const RedshiftClient*, const Model::DeleteUsageLimitRequest&, const Model::DeleteUsageLimitOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteUsageLimitResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DescribeAccountAttributesRequest&, const Model::DescribeAccountAttributesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeAccountAttributesResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DescribeClusterDbRevisionsRequest&, const Model::DescribeClusterDbRevisionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterDbRevisionsResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DescribeClusterParameterGroupsRequest&, const Model::DescribeClusterParameterGroupsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterParameterGroupsResponseReceivedHandler;
@@ -473,6 +490,7 @@ namespace Model
     typedef std::function<void(const RedshiftClient*, const Model::DescribeStorageRequest&, const Model::DescribeStorageOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeStorageResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DescribeTableRestoreStatusRequest&, const Model::DescribeTableRestoreStatusOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeTableRestoreStatusResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DescribeTagsRequest&, const Model::DescribeTagsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeTagsResponseReceivedHandler;
+    typedef std::function<void(const RedshiftClient*, const Model::DescribeUsageLimitsRequest&, const Model::DescribeUsageLimitsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeUsageLimitsResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DisableLoggingRequest&, const Model::DisableLoggingOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DisableLoggingResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::DisableSnapshotCopyRequest&, const Model::DisableSnapshotCopyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DisableSnapshotCopyResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::EnableLoggingRequest&, const Model::EnableLoggingOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > EnableLoggingResponseReceivedHandler;
@@ -491,6 +509,7 @@ namespace Model
     typedef std::function<void(const RedshiftClient*, const Model::ModifyScheduledActionRequest&, const Model::ModifyScheduledActionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ModifyScheduledActionResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::ModifySnapshotCopyRetentionPeriodRequest&, const Model::ModifySnapshotCopyRetentionPeriodOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ModifySnapshotCopyRetentionPeriodResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::ModifySnapshotScheduleRequest&, const Model::ModifySnapshotScheduleOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ModifySnapshotScheduleResponseReceivedHandler;
+    typedef std::function<void(const RedshiftClient*, const Model::ModifyUsageLimitRequest&, const Model::ModifyUsageLimitOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ModifyUsageLimitResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::PauseClusterRequest&, const Model::PauseClusterOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PauseClusterResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::PurchaseReservedNodeOfferingRequest&, const Model::PurchaseReservedNodeOfferingOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PurchaseReservedNodeOfferingResponseReceivedHandler;
     typedef std::function<void(const RedshiftClient*, const Model::RebootClusterRequest&, const Model::RebootClusterOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > RebootClusterResponseReceivedHandler;
@@ -1385,6 +1404,37 @@ namespace Model
          */
         virtual void CreateTagsAsync(const Model::CreateTagsRequest& request, const CreateTagsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p>Creates a usage limit for a specified Amazon Redshift feature on a cluster.
+         * The usage limit is identified by the returned usage limit
+         * identifier.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateUsageLimit">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::CreateUsageLimitOutcome CreateUsageLimit(const Model::CreateUsageLimitRequest& request) const;
+
+        /**
+         * <p>Creates a usage limit for a specified Amazon Redshift feature on a cluster.
+         * The usage limit is identified by the returned usage limit
+         * identifier.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateUsageLimit">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::CreateUsageLimitOutcomeCallable CreateUsageLimitCallable(const Model::CreateUsageLimitRequest& request) const;
+
+        /**
+         * <p>Creates a usage limit for a specified Amazon Redshift feature on a cluster.
+         * The usage limit is identified by the returned usage limit
+         * identifier.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateUsageLimit">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void CreateUsageLimitAsync(const Model::CreateUsageLimitRequest& request, const CreateUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
         /**
          * <p>Deletes a previously provisioned cluster without its final snapshot being
          * created. A successful response from the web service indicates that the request
@@ -1787,6 +1837,31 @@ namespace Model
          */
         virtual void DeleteTagsAsync(const Model::DeleteTagsRequest& request, const DeleteTagsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p>Deletes a usage limit from a cluster.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteUsageLimit">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DeleteUsageLimitOutcome DeleteUsageLimit(const Model::DeleteUsageLimitRequest& request) const;
+
+        /**
+         * <p>Deletes a usage limit from a cluster.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteUsageLimit">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::DeleteUsageLimitOutcomeCallable DeleteUsageLimitCallable(const Model::DeleteUsageLimitRequest& request) const;
+
+        /**
+         * <p>Deletes a usage limit from a cluster.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteUsageLimit">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void DeleteUsageLimitAsync(const Model::DeleteUsageLimitRequest& request, const DeleteUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
         /**
          * <p>Returns a list of attributes attached to an account</p><p><h3>See Also:</h3> 
          * <a
@@ -3042,6 +3117,61 @@ namespace Model
          */
         virtual void DescribeTagsAsync(const Model::DescribeTagsRequest& request, const DescribeTagsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p>Shows usage limits on a cluster. Results are filtered based on the
+         * combination of input usage limit identifier, cluster identifier, and feature
+         * type parameters:</p> <ul> <li> <p>If usage limit identifier, cluster identifier,
+         * and feature type are not provided, then all usage limit objects for the current
+         * account in the current region are returned.</p> </li> <li> <p>If usage limit
+         * identifier is provided, then the corresponding usage limit object is
+         * returned.</p> </li> <li> <p>If cluster identifier is provided, then all usage
+         * limit objects for the specified cluster are returned.</p> </li> <li> <p>If
+         * cluster identifier and feature type are provided, then all usage limit objects
+         * for the combination of cluster and feature are returned.</p> </li>
+         * </ul><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeUsageLimits">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DescribeUsageLimitsOutcome DescribeUsageLimits(const Model::DescribeUsageLimitsRequest& request) const;
+
+        /**
+         * <p>Shows usage limits on a cluster. Results are filtered based on the
+         * combination of input usage limit identifier, cluster identifier, and feature
+         * type parameters:</p> <ul> <li> <p>If usage limit identifier, cluster identifier,
+         * and feature type are not provided, then all usage limit objects for the current
+         * account in the current region are returned.</p> </li> <li> <p>If usage limit
+         * identifier is provided, then the corresponding usage limit object is
+         * returned.</p> </li> <li> <p>If cluster identifier is provided, then all usage
+         * limit objects for the specified cluster are returned.</p> </li> <li> <p>If
+         * cluster identifier and feature type are provided, then all usage limit objects
+         * for the combination of cluster and feature are returned.</p> </li>
+         * </ul><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeUsageLimits">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::DescribeUsageLimitsOutcomeCallable DescribeUsageLimitsCallable(const Model::DescribeUsageLimitsRequest& request) const;
+
+        /**
+         * <p>Shows usage limits on a cluster. Results are filtered based on the
+         * combination of input usage limit identifier, cluster identifier, and feature
+         * type parameters:</p> <ul> <li> <p>If usage limit identifier, cluster identifier,
+         * and feature type are not provided, then all usage limit objects for the current
+         * account in the current region are returned.</p> </li> <li> <p>If usage limit
+         * identifier is provided, then the corresponding usage limit object is
+         * returned.</p> </li> <li> <p>If cluster identifier is provided, then all usage
+         * limit objects for the specified cluster are returned.</p> </li> <li> <p>If
+         * cluster identifier and feature type are provided, then all usage limit objects
+         * for the combination of cluster and feature are returned.</p> </li>
+         * </ul><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeUsageLimits">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void DescribeUsageLimitsAsync(const Model::DescribeUsageLimitsRequest& request, const DescribeUsageLimitsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
         /**
          * <p>Stops logging information, such as queries and connection attempts, for the
          * specified Amazon Redshift cluster.</p><p><h3>See Also:</h3>   <a
@@ -3681,6 +3811,34 @@ namespace Model
          */
         virtual void ModifySnapshotScheduleAsync(const Model::ModifySnapshotScheduleRequest& request, const ModifySnapshotScheduleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
+        /**
+         * <p>Modifies a usage limit in a cluster. You can't modify the feature type or
+         * period of a usage limit.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyUsageLimit">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ModifyUsageLimitOutcome ModifyUsageLimit(const Model::ModifyUsageLimitRequest& request) const;
+
+        /**
+         * <p>Modifies a usage limit in a cluster. You can't modify the feature type or
+         * period of a usage limit.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyUsageLimit">AWS
+         * API Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::ModifyUsageLimitOutcomeCallable ModifyUsageLimitCallable(const Model::ModifyUsageLimitRequest& request) const;
+
+        /**
+         * <p>Modifies a usage limit in a cluster. You can't modify the feature type or
+         * period of a usage limit.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyUsageLimit">AWS
+         * API Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void ModifyUsageLimitAsync(const Model::ModifyUsageLimitRequest& request, const ModifyUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
         /**
          * <p>Pauses a cluster.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/PauseCluster">AWS
@@ -4171,6 +4329,7 @@ namespace Model
         void CreateSnapshotCopyGrantAsyncHelper(const Model::CreateSnapshotCopyGrantRequest& request, const CreateSnapshotCopyGrantResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void CreateSnapshotScheduleAsyncHelper(const Model::CreateSnapshotScheduleRequest& request, const CreateSnapshotScheduleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void CreateTagsAsyncHelper(const Model::CreateTagsRequest& request, const CreateTagsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void CreateUsageLimitAsyncHelper(const Model::CreateUsageLimitRequest& request, const CreateUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DeleteClusterAsyncHelper(const Model::DeleteClusterRequest& request, const DeleteClusterResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DeleteClusterParameterGroupAsyncHelper(const Model::DeleteClusterParameterGroupRequest& request, const DeleteClusterParameterGroupResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DeleteClusterSecurityGroupAsyncHelper(const Model::DeleteClusterSecurityGroupRequest& request, const DeleteClusterSecurityGroupResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
@@ -4183,6 +4342,7 @@ namespace Model
         void DeleteSnapshotCopyGrantAsyncHelper(const Model::DeleteSnapshotCopyGrantRequest& request, const DeleteSnapshotCopyGrantResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DeleteSnapshotScheduleAsyncHelper(const Model::DeleteSnapshotScheduleRequest& request, const DeleteSnapshotScheduleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DeleteTagsAsyncHelper(const Model::DeleteTagsRequest& request, const DeleteTagsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void DeleteUsageLimitAsyncHelper(const Model::DeleteUsageLimitRequest& request, const DeleteUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DescribeAccountAttributesAsyncHelper(const Model::DescribeAccountAttributesRequest& request, const DescribeAccountAttributesResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DescribeClusterDbRevisionsAsyncHelper(const Model::DescribeClusterDbRevisionsRequest& request, const DescribeClusterDbRevisionsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DescribeClusterParameterGroupsAsyncHelper(const Model::DescribeClusterParameterGroupsRequest& request, const DescribeClusterParameterGroupsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
@@ -4211,6 +4371,7 @@ namespace Model
         void DescribeStorageAsyncHelper(const Model::DescribeStorageRequest& request, const DescribeStorageResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DescribeTableRestoreStatusAsyncHelper(const Model::DescribeTableRestoreStatusRequest& request, const DescribeTableRestoreStatusResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DescribeTagsAsyncHelper(const Model::DescribeTagsRequest& request, const DescribeTagsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void DescribeUsageLimitsAsyncHelper(const Model::DescribeUsageLimitsRequest& request, const DescribeUsageLimitsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DisableLoggingAsyncHelper(const Model::DisableLoggingRequest& request, const DisableLoggingResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void DisableSnapshotCopyAsyncHelper(const Model::DisableSnapshotCopyRequest& request, const DisableSnapshotCopyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void EnableLoggingAsyncHelper(const Model::EnableLoggingRequest& request, const EnableLoggingResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
@@ -4229,6 +4390,7 @@ namespace Model
         void ModifyScheduledActionAsyncHelper(const Model::ModifyScheduledActionRequest& request, const ModifyScheduledActionResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void ModifySnapshotCopyRetentionPeriodAsyncHelper(const Model::ModifySnapshotCopyRetentionPeriodRequest& request, const ModifySnapshotCopyRetentionPeriodResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void ModifySnapshotScheduleAsyncHelper(const Model::ModifySnapshotScheduleRequest& request, const ModifySnapshotScheduleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void ModifyUsageLimitAsyncHelper(const Model::ModifyUsageLimitRequest& request, const ModifyUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void PauseClusterAsyncHelper(const Model::PauseClusterRequest& request, const PauseClusterResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void PurchaseReservedNodeOfferingAsyncHelper(const Model::PurchaseReservedNodeOfferingRequest& request, const PurchaseReservedNodeOfferingResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void RebootClusterAsyncHelper(const Model::RebootClusterRequest& request, const RebootClusterResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftErrors.h b/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftErrors.h
index a981bd440c7..66581f1d613 100644
--- a/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftErrors.h
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/RedshiftErrors.h
@@ -116,6 +116,7 @@ enum class RedshiftErrors
   INVALID_SUBSCRIPTION_STATE_FAULT,
   INVALID_TABLE_RESTORE_ARGUMENT_FAULT,
   INVALID_TAG_FAULT,
+  INVALID_USAGE_LIMIT_FAULT,
   INVALID_V_P_C_NETWORK_STATE_FAULT,
   IN_PROGRESS_TABLE_RESTORE_QUOTA_EXCEEDED_FAULT,
   LIMIT_EXCEEDED_FAULT,
@@ -159,7 +160,9 @@ enum class RedshiftErrors
   UNAUTHORIZED_OPERATION,
   UNKNOWN_SNAPSHOT_COPY_REGION_FAULT,
   UNSUPPORTED_OPERATION_FAULT,
-  UNSUPPORTED_OPTION_FAULT
+  UNSUPPORTED_OPTION_FAULT,
+  USAGE_LIMIT_ALREADY_EXISTS_FAULT,
+  USAGE_LIMIT_NOT_FOUND_FAULT
 };
 namespace RedshiftErrorMapper
 {
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitRequest.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitRequest.h
new file mode 100644
index 00000000000..4218e2e35ff
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitRequest.h
@@ -0,0 +1,347 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/redshift/RedshiftRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/UsageLimitFeatureType.h>
+#include <aws/redshift/model/UsageLimitLimitType.h>
+#include <aws/redshift/model/UsageLimitPeriod.h>
+#include <aws/redshift/model/UsageLimitBreachAction.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/redshift/model/Tag.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_REDSHIFT_API CreateUsageLimitRequest : public RedshiftRequest
+  {
+  public:
+    CreateUsageLimitRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "CreateUsageLimit"; }
+
+    Aws::String SerializePayload() const override;
+
+  protected:
+    void DumpBodyToUrl(Aws::Http::URI& uri ) const override;
+
+  public:
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline const Aws::String& GetClusterIdentifier() const{ return m_clusterIdentifier; }
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline bool ClusterIdentifierHasBeenSet() const { return m_clusterIdentifierHasBeenSet; }
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline void SetClusterIdentifier(const Aws::String& value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier = value; }
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline void SetClusterIdentifier(Aws::String&& value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier = std::move(value); }
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline void SetClusterIdentifier(const char* value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier.assign(value); }
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline CreateUsageLimitRequest& WithClusterIdentifier(const Aws::String& value) { SetClusterIdentifier(value); return *this;}
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline CreateUsageLimitRequest& WithClusterIdentifier(Aws::String&& value) { SetClusterIdentifier(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the cluster that you want to limit usage.</p>
+     */
+    inline CreateUsageLimitRequest& WithClusterIdentifier(const char* value) { SetClusterIdentifier(value); return *this;}
+
+
+    /**
+     * <p>The Amazon Redshift feature that you want to limit.</p>
+     */
+    inline const UsageLimitFeatureType& GetFeatureType() const{ return m_featureType; }
+
+    /**
+     * <p>The Amazon Redshift feature that you want to limit.</p>
+     */
+    inline bool FeatureTypeHasBeenSet() const { return m_featureTypeHasBeenSet; }
+
+    /**
+     * <p>The Amazon Redshift feature that you want to limit.</p>
+     */
+    inline void SetFeatureType(const UsageLimitFeatureType& value) { m_featureTypeHasBeenSet = true; m_featureType = value; }
+
+    /**
+     * <p>The Amazon Redshift feature that you want to limit.</p>
+     */
+    inline void SetFeatureType(UsageLimitFeatureType&& value) { m_featureTypeHasBeenSet = true; m_featureType = std::move(value); }
+
+    /**
+     * <p>The Amazon Redshift feature that you want to limit.</p>
+     */
+    inline CreateUsageLimitRequest& WithFeatureType(const UsageLimitFeatureType& value) { SetFeatureType(value); return *this;}
+
+    /**
+     * <p>The Amazon Redshift feature that you want to limit.</p>
+     */
+    inline CreateUsageLimitRequest& WithFeatureType(UsageLimitFeatureType&& value) { SetFeatureType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size. If <code>FeatureType</code> is <code>spectrum</code>,
+     * then <code>LimitType</code> must be <code>data-scanned</code>. If
+     * <code>FeatureType</code> is <code>concurrency-scaling</code>, then
+     * <code>LimitType</code> must be <code>time</code>. </p>
+     */
+    inline const UsageLimitLimitType& GetLimitType() const{ return m_limitType; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size. If <code>FeatureType</code> is <code>spectrum</code>,
+     * then <code>LimitType</code> must be <code>data-scanned</code>. If
+     * <code>FeatureType</code> is <code>concurrency-scaling</code>, then
+     * <code>LimitType</code> must be <code>time</code>. </p>
+     */
+    inline bool LimitTypeHasBeenSet() const { return m_limitTypeHasBeenSet; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size. If <code>FeatureType</code> is <code>spectrum</code>,
+     * then <code>LimitType</code> must be <code>data-scanned</code>. If
+     * <code>FeatureType</code> is <code>concurrency-scaling</code>, then
+     * <code>LimitType</code> must be <code>time</code>. </p>
+     */
+    inline void SetLimitType(const UsageLimitLimitType& value) { m_limitTypeHasBeenSet = true; m_limitType = value; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size. If <code>FeatureType</code> is <code>spectrum</code>,
+     * then <code>LimitType</code> must be <code>data-scanned</code>. If
+     * <code>FeatureType</code> is <code>concurrency-scaling</code>, then
+     * <code>LimitType</code> must be <code>time</code>. </p>
+     */
+    inline void SetLimitType(UsageLimitLimitType&& value) { m_limitTypeHasBeenSet = true; m_limitType = std::move(value); }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size. If <code>FeatureType</code> is <code>spectrum</code>,
+     * then <code>LimitType</code> must be <code>data-scanned</code>. If
+     * <code>FeatureType</code> is <code>concurrency-scaling</code>, then
+     * <code>LimitType</code> must be <code>time</code>. </p>
+     */
+    inline CreateUsageLimitRequest& WithLimitType(const UsageLimitLimitType& value) { SetLimitType(value); return *this;}
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size. If <code>FeatureType</code> is <code>spectrum</code>,
+     * then <code>LimitType</code> must be <code>data-scanned</code>. If
+     * <code>FeatureType</code> is <code>concurrency-scaling</code>, then
+     * <code>LimitType</code> must be <code>time</code>. </p>
+     */
+    inline CreateUsageLimitRequest& WithLimitType(UsageLimitLimitType&& value) { SetLimitType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB). The value must be a positive number. </p>
+     */
+    inline long long GetAmount() const{ return m_amount; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB). The value must be a positive number. </p>
+     */
+    inline bool AmountHasBeenSet() const { return m_amountHasBeenSet; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB). The value must be a positive number. </p>
+     */
+    inline void SetAmount(long long value) { m_amountHasBeenSet = true; m_amount = value; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB). The value must be a positive number. </p>
+     */
+    inline CreateUsageLimitRequest& WithAmount(long long value) { SetAmount(value); return *this;}
+
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline const UsageLimitPeriod& GetPeriod() const{ return m_period; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline bool PeriodHasBeenSet() const { return m_periodHasBeenSet; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(const UsageLimitPeriod& value) { m_periodHasBeenSet = true; m_period = value; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(UsageLimitPeriod&& value) { m_periodHasBeenSet = true; m_period = std::move(value); }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline CreateUsageLimitRequest& WithPeriod(const UsageLimitPeriod& value) { SetPeriod(value); return *this;}
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline CreateUsageLimitRequest& WithPeriod(UsageLimitPeriod&& value) { SetPeriod(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. The default
+     * is log. For more information about this parameter, see <a>UsageLimit</a>.</p>
+     */
+    inline const UsageLimitBreachAction& GetBreachAction() const{ return m_breachAction; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. The default
+     * is log. For more information about this parameter, see <a>UsageLimit</a>.</p>
+     */
+    inline bool BreachActionHasBeenSet() const { return m_breachActionHasBeenSet; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. The default
+     * is log. For more information about this parameter, see <a>UsageLimit</a>.</p>
+     */
+    inline void SetBreachAction(const UsageLimitBreachAction& value) { m_breachActionHasBeenSet = true; m_breachAction = value; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. The default
+     * is log. For more information about this parameter, see <a>UsageLimit</a>.</p>
+     */
+    inline void SetBreachAction(UsageLimitBreachAction&& value) { m_breachActionHasBeenSet = true; m_breachAction = std::move(value); }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. The default
+     * is log. For more information about this parameter, see <a>UsageLimit</a>.</p>
+     */
+    inline CreateUsageLimitRequest& WithBreachAction(const UsageLimitBreachAction& value) { SetBreachAction(value); return *this;}
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. The default
+     * is log. For more information about this parameter, see <a>UsageLimit</a>.</p>
+     */
+    inline CreateUsageLimitRequest& WithBreachAction(UsageLimitBreachAction&& value) { SetBreachAction(std::move(value)); return *this;}
+
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline bool TagsHasBeenSet() const { return m_tagsHasBeenSet; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tagsHasBeenSet = true; m_tags = value; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tagsHasBeenSet = true; m_tags = std::move(value); }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitRequest& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitRequest& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitRequest& AddTags(const Tag& value) { m_tagsHasBeenSet = true; m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitRequest& AddTags(Tag&& value) { m_tagsHasBeenSet = true; m_tags.push_back(std::move(value)); return *this; }
+
+  private:
+
+    Aws::String m_clusterIdentifier;
+    bool m_clusterIdentifierHasBeenSet;
+
+    UsageLimitFeatureType m_featureType;
+    bool m_featureTypeHasBeenSet;
+
+    UsageLimitLimitType m_limitType;
+    bool m_limitTypeHasBeenSet;
+
+    long long m_amount;
+    bool m_amountHasBeenSet;
+
+    UsageLimitPeriod m_period;
+    bool m_periodHasBeenSet;
+
+    UsageLimitBreachAction m_breachAction;
+    bool m_breachActionHasBeenSet;
+
+    Aws::Vector<Tag> m_tags;
+    bool m_tagsHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitResult.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitResult.h
new file mode 100644
index 00000000000..bc006672872
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/CreateUsageLimitResult.h
@@ -0,0 +1,356 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/UsageLimitFeatureType.h>
+#include <aws/redshift/model/UsageLimitLimitType.h>
+#include <aws/redshift/model/UsageLimitPeriod.h>
+#include <aws/redshift/model/UsageLimitBreachAction.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/redshift/model/ResponseMetadata.h>
+#include <aws/redshift/model/Tag.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Xml
+{
+  class XmlDocument;
+} // namespace Xml
+} // namespace Utils
+namespace Redshift
+{
+namespace Model
+{
+  /**
+   * <p>Describes a usage limit object for a cluster. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/UsageLimit">AWS
+   * API Reference</a></p>
+   */
+  class AWS_REDSHIFT_API CreateUsageLimitResult
+  {
+  public:
+    CreateUsageLimitResult();
+    CreateUsageLimitResult(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+    CreateUsageLimitResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline const Aws::String& GetUsageLimitId() const{ return m_usageLimitId; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(const Aws::String& value) { m_usageLimitId = value; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(Aws::String&& value) { m_usageLimitId = std::move(value); }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(const char* value) { m_usageLimitId.assign(value); }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline CreateUsageLimitResult& WithUsageLimitId(const Aws::String& value) { SetUsageLimitId(value); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline CreateUsageLimitResult& WithUsageLimitId(Aws::String&& value) { SetUsageLimitId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline CreateUsageLimitResult& WithUsageLimitId(const char* value) { SetUsageLimitId(value); return *this;}
+
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline const Aws::String& GetClusterIdentifier() const{ return m_clusterIdentifier; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(const Aws::String& value) { m_clusterIdentifier = value; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(Aws::String&& value) { m_clusterIdentifier = std::move(value); }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(const char* value) { m_clusterIdentifier.assign(value); }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline CreateUsageLimitResult& WithClusterIdentifier(const Aws::String& value) { SetClusterIdentifier(value); return *this;}
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline CreateUsageLimitResult& WithClusterIdentifier(Aws::String&& value) { SetClusterIdentifier(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline CreateUsageLimitResult& WithClusterIdentifier(const char* value) { SetClusterIdentifier(value); return *this;}
+
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline const UsageLimitFeatureType& GetFeatureType() const{ return m_featureType; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline void SetFeatureType(const UsageLimitFeatureType& value) { m_featureType = value; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline void SetFeatureType(UsageLimitFeatureType&& value) { m_featureType = std::move(value); }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline CreateUsageLimitResult& WithFeatureType(const UsageLimitFeatureType& value) { SetFeatureType(value); return *this;}
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline CreateUsageLimitResult& WithFeatureType(UsageLimitFeatureType&& value) { SetFeatureType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline const UsageLimitLimitType& GetLimitType() const{ return m_limitType; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline void SetLimitType(const UsageLimitLimitType& value) { m_limitType = value; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline void SetLimitType(UsageLimitLimitType&& value) { m_limitType = std::move(value); }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline CreateUsageLimitResult& WithLimitType(const UsageLimitLimitType& value) { SetLimitType(value); return *this;}
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline CreateUsageLimitResult& WithLimitType(UsageLimitLimitType&& value) { SetLimitType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline long long GetAmount() const{ return m_amount; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline void SetAmount(long long value) { m_amount = value; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline CreateUsageLimitResult& WithAmount(long long value) { SetAmount(value); return *this;}
+
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline const UsageLimitPeriod& GetPeriod() const{ return m_period; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(const UsageLimitPeriod& value) { m_period = value; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(UsageLimitPeriod&& value) { m_period = std::move(value); }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline CreateUsageLimitResult& WithPeriod(const UsageLimitPeriod& value) { SetPeriod(value); return *this;}
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline CreateUsageLimitResult& WithPeriod(UsageLimitPeriod&& value) { SetPeriod(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline const UsageLimitBreachAction& GetBreachAction() const{ return m_breachAction; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline void SetBreachAction(const UsageLimitBreachAction& value) { m_breachAction = value; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline void SetBreachAction(UsageLimitBreachAction&& value) { m_breachAction = std::move(value); }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline CreateUsageLimitResult& WithBreachAction(const UsageLimitBreachAction& value) { SetBreachAction(value); return *this;}
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline CreateUsageLimitResult& WithBreachAction(UsageLimitBreachAction&& value) { SetBreachAction(std::move(value)); return *this;}
+
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tags = value; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tags = std::move(value); }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitResult& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitResult& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitResult& AddTags(const Tag& value) { m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline CreateUsageLimitResult& AddTags(Tag&& value) { m_tags.push_back(std::move(value)); return *this; }
+
+
+    
+    inline const ResponseMetadata& GetResponseMetadata() const{ return m_responseMetadata; }
+
+    
+    inline void SetResponseMetadata(const ResponseMetadata& value) { m_responseMetadata = value; }
+
+    
+    inline void SetResponseMetadata(ResponseMetadata&& value) { m_responseMetadata = std::move(value); }
+
+    
+    inline CreateUsageLimitResult& WithResponseMetadata(const ResponseMetadata& value) { SetResponseMetadata(value); return *this;}
+
+    
+    inline CreateUsageLimitResult& WithResponseMetadata(ResponseMetadata&& value) { SetResponseMetadata(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_usageLimitId;
+
+    Aws::String m_clusterIdentifier;
+
+    UsageLimitFeatureType m_featureType;
+
+    UsageLimitLimitType m_limitType;
+
+    long long m_amount;
+
+    UsageLimitPeriod m_period;
+
+    UsageLimitBreachAction m_breachAction;
+
+    Aws::Vector<Tag> m_tags;
+
+    ResponseMetadata m_responseMetadata;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/DeleteUsageLimitRequest.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/DeleteUsageLimitRequest.h
new file mode 100644
index 00000000000..5129226496b
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/DeleteUsageLimitRequest.h
@@ -0,0 +1,97 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/redshift/RedshiftRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_REDSHIFT_API DeleteUsageLimitRequest : public RedshiftRequest
+  {
+  public:
+    DeleteUsageLimitRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "DeleteUsageLimit"; }
+
+    Aws::String SerializePayload() const override;
+
+  protected:
+    void DumpBodyToUrl(Aws::Http::URI& uri ) const override;
+
+  public:
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline const Aws::String& GetUsageLimitId() const{ return m_usageLimitId; }
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline bool UsageLimitIdHasBeenSet() const { return m_usageLimitIdHasBeenSet; }
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline void SetUsageLimitId(const Aws::String& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = value; }
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline void SetUsageLimitId(Aws::String&& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = std::move(value); }
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline void SetUsageLimitId(const char* value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId.assign(value); }
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline DeleteUsageLimitRequest& WithUsageLimitId(const Aws::String& value) { SetUsageLimitId(value); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline DeleteUsageLimitRequest& WithUsageLimitId(Aws::String&& value) { SetUsageLimitId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit to delete.</p>
+     */
+    inline DeleteUsageLimitRequest& WithUsageLimitId(const char* value) { SetUsageLimitId(value); return *this;}
+
+  private:
+
+    Aws::String m_usageLimitId;
+    bool m_usageLimitIdHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsRequest.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsRequest.h
new file mode 100644
index 00000000000..4179dbb9df3
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsRequest.h
@@ -0,0 +1,501 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/redshift/RedshiftRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/UsageLimitFeatureType.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_REDSHIFT_API DescribeUsageLimitsRequest : public RedshiftRequest
+  {
+  public:
+    DescribeUsageLimitsRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "DescribeUsageLimits"; }
+
+    Aws::String SerializePayload() const override;
+
+  protected:
+    void DumpBodyToUrl(Aws::Http::URI& uri ) const override;
+
+  public:
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline const Aws::String& GetUsageLimitId() const{ return m_usageLimitId; }
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline bool UsageLimitIdHasBeenSet() const { return m_usageLimitIdHasBeenSet; }
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline void SetUsageLimitId(const Aws::String& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = value; }
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline void SetUsageLimitId(Aws::String&& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = std::move(value); }
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline void SetUsageLimitId(const char* value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId.assign(value); }
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithUsageLimitId(const Aws::String& value) { SetUsageLimitId(value); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithUsageLimitId(Aws::String&& value) { SetUsageLimitId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit to describe.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithUsageLimitId(const char* value) { SetUsageLimitId(value); return *this;}
+
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline const Aws::String& GetClusterIdentifier() const{ return m_clusterIdentifier; }
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline bool ClusterIdentifierHasBeenSet() const { return m_clusterIdentifierHasBeenSet; }
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline void SetClusterIdentifier(const Aws::String& value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier = value; }
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline void SetClusterIdentifier(Aws::String&& value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier = std::move(value); }
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline void SetClusterIdentifier(const char* value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier.assign(value); }
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithClusterIdentifier(const Aws::String& value) { SetClusterIdentifier(value); return *this;}
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithClusterIdentifier(Aws::String&& value) { SetClusterIdentifier(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the cluster for which you want to describe usage
+     * limits.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithClusterIdentifier(const char* value) { SetClusterIdentifier(value); return *this;}
+
+
+    /**
+     * <p>The feature type for which you want to describe usage limits.</p>
+     */
+    inline const UsageLimitFeatureType& GetFeatureType() const{ return m_featureType; }
+
+    /**
+     * <p>The feature type for which you want to describe usage limits.</p>
+     */
+    inline bool FeatureTypeHasBeenSet() const { return m_featureTypeHasBeenSet; }
+
+    /**
+     * <p>The feature type for which you want to describe usage limits.</p>
+     */
+    inline void SetFeatureType(const UsageLimitFeatureType& value) { m_featureTypeHasBeenSet = true; m_featureType = value; }
+
+    /**
+     * <p>The feature type for which you want to describe usage limits.</p>
+     */
+    inline void SetFeatureType(UsageLimitFeatureType&& value) { m_featureTypeHasBeenSet = true; m_featureType = std::move(value); }
+
+    /**
+     * <p>The feature type for which you want to describe usage limits.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithFeatureType(const UsageLimitFeatureType& value) { SetFeatureType(value); return *this;}
+
+    /**
+     * <p>The feature type for which you want to describe usage limits.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithFeatureType(UsageLimitFeatureType&& value) { SetFeatureType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The maximum number of response records to return in each call. If the number
+     * of remaining response records exceeds the specified <code>MaxRecords</code>
+     * value, a value is returned in a <code>marker</code> field of the response. You
+     * can retrieve the next set of records by retrying the command with the returned
+     * marker value. </p> <p>Default: <code>100</code> </p> <p>Constraints: minimum 20,
+     * maximum 100.</p>
+     */
+    inline int GetMaxRecords() const{ return m_maxRecords; }
+
+    /**
+     * <p>The maximum number of response records to return in each call. If the number
+     * of remaining response records exceeds the specified <code>MaxRecords</code>
+     * value, a value is returned in a <code>marker</code> field of the response. You
+     * can retrieve the next set of records by retrying the command with the returned
+     * marker value. </p> <p>Default: <code>100</code> </p> <p>Constraints: minimum 20,
+     * maximum 100.</p>
+     */
+    inline bool MaxRecordsHasBeenSet() const { return m_maxRecordsHasBeenSet; }
+
+    /**
+     * <p>The maximum number of response records to return in each call. If the number
+     * of remaining response records exceeds the specified <code>MaxRecords</code>
+     * value, a value is returned in a <code>marker</code> field of the response. You
+     * can retrieve the next set of records by retrying the command with the returned
+     * marker value. </p> <p>Default: <code>100</code> </p> <p>Constraints: minimum 20,
+     * maximum 100.</p>
+     */
+    inline void SetMaxRecords(int value) { m_maxRecordsHasBeenSet = true; m_maxRecords = value; }
+
+    /**
+     * <p>The maximum number of response records to return in each call. If the number
+     * of remaining response records exceeds the specified <code>MaxRecords</code>
+     * value, a value is returned in a <code>marker</code> field of the response. You
+     * can retrieve the next set of records by retrying the command with the returned
+     * marker value. </p> <p>Default: <code>100</code> </p> <p>Constraints: minimum 20,
+     * maximum 100.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithMaxRecords(int value) { SetMaxRecords(value); return *this;}
+
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline const Aws::String& GetMarker() const{ return m_marker; }
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline bool MarkerHasBeenSet() const { return m_markerHasBeenSet; }
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline void SetMarker(const Aws::String& value) { m_markerHasBeenSet = true; m_marker = value; }
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline void SetMarker(Aws::String&& value) { m_markerHasBeenSet = true; m_marker = std::move(value); }
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline void SetMarker(const char* value) { m_markerHasBeenSet = true; m_marker.assign(value); }
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline DescribeUsageLimitsRequest& WithMarker(const Aws::String& value) { SetMarker(value); return *this;}
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline DescribeUsageLimitsRequest& WithMarker(Aws::String&& value) { SetMarker(std::move(value)); return *this;}
+
+    /**
+     * <p>An optional parameter that specifies the starting point to return a set of
+     * response records. When the results of a <a>DescribeUsageLimits</a> request
+     * exceed the value specified in <code>MaxRecords</code>, AWS returns a value in
+     * the <code>Marker</code> field of the response. You can retrieve the next set of
+     * response records by providing the returned marker value in the
+     * <code>Marker</code> parameter and retrying the request. </p>
+     */
+    inline DescribeUsageLimitsRequest& WithMarker(const char* value) { SetMarker(value); return *this;}
+
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetTagKeys() const{ return m_tagKeys; }
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline bool TagKeysHasBeenSet() const { return m_tagKeysHasBeenSet; }
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline void SetTagKeys(const Aws::Vector<Aws::String>& value) { m_tagKeysHasBeenSet = true; m_tagKeys = value; }
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline void SetTagKeys(Aws::Vector<Aws::String>&& value) { m_tagKeysHasBeenSet = true; m_tagKeys = std::move(value); }
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithTagKeys(const Aws::Vector<Aws::String>& value) { SetTagKeys(value); return *this;}
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithTagKeys(Aws::Vector<Aws::String>&& value) { SetTagKeys(std::move(value)); return *this;}
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& AddTagKeys(const Aws::String& value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(value); return *this; }
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& AddTagKeys(Aws::String&& value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p>A tag key or keys for which you want to return all matching usage limit
+     * objects that are associated with the specified key or keys. For example, suppose
+     * that you have parameter groups that are tagged with keys called
+     * <code>owner</code> and <code>environment</code>. If you specify both of these
+     * tag keys in the request, Amazon Redshift returns a response with the usage limit
+     * objects have either or both of these tag keys associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& AddTagKeys(const char* value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(value); return *this; }
+
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetTagValues() const{ return m_tagValues; }
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline bool TagValuesHasBeenSet() const { return m_tagValuesHasBeenSet; }
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline void SetTagValues(const Aws::Vector<Aws::String>& value) { m_tagValuesHasBeenSet = true; m_tagValues = value; }
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline void SetTagValues(Aws::Vector<Aws::String>&& value) { m_tagValuesHasBeenSet = true; m_tagValues = std::move(value); }
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithTagValues(const Aws::Vector<Aws::String>& value) { SetTagValues(value); return *this;}
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& WithTagValues(Aws::Vector<Aws::String>&& value) { SetTagValues(std::move(value)); return *this;}
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& AddTagValues(const Aws::String& value) { m_tagValuesHasBeenSet = true; m_tagValues.push_back(value); return *this; }
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& AddTagValues(Aws::String&& value) { m_tagValuesHasBeenSet = true; m_tagValues.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p>A tag value or values for which you want to return all matching usage limit
+     * objects that are associated with the specified tag value or values. For example,
+     * suppose that you have parameter groups that are tagged with values called
+     * <code>admin</code> and <code>test</code>. If you specify both of these tag
+     * values in the request, Amazon Redshift returns a response with the usage limit
+     * objects that have either or both of these tag values associated with them.</p>
+     */
+    inline DescribeUsageLimitsRequest& AddTagValues(const char* value) { m_tagValuesHasBeenSet = true; m_tagValues.push_back(value); return *this; }
+
+  private:
+
+    Aws::String m_usageLimitId;
+    bool m_usageLimitIdHasBeenSet;
+
+    Aws::String m_clusterIdentifier;
+    bool m_clusterIdentifierHasBeenSet;
+
+    UsageLimitFeatureType m_featureType;
+    bool m_featureTypeHasBeenSet;
+
+    int m_maxRecords;
+    bool m_maxRecordsHasBeenSet;
+
+    Aws::String m_marker;
+    bool m_markerHasBeenSet;
+
+    Aws::Vector<Aws::String> m_tagKeys;
+    bool m_tagKeysHasBeenSet;
+
+    Aws::Vector<Aws::String> m_tagValues;
+    bool m_tagValuesHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsResult.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsResult.h
new file mode 100644
index 00000000000..193127bd543
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/DescribeUsageLimitsResult.h
@@ -0,0 +1,181 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/ResponseMetadata.h>
+#include <aws/redshift/model/UsageLimit.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Xml
+{
+  class XmlDocument;
+} // namespace Xml
+} // namespace Utils
+namespace Redshift
+{
+namespace Model
+{
+  class AWS_REDSHIFT_API DescribeUsageLimitsResult
+  {
+  public:
+    DescribeUsageLimitsResult();
+    DescribeUsageLimitsResult(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+    DescribeUsageLimitsResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline const Aws::Vector<UsageLimit>& GetUsageLimits() const{ return m_usageLimits; }
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline void SetUsageLimits(const Aws::Vector<UsageLimit>& value) { m_usageLimits = value; }
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline void SetUsageLimits(Aws::Vector<UsageLimit>&& value) { m_usageLimits = std::move(value); }
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline DescribeUsageLimitsResult& WithUsageLimits(const Aws::Vector<UsageLimit>& value) { SetUsageLimits(value); return *this;}
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline DescribeUsageLimitsResult& WithUsageLimits(Aws::Vector<UsageLimit>&& value) { SetUsageLimits(std::move(value)); return *this;}
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline DescribeUsageLimitsResult& AddUsageLimits(const UsageLimit& value) { m_usageLimits.push_back(value); return *this; }
+
+    /**
+     * <p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>
+     */
+    inline DescribeUsageLimitsResult& AddUsageLimits(UsageLimit&& value) { m_usageLimits.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline const Aws::String& GetMarker() const{ return m_marker; }
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline void SetMarker(const Aws::String& value) { m_marker = value; }
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline void SetMarker(Aws::String&& value) { m_marker = std::move(value); }
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline void SetMarker(const char* value) { m_marker.assign(value); }
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline DescribeUsageLimitsResult& WithMarker(const Aws::String& value) { SetMarker(value); return *this;}
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline DescribeUsageLimitsResult& WithMarker(Aws::String&& value) { SetMarker(std::move(value)); return *this;}
+
+    /**
+     * <p>A value that indicates the starting point for the next set of response
+     * records in a subsequent request. If a value is returned in a response, you can
+     * retrieve the next set of records by providing this returned marker value in the
+     * <code>Marker</code> parameter and retrying the command. If the
+     * <code>Marker</code> field is empty, all response records have been retrieved for
+     * the request. </p>
+     */
+    inline DescribeUsageLimitsResult& WithMarker(const char* value) { SetMarker(value); return *this;}
+
+
+    
+    inline const ResponseMetadata& GetResponseMetadata() const{ return m_responseMetadata; }
+
+    
+    inline void SetResponseMetadata(const ResponseMetadata& value) { m_responseMetadata = value; }
+
+    
+    inline void SetResponseMetadata(ResponseMetadata&& value) { m_responseMetadata = std::move(value); }
+
+    
+    inline DescribeUsageLimitsResult& WithResponseMetadata(const ResponseMetadata& value) { SetResponseMetadata(value); return *this;}
+
+    
+    inline DescribeUsageLimitsResult& WithResponseMetadata(ResponseMetadata&& value) { SetResponseMetadata(std::move(value)); return *this;}
+
+  private:
+
+    Aws::Vector<UsageLimit> m_usageLimits;
+
+    Aws::String m_marker;
+
+    ResponseMetadata m_responseMetadata;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitRequest.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitRequest.h
new file mode 100644
index 00000000000..8578e9c29a4
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitRequest.h
@@ -0,0 +1,166 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/redshift/RedshiftRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/UsageLimitBreachAction.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_REDSHIFT_API ModifyUsageLimitRequest : public RedshiftRequest
+  {
+  public:
+    ModifyUsageLimitRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ModifyUsageLimit"; }
+
+    Aws::String SerializePayload() const override;
+
+  protected:
+    void DumpBodyToUrl(Aws::Http::URI& uri ) const override;
+
+  public:
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline const Aws::String& GetUsageLimitId() const{ return m_usageLimitId; }
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline bool UsageLimitIdHasBeenSet() const { return m_usageLimitIdHasBeenSet; }
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline void SetUsageLimitId(const Aws::String& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = value; }
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline void SetUsageLimitId(Aws::String&& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = std::move(value); }
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline void SetUsageLimitId(const char* value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId.assign(value); }
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline ModifyUsageLimitRequest& WithUsageLimitId(const Aws::String& value) { SetUsageLimitId(value); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline ModifyUsageLimitRequest& WithUsageLimitId(Aws::String&& value) { SetUsageLimitId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit to modify.</p>
+     */
+    inline ModifyUsageLimitRequest& WithUsageLimitId(const char* value) { SetUsageLimitId(value); return *this;}
+
+
+    /**
+     * <p>The new limit amount. For more information about this parameter, see
+     * <a>UsageLimit</a>. </p>
+     */
+    inline long long GetAmount() const{ return m_amount; }
+
+    /**
+     * <p>The new limit amount. For more information about this parameter, see
+     * <a>UsageLimit</a>. </p>
+     */
+    inline bool AmountHasBeenSet() const { return m_amountHasBeenSet; }
+
+    /**
+     * <p>The new limit amount. For more information about this parameter, see
+     * <a>UsageLimit</a>. </p>
+     */
+    inline void SetAmount(long long value) { m_amountHasBeenSet = true; m_amount = value; }
+
+    /**
+     * <p>The new limit amount. For more information about this parameter, see
+     * <a>UsageLimit</a>. </p>
+     */
+    inline ModifyUsageLimitRequest& WithAmount(long long value) { SetAmount(value); return *this;}
+
+
+    /**
+     * <p>The new action that Amazon Redshift takes when the limit is reached. For more
+     * information about this parameter, see <a>UsageLimit</a>. </p>
+     */
+    inline const UsageLimitBreachAction& GetBreachAction() const{ return m_breachAction; }
+
+    /**
+     * <p>The new action that Amazon Redshift takes when the limit is reached. For more
+     * information about this parameter, see <a>UsageLimit</a>. </p>
+     */
+    inline bool BreachActionHasBeenSet() const { return m_breachActionHasBeenSet; }
+
+    /**
+     * <p>The new action that Amazon Redshift takes when the limit is reached. For more
+     * information about this parameter, see <a>UsageLimit</a>. </p>
+     */
+    inline void SetBreachAction(const UsageLimitBreachAction& value) { m_breachActionHasBeenSet = true; m_breachAction = value; }
+
+    /**
+     * <p>The new action that Amazon Redshift takes when the limit is reached. For more
+     * information about this parameter, see <a>UsageLimit</a>. </p>
+     */
+    inline void SetBreachAction(UsageLimitBreachAction&& value) { m_breachActionHasBeenSet = true; m_breachAction = std::move(value); }
+
+    /**
+     * <p>The new action that Amazon Redshift takes when the limit is reached. For more
+     * information about this parameter, see <a>UsageLimit</a>. </p>
+     */
+    inline ModifyUsageLimitRequest& WithBreachAction(const UsageLimitBreachAction& value) { SetBreachAction(value); return *this;}
+
+    /**
+     * <p>The new action that Amazon Redshift takes when the limit is reached. For more
+     * information about this parameter, see <a>UsageLimit</a>. </p>
+     */
+    inline ModifyUsageLimitRequest& WithBreachAction(UsageLimitBreachAction&& value) { SetBreachAction(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_usageLimitId;
+    bool m_usageLimitIdHasBeenSet;
+
+    long long m_amount;
+    bool m_amountHasBeenSet;
+
+    UsageLimitBreachAction m_breachAction;
+    bool m_breachActionHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitResult.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitResult.h
new file mode 100644
index 00000000000..5973f300773
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/ModifyUsageLimitResult.h
@@ -0,0 +1,356 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/UsageLimitFeatureType.h>
+#include <aws/redshift/model/UsageLimitLimitType.h>
+#include <aws/redshift/model/UsageLimitPeriod.h>
+#include <aws/redshift/model/UsageLimitBreachAction.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/redshift/model/ResponseMetadata.h>
+#include <aws/redshift/model/Tag.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Xml
+{
+  class XmlDocument;
+} // namespace Xml
+} // namespace Utils
+namespace Redshift
+{
+namespace Model
+{
+  /**
+   * <p>Describes a usage limit object for a cluster. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/UsageLimit">AWS
+   * API Reference</a></p>
+   */
+  class AWS_REDSHIFT_API ModifyUsageLimitResult
+  {
+  public:
+    ModifyUsageLimitResult();
+    ModifyUsageLimitResult(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+    ModifyUsageLimitResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline const Aws::String& GetUsageLimitId() const{ return m_usageLimitId; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(const Aws::String& value) { m_usageLimitId = value; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(Aws::String&& value) { m_usageLimitId = std::move(value); }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(const char* value) { m_usageLimitId.assign(value); }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline ModifyUsageLimitResult& WithUsageLimitId(const Aws::String& value) { SetUsageLimitId(value); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline ModifyUsageLimitResult& WithUsageLimitId(Aws::String&& value) { SetUsageLimitId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline ModifyUsageLimitResult& WithUsageLimitId(const char* value) { SetUsageLimitId(value); return *this;}
+
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline const Aws::String& GetClusterIdentifier() const{ return m_clusterIdentifier; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(const Aws::String& value) { m_clusterIdentifier = value; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(Aws::String&& value) { m_clusterIdentifier = std::move(value); }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(const char* value) { m_clusterIdentifier.assign(value); }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline ModifyUsageLimitResult& WithClusterIdentifier(const Aws::String& value) { SetClusterIdentifier(value); return *this;}
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline ModifyUsageLimitResult& WithClusterIdentifier(Aws::String&& value) { SetClusterIdentifier(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline ModifyUsageLimitResult& WithClusterIdentifier(const char* value) { SetClusterIdentifier(value); return *this;}
+
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline const UsageLimitFeatureType& GetFeatureType() const{ return m_featureType; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline void SetFeatureType(const UsageLimitFeatureType& value) { m_featureType = value; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline void SetFeatureType(UsageLimitFeatureType&& value) { m_featureType = std::move(value); }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline ModifyUsageLimitResult& WithFeatureType(const UsageLimitFeatureType& value) { SetFeatureType(value); return *this;}
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline ModifyUsageLimitResult& WithFeatureType(UsageLimitFeatureType&& value) { SetFeatureType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline const UsageLimitLimitType& GetLimitType() const{ return m_limitType; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline void SetLimitType(const UsageLimitLimitType& value) { m_limitType = value; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline void SetLimitType(UsageLimitLimitType&& value) { m_limitType = std::move(value); }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline ModifyUsageLimitResult& WithLimitType(const UsageLimitLimitType& value) { SetLimitType(value); return *this;}
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline ModifyUsageLimitResult& WithLimitType(UsageLimitLimitType&& value) { SetLimitType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline long long GetAmount() const{ return m_amount; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline void SetAmount(long long value) { m_amount = value; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline ModifyUsageLimitResult& WithAmount(long long value) { SetAmount(value); return *this;}
+
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline const UsageLimitPeriod& GetPeriod() const{ return m_period; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(const UsageLimitPeriod& value) { m_period = value; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(UsageLimitPeriod&& value) { m_period = std::move(value); }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline ModifyUsageLimitResult& WithPeriod(const UsageLimitPeriod& value) { SetPeriod(value); return *this;}
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline ModifyUsageLimitResult& WithPeriod(UsageLimitPeriod&& value) { SetPeriod(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline const UsageLimitBreachAction& GetBreachAction() const{ return m_breachAction; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline void SetBreachAction(const UsageLimitBreachAction& value) { m_breachAction = value; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline void SetBreachAction(UsageLimitBreachAction&& value) { m_breachAction = std::move(value); }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline ModifyUsageLimitResult& WithBreachAction(const UsageLimitBreachAction& value) { SetBreachAction(value); return *this;}
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline ModifyUsageLimitResult& WithBreachAction(UsageLimitBreachAction&& value) { SetBreachAction(std::move(value)); return *this;}
+
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tags = value; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tags = std::move(value); }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline ModifyUsageLimitResult& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline ModifyUsageLimitResult& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline ModifyUsageLimitResult& AddTags(const Tag& value) { m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline ModifyUsageLimitResult& AddTags(Tag&& value) { m_tags.push_back(std::move(value)); return *this; }
+
+
+    
+    inline const ResponseMetadata& GetResponseMetadata() const{ return m_responseMetadata; }
+
+    
+    inline void SetResponseMetadata(const ResponseMetadata& value) { m_responseMetadata = value; }
+
+    
+    inline void SetResponseMetadata(ResponseMetadata&& value) { m_responseMetadata = std::move(value); }
+
+    
+    inline ModifyUsageLimitResult& WithResponseMetadata(const ResponseMetadata& value) { SetResponseMetadata(value); return *this;}
+
+    
+    inline ModifyUsageLimitResult& WithResponseMetadata(ResponseMetadata&& value) { SetResponseMetadata(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_usageLimitId;
+
+    Aws::String m_clusterIdentifier;
+
+    UsageLimitFeatureType m_featureType;
+
+    UsageLimitLimitType m_limitType;
+
+    long long m_amount;
+
+    UsageLimitPeriod m_period;
+
+    UsageLimitBreachAction m_breachAction;
+
+    Aws::Vector<Tag> m_tags;
+
+    ResponseMetadata m_responseMetadata;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/RestoreFromClusterSnapshotRequest.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/RestoreFromClusterSnapshotRequest.h
index 4cb9d72b214..2cc89975cd6 100644
--- a/aws-cpp-sdk-redshift/include/aws/redshift/model/RestoreFromClusterSnapshotRequest.h
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/RestoreFromClusterSnapshotRequest.h
@@ -1080,7 +1080,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1097,7 +1097,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1114,7 +1114,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1131,7 +1131,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1148,7 +1148,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1165,7 +1165,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1182,7 +1182,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
@@ -1199,7 +1199,7 @@ namespace Model
      * a DC instance type, you must restore into that same instance type and size. In
      * other words, you can only restore a dc1.large instance type into another
      * dc1.large instance type or dc2.large instance type. You can't restore
-     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize
+     * dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize
      * to a dc2.8large cluster. For more information about node types, see <a
      * href="https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes">
      * About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimit.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimit.h
new file mode 100644
index 00000000000..ba52600c6b4
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimit.h
@@ -0,0 +1,417 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/redshift/model/UsageLimitFeatureType.h>
+#include <aws/redshift/model/UsageLimitLimitType.h>
+#include <aws/redshift/model/UsageLimitPeriod.h>
+#include <aws/redshift/model/UsageLimitBreachAction.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/redshift/model/ResponseMetadata.h>
+#include <aws/redshift/model/Tag.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace Redshift
+{
+namespace Model
+{
+
+  /**
+   * <p>Describes a usage limit object for a cluster. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/UsageLimit">AWS
+   * API Reference</a></p>
+   */
+  class AWS_REDSHIFT_API UsageLimit
+  {
+  public:
+    UsageLimit();
+    UsageLimit(const Aws::Utils::Xml::XmlNode& xmlNode);
+    UsageLimit& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline const Aws::String& GetUsageLimitId() const{ return m_usageLimitId; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline bool UsageLimitIdHasBeenSet() const { return m_usageLimitIdHasBeenSet; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(const Aws::String& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = value; }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(Aws::String&& value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId = std::move(value); }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline void SetUsageLimitId(const char* value) { m_usageLimitIdHasBeenSet = true; m_usageLimitId.assign(value); }
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline UsageLimit& WithUsageLimitId(const Aws::String& value) { SetUsageLimitId(value); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline UsageLimit& WithUsageLimitId(Aws::String&& value) { SetUsageLimitId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the usage limit.</p>
+     */
+    inline UsageLimit& WithUsageLimitId(const char* value) { SetUsageLimitId(value); return *this;}
+
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline const Aws::String& GetClusterIdentifier() const{ return m_clusterIdentifier; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline bool ClusterIdentifierHasBeenSet() const { return m_clusterIdentifierHasBeenSet; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(const Aws::String& value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier = value; }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(Aws::String&& value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier = std::move(value); }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline void SetClusterIdentifier(const char* value) { m_clusterIdentifierHasBeenSet = true; m_clusterIdentifier.assign(value); }
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline UsageLimit& WithClusterIdentifier(const Aws::String& value) { SetClusterIdentifier(value); return *this;}
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline UsageLimit& WithClusterIdentifier(Aws::String&& value) { SetClusterIdentifier(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier of the cluster with a usage limit.</p>
+     */
+    inline UsageLimit& WithClusterIdentifier(const char* value) { SetClusterIdentifier(value); return *this;}
+
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline const UsageLimitFeatureType& GetFeatureType() const{ return m_featureType; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline bool FeatureTypeHasBeenSet() const { return m_featureTypeHasBeenSet; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline void SetFeatureType(const UsageLimitFeatureType& value) { m_featureTypeHasBeenSet = true; m_featureType = value; }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline void SetFeatureType(UsageLimitFeatureType&& value) { m_featureTypeHasBeenSet = true; m_featureType = std::move(value); }
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline UsageLimit& WithFeatureType(const UsageLimitFeatureType& value) { SetFeatureType(value); return *this;}
+
+    /**
+     * <p>The Amazon Redshift feature to which the limit applies.</p>
+     */
+    inline UsageLimit& WithFeatureType(UsageLimitFeatureType&& value) { SetFeatureType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline const UsageLimitLimitType& GetLimitType() const{ return m_limitType; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline bool LimitTypeHasBeenSet() const { return m_limitTypeHasBeenSet; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline void SetLimitType(const UsageLimitLimitType& value) { m_limitTypeHasBeenSet = true; m_limitType = value; }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline void SetLimitType(UsageLimitLimitType&& value) { m_limitTypeHasBeenSet = true; m_limitType = std::move(value); }
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline UsageLimit& WithLimitType(const UsageLimitLimitType& value) { SetLimitType(value); return *this;}
+
+    /**
+     * <p>The type of limit. Depending on the feature type, this can be based on a time
+     * duration or data size.</p>
+     */
+    inline UsageLimit& WithLimitType(UsageLimitLimitType&& value) { SetLimitType(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline long long GetAmount() const{ return m_amount; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline bool AmountHasBeenSet() const { return m_amountHasBeenSet; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline void SetAmount(long long value) { m_amountHasBeenSet = true; m_amount = value; }
+
+    /**
+     * <p>The limit amount. If time-based, this amount is in minutes. If data-based,
+     * this amount is in terabytes (TB).</p>
+     */
+    inline UsageLimit& WithAmount(long long value) { SetAmount(value); return *this;}
+
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline const UsageLimitPeriod& GetPeriod() const{ return m_period; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline bool PeriodHasBeenSet() const { return m_periodHasBeenSet; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(const UsageLimitPeriod& value) { m_periodHasBeenSet = true; m_period = value; }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline void SetPeriod(UsageLimitPeriod&& value) { m_periodHasBeenSet = true; m_period = std::move(value); }
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline UsageLimit& WithPeriod(const UsageLimitPeriod& value) { SetPeriod(value); return *this;}
+
+    /**
+     * <p>The time period that the amount applies to. A <code>weekly</code> period
+     * begins on Sunday. The default is <code>monthly</code>. </p>
+     */
+    inline UsageLimit& WithPeriod(UsageLimitPeriod&& value) { SetPeriod(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline const UsageLimitBreachAction& GetBreachAction() const{ return m_breachAction; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline bool BreachActionHasBeenSet() const { return m_breachActionHasBeenSet; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline void SetBreachAction(const UsageLimitBreachAction& value) { m_breachActionHasBeenSet = true; m_breachAction = value; }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline void SetBreachAction(UsageLimitBreachAction&& value) { m_breachActionHasBeenSet = true; m_breachAction = std::move(value); }
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline UsageLimit& WithBreachAction(const UsageLimitBreachAction& value) { SetBreachAction(value); return *this;}
+
+    /**
+     * <p>The action that Amazon Redshift takes when the limit is reached. Possible
+     * values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table.
+     * The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch
+     * metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the
+     * next usage period begins.</p> </li> </ul>
+     */
+    inline UsageLimit& WithBreachAction(UsageLimitBreachAction&& value) { SetBreachAction(std::move(value)); return *this;}
+
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline bool TagsHasBeenSet() const { return m_tagsHasBeenSet; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tagsHasBeenSet = true; m_tags = value; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tagsHasBeenSet = true; m_tags = std::move(value); }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline UsageLimit& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline UsageLimit& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline UsageLimit& AddTags(const Tag& value) { m_tagsHasBeenSet = true; m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>A list of tag instances.</p>
+     */
+    inline UsageLimit& AddTags(Tag&& value) { m_tagsHasBeenSet = true; m_tags.push_back(std::move(value)); return *this; }
+
+
+    
+    inline const ResponseMetadata& GetResponseMetadata() const{ return m_responseMetadata; }
+
+    
+    inline bool ResponseMetadataHasBeenSet() const { return m_responseMetadataHasBeenSet; }
+
+    
+    inline void SetResponseMetadata(const ResponseMetadata& value) { m_responseMetadataHasBeenSet = true; m_responseMetadata = value; }
+
+    
+    inline void SetResponseMetadata(ResponseMetadata&& value) { m_responseMetadataHasBeenSet = true; m_responseMetadata = std::move(value); }
+
+    
+    inline UsageLimit& WithResponseMetadata(const ResponseMetadata& value) { SetResponseMetadata(value); return *this;}
+
+    
+    inline UsageLimit& WithResponseMetadata(ResponseMetadata&& value) { SetResponseMetadata(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_usageLimitId;
+    bool m_usageLimitIdHasBeenSet;
+
+    Aws::String m_clusterIdentifier;
+    bool m_clusterIdentifierHasBeenSet;
+
+    UsageLimitFeatureType m_featureType;
+    bool m_featureTypeHasBeenSet;
+
+    UsageLimitLimitType m_limitType;
+    bool m_limitTypeHasBeenSet;
+
+    long long m_amount;
+    bool m_amountHasBeenSet;
+
+    UsageLimitPeriod m_period;
+    bool m_periodHasBeenSet;
+
+    UsageLimitBreachAction m_breachAction;
+    bool m_breachActionHasBeenSet;
+
+    Aws::Vector<Tag> m_tags;
+    bool m_tagsHasBeenSet;
+
+    ResponseMetadata m_responseMetadata;
+    bool m_responseMetadataHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitBreachAction.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitBreachAction.h
new file mode 100644
index 00000000000..902217b4de9
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitBreachAction.h
@@ -0,0 +1,42 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+  enum class UsageLimitBreachAction
+  {
+    NOT_SET,
+    log,
+    emit_metric,
+    disable
+  };
+
+namespace UsageLimitBreachActionMapper
+{
+AWS_REDSHIFT_API UsageLimitBreachAction GetUsageLimitBreachActionForName(const Aws::String& name);
+
+AWS_REDSHIFT_API Aws::String GetNameForUsageLimitBreachAction(UsageLimitBreachAction value);
+} // namespace UsageLimitBreachActionMapper
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitFeatureType.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitFeatureType.h
new file mode 100644
index 00000000000..6ad53811c53
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitFeatureType.h
@@ -0,0 +1,41 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+  enum class UsageLimitFeatureType
+  {
+    NOT_SET,
+    spectrum,
+    concurrency_scaling
+  };
+
+namespace UsageLimitFeatureTypeMapper
+{
+AWS_REDSHIFT_API UsageLimitFeatureType GetUsageLimitFeatureTypeForName(const Aws::String& name);
+
+AWS_REDSHIFT_API Aws::String GetNameForUsageLimitFeatureType(UsageLimitFeatureType value);
+} // namespace UsageLimitFeatureTypeMapper
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitLimitType.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitLimitType.h
new file mode 100644
index 00000000000..370d2028970
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitLimitType.h
@@ -0,0 +1,41 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+  enum class UsageLimitLimitType
+  {
+    NOT_SET,
+    time,
+    data_scanned
+  };
+
+namespace UsageLimitLimitTypeMapper
+{
+AWS_REDSHIFT_API UsageLimitLimitType GetUsageLimitLimitTypeForName(const Aws::String& name);
+
+AWS_REDSHIFT_API Aws::String GetNameForUsageLimitLimitType(UsageLimitLimitType value);
+} // namespace UsageLimitLimitTypeMapper
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitPeriod.h b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitPeriod.h
new file mode 100644
index 00000000000..c70db02f06d
--- /dev/null
+++ b/aws-cpp-sdk-redshift/include/aws/redshift/model/UsageLimitPeriod.h
@@ -0,0 +1,42 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+#include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+  enum class UsageLimitPeriod
+  {
+    NOT_SET,
+    daily,
+    weekly,
+    monthly
+  };
+
+namespace UsageLimitPeriodMapper
+{
+AWS_REDSHIFT_API UsageLimitPeriod GetUsageLimitPeriodForName(const Aws::String& name);
+
+AWS_REDSHIFT_API Aws::String GetNameForUsageLimitPeriod(UsageLimitPeriod value);
+} // namespace UsageLimitPeriodMapper
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/source/RedshiftClient.cpp b/aws-cpp-sdk-redshift/source/RedshiftClient.cpp
index 571f2b29d10..d67c52c3bbc 100644
--- a/aws-cpp-sdk-redshift/source/RedshiftClient.cpp
+++ b/aws-cpp-sdk-redshift/source/RedshiftClient.cpp
@@ -49,6 +49,7 @@
 #include <aws/redshift/model/CreateSnapshotCopyGrantRequest.h>
 #include <aws/redshift/model/CreateSnapshotScheduleRequest.h>
 #include <aws/redshift/model/CreateTagsRequest.h>
+#include <aws/redshift/model/CreateUsageLimitRequest.h>
 #include <aws/redshift/model/DeleteClusterRequest.h>
 #include <aws/redshift/model/DeleteClusterParameterGroupRequest.h>
 #include <aws/redshift/model/DeleteClusterSecurityGroupRequest.h>
@@ -61,6 +62,7 @@
 #include <aws/redshift/model/DeleteSnapshotCopyGrantRequest.h>
 #include <aws/redshift/model/DeleteSnapshotScheduleRequest.h>
 #include <aws/redshift/model/DeleteTagsRequest.h>
+#include <aws/redshift/model/DeleteUsageLimitRequest.h>
 #include <aws/redshift/model/DescribeAccountAttributesRequest.h>
 #include <aws/redshift/model/DescribeClusterDbRevisionsRequest.h>
 #include <aws/redshift/model/DescribeClusterParameterGroupsRequest.h>
@@ -89,6 +91,7 @@
 #include <aws/redshift/model/DescribeStorageRequest.h>
 #include <aws/redshift/model/DescribeTableRestoreStatusRequest.h>
 #include <aws/redshift/model/DescribeTagsRequest.h>
+#include <aws/redshift/model/DescribeUsageLimitsRequest.h>
 #include <aws/redshift/model/DisableLoggingRequest.h>
 #include <aws/redshift/model/DisableSnapshotCopyRequest.h>
 #include <aws/redshift/model/EnableLoggingRequest.h>
@@ -107,6 +110,7 @@
 #include <aws/redshift/model/ModifyScheduledActionRequest.h>
 #include <aws/redshift/model/ModifySnapshotCopyRetentionPeriodRequest.h>
 #include <aws/redshift/model/ModifySnapshotScheduleRequest.h>
+#include <aws/redshift/model/ModifyUsageLimitRequest.h>
 #include <aws/redshift/model/PauseClusterRequest.h>
 #include <aws/redshift/model/PurchaseReservedNodeOfferingRequest.h>
 #include <aws/redshift/model/RebootClusterRequest.h>
@@ -867,6 +871,41 @@ void RedshiftClient::CreateTagsAsyncHelper(const CreateTagsRequest& request, con
   handler(this, request, CreateTags(request), context);
 }
 
+CreateUsageLimitOutcome RedshiftClient::CreateUsageLimit(const CreateUsageLimitRequest& request) const
+{
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/";
+  uri.SetPath(uri.GetPath() + ss.str());
+  XmlOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST);
+  if(outcome.IsSuccess())
+  {
+    return CreateUsageLimitOutcome(CreateUsageLimitResult(outcome.GetResult()));
+  }
+  else
+  {
+    return CreateUsageLimitOutcome(outcome.GetError());
+  }
+}
+
+CreateUsageLimitOutcomeCallable RedshiftClient::CreateUsageLimitCallable(const CreateUsageLimitRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< CreateUsageLimitOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->CreateUsageLimit(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void RedshiftClient::CreateUsageLimitAsync(const CreateUsageLimitRequest& request, const CreateUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->CreateUsageLimitAsyncHelper( request, handler, context ); } );
+}
+
+void RedshiftClient::CreateUsageLimitAsyncHelper(const CreateUsageLimitRequest& request, const CreateUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, CreateUsageLimit(request), context);
+}
+
 DeleteClusterOutcome RedshiftClient::DeleteCluster(const DeleteClusterRequest& request) const
 {
   Aws::Http::URI uri = m_uri;
@@ -1287,6 +1326,41 @@ void RedshiftClient::DeleteTagsAsyncHelper(const DeleteTagsRequest& request, con
   handler(this, request, DeleteTags(request), context);
 }
 
+DeleteUsageLimitOutcome RedshiftClient::DeleteUsageLimit(const DeleteUsageLimitRequest& request) const
+{
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/";
+  uri.SetPath(uri.GetPath() + ss.str());
+  XmlOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST);
+  if(outcome.IsSuccess())
+  {
+    return DeleteUsageLimitOutcome(NoResult());
+  }
+  else
+  {
+    return DeleteUsageLimitOutcome(outcome.GetError());
+  }
+}
+
+DeleteUsageLimitOutcomeCallable RedshiftClient::DeleteUsageLimitCallable(const DeleteUsageLimitRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< DeleteUsageLimitOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->DeleteUsageLimit(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void RedshiftClient::DeleteUsageLimitAsync(const DeleteUsageLimitRequest& request, const DeleteUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->DeleteUsageLimitAsyncHelper( request, handler, context ); } );
+}
+
+void RedshiftClient::DeleteUsageLimitAsyncHelper(const DeleteUsageLimitRequest& request, const DeleteUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, DeleteUsageLimit(request), context);
+}
+
 DescribeAccountAttributesOutcome RedshiftClient::DescribeAccountAttributes(const DescribeAccountAttributesRequest& request) const
 {
   Aws::Http::URI uri = m_uri;
@@ -2267,6 +2341,41 @@ void RedshiftClient::DescribeTagsAsyncHelper(const DescribeTagsRequest& request,
   handler(this, request, DescribeTags(request), context);
 }
 
+DescribeUsageLimitsOutcome RedshiftClient::DescribeUsageLimits(const DescribeUsageLimitsRequest& request) const
+{
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/";
+  uri.SetPath(uri.GetPath() + ss.str());
+  XmlOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST);
+  if(outcome.IsSuccess())
+  {
+    return DescribeUsageLimitsOutcome(DescribeUsageLimitsResult(outcome.GetResult()));
+  }
+  else
+  {
+    return DescribeUsageLimitsOutcome(outcome.GetError());
+  }
+}
+
+DescribeUsageLimitsOutcomeCallable RedshiftClient::DescribeUsageLimitsCallable(const DescribeUsageLimitsRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< DescribeUsageLimitsOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->DescribeUsageLimits(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void RedshiftClient::DescribeUsageLimitsAsync(const DescribeUsageLimitsRequest& request, const DescribeUsageLimitsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->DescribeUsageLimitsAsyncHelper( request, handler, context ); } );
+}
+
+void RedshiftClient::DescribeUsageLimitsAsyncHelper(const DescribeUsageLimitsRequest& request, const DescribeUsageLimitsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, DescribeUsageLimits(request), context);
+}
+
 DisableLoggingOutcome RedshiftClient::DisableLogging(const DisableLoggingRequest& request) const
 {
   Aws::Http::URI uri = m_uri;
@@ -2897,6 +3006,41 @@ void RedshiftClient::ModifySnapshotScheduleAsyncHelper(const ModifySnapshotSched
   handler(this, request, ModifySnapshotSchedule(request), context);
 }
 
+ModifyUsageLimitOutcome RedshiftClient::ModifyUsageLimit(const ModifyUsageLimitRequest& request) const
+{
+  Aws::Http::URI uri = m_uri;
+  Aws::StringStream ss;
+  ss << "/";
+  uri.SetPath(uri.GetPath() + ss.str());
+  XmlOutcome outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST);
+  if(outcome.IsSuccess())
+  {
+    return ModifyUsageLimitOutcome(ModifyUsageLimitResult(outcome.GetResult()));
+  }
+  else
+  {
+    return ModifyUsageLimitOutcome(outcome.GetError());
+  }
+}
+
+ModifyUsageLimitOutcomeCallable RedshiftClient::ModifyUsageLimitCallable(const ModifyUsageLimitRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< ModifyUsageLimitOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->ModifyUsageLimit(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void RedshiftClient::ModifyUsageLimitAsync(const ModifyUsageLimitRequest& request, const ModifyUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->ModifyUsageLimitAsyncHelper( request, handler, context ); } );
+}
+
+void RedshiftClient::ModifyUsageLimitAsyncHelper(const ModifyUsageLimitRequest& request, const ModifyUsageLimitResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, ModifyUsageLimit(request), context);
+}
+
 PauseClusterOutcome RedshiftClient::PauseCluster(const PauseClusterRequest& request) const
 {
   Aws::Http::URI uri = m_uri;
diff --git a/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp b/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp
index d8f7f8ed341..94c0bd48bd8 100644
--- a/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp
+++ b/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp
@@ -51,6 +51,7 @@ static const int CLUSTER_SECURITY_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::Has
 static const int INVALID_SCHEDULE_FAULT_HASH = HashingUtils::HashString("InvalidSchedule");
 static const int INVALID_CLUSTER_SNAPSHOT_SCHEDULE_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSnapshotScheduleState");
 static const int CLUSTER_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterAlreadyExists");
+static const int INVALID_USAGE_LIMIT_FAULT_HASH = HashingUtils::HashString("InvalidUsageLimit");
 static const int CLUSTER_SNAPSHOT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotNotFound");
 static const int INVALID_CLUSTER_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterState");
 static const int INVALID_CLUSTER_SNAPSHOT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSnapshotState");
@@ -81,6 +82,7 @@ static const int INVALID_SCHEDULED_ACTION_FAULT_HASH = HashingUtils::HashString(
 static const int SNAPSHOT_COPY_ALREADY_DISABLED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyAlreadyDisabledFault");
 static const int UNKNOWN_SNAPSHOT_COPY_REGION_FAULT_HASH = HashingUtils::HashString("UnknownSnapshotCopyRegionFault");
 static const int SNAPSHOT_SCHEDULE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SnapshotScheduleNotFound");
+static const int USAGE_LIMIT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("UsageLimitAlreadyExists");
 static const int INVALID_TABLE_RESTORE_ARGUMENT_FAULT_HASH = HashingUtils::HashString("InvalidTableRestoreArgument");
 static const int UNSUPPORTED_OPTION_FAULT_HASH = HashingUtils::HashString("UnsupportedOptionFault");
 static const int SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyGrantQuotaExceededFault");
@@ -111,6 +113,7 @@ static const int SNAPSHOT_COPY_DISABLED_FAULT_HASH = HashingUtils::HashString("S
 static const int BATCH_MODIFY_CLUSTER_SNAPSHOTS_LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("BatchModifyClusterSnapshotsLimitExceededFault");
 static const int CLUSTER_ON_LATEST_REVISION_FAULT_HASH = HashingUtils::HashString("ClusterOnLatestRevision");
 static const int CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSecurityGroupAlreadyExists");
+static const int USAGE_LIMIT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("UsageLimitNotFound");
 static const int CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("QuotaExceeded.ClusterSecurityGroup");
 static const int COPY_TO_REGION_DISABLED_FAULT_HASH = HashingUtils::HashString("CopyToRegionDisabledFault");
 static const int NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NumberOfNodesQuotaExceeded");
@@ -230,6 +233,10 @@ AWSError<CoreErrors> GetErrorForName(const char* errorName)
   {
     return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::CLUSTER_ALREADY_EXISTS_FAULT), false);
   }
+  else if (hashCode == INVALID_USAGE_LIMIT_FAULT_HASH)
+  {
+    return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::INVALID_USAGE_LIMIT_FAULT), false);
+  }
   else if (hashCode == CLUSTER_SNAPSHOT_NOT_FOUND_FAULT_HASH)
   {
     return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::CLUSTER_SNAPSHOT_NOT_FOUND_FAULT), false);
@@ -350,6 +357,10 @@ AWSError<CoreErrors> GetErrorForName(const char* errorName)
   {
     return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::SNAPSHOT_SCHEDULE_NOT_FOUND_FAULT), false);
   }
+  else if (hashCode == USAGE_LIMIT_ALREADY_EXISTS_FAULT_HASH)
+  {
+    return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::USAGE_LIMIT_ALREADY_EXISTS_FAULT), false);
+  }
   else if (hashCode == INVALID_TABLE_RESTORE_ARGUMENT_FAULT_HASH)
   {
     return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::INVALID_TABLE_RESTORE_ARGUMENT_FAULT), false);
@@ -470,6 +481,10 @@ AWSError<CoreErrors> GetErrorForName(const char* errorName)
   {
     return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT), false);
   }
+  else if (hashCode == USAGE_LIMIT_NOT_FOUND_FAULT_HASH)
+  {
+    return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::USAGE_LIMIT_NOT_FOUND_FAULT), false);
+  }
   else if (hashCode == CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH)
   {
     return AWSError<CoreErrors>(static_cast<CoreErrors>(RedshiftErrors::CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT), false);
diff --git a/aws-cpp-sdk-redshift/source/model/CreateUsageLimitRequest.cpp b/aws-cpp-sdk-redshift/source/model/CreateUsageLimitRequest.cpp
new file mode 100644
index 00000000000..7c7843eaa94
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/CreateUsageLimitRequest.cpp
@@ -0,0 +1,91 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/CreateUsageLimitRequest.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils;
+
+CreateUsageLimitRequest::CreateUsageLimitRequest() : 
+    m_clusterIdentifierHasBeenSet(false),
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_featureTypeHasBeenSet(false),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_limitTypeHasBeenSet(false),
+    m_amount(0),
+    m_amountHasBeenSet(false),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_periodHasBeenSet(false),
+    m_breachAction(UsageLimitBreachAction::NOT_SET),
+    m_breachActionHasBeenSet(false),
+    m_tagsHasBeenSet(false)
+{
+}
+
+Aws::String CreateUsageLimitRequest::SerializePayload() const
+{
+  Aws::StringStream ss;
+  ss << "Action=CreateUsageLimit&";
+  if(m_clusterIdentifierHasBeenSet)
+  {
+    ss << "ClusterIdentifier=" << StringUtils::URLEncode(m_clusterIdentifier.c_str()) << "&";
+  }
+
+  if(m_featureTypeHasBeenSet)
+  {
+    ss << "FeatureType=" << UsageLimitFeatureTypeMapper::GetNameForUsageLimitFeatureType(m_featureType) << "&";
+  }
+
+  if(m_limitTypeHasBeenSet)
+  {
+    ss << "LimitType=" << UsageLimitLimitTypeMapper::GetNameForUsageLimitLimitType(m_limitType) << "&";
+  }
+
+  if(m_amountHasBeenSet)
+  {
+    ss << "Amount=" << m_amount << "&";
+  }
+
+  if(m_periodHasBeenSet)
+  {
+    ss << "Period=" << UsageLimitPeriodMapper::GetNameForUsageLimitPeriod(m_period) << "&";
+  }
+
+  if(m_breachActionHasBeenSet)
+  {
+    ss << "BreachAction=" << UsageLimitBreachActionMapper::GetNameForUsageLimitBreachAction(m_breachAction) << "&";
+  }
+
+  if(m_tagsHasBeenSet)
+  {
+    unsigned tagsCount = 1;
+    for(auto& item : m_tags)
+    {
+      item.OutputToStream(ss, "Tags.member.", tagsCount, "");
+      tagsCount++;
+    }
+  }
+
+  ss << "Version=2012-12-01";
+  return ss.str();
+}
+
+
+void  CreateUsageLimitRequest::DumpBodyToUrl(Aws::Http::URI& uri ) const
+{
+  uri.SetQueryString(SerializePayload());
+}
diff --git a/aws-cpp-sdk-redshift/source/model/CreateUsageLimitResult.cpp b/aws-cpp-sdk-redshift/source/model/CreateUsageLimitResult.cpp
new file mode 100644
index 00000000000..bd7874fb5e3
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/CreateUsageLimitResult.cpp
@@ -0,0 +1,115 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/CreateUsageLimitResult.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/logging/LogMacros.h>
+
+#include <utility>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils::Logging;
+using namespace Aws::Utils;
+using namespace Aws;
+
+CreateUsageLimitResult::CreateUsageLimitResult() : 
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_amount(0),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_breachAction(UsageLimitBreachAction::NOT_SET)
+{
+}
+
+CreateUsageLimitResult::CreateUsageLimitResult(const Aws::AmazonWebServiceResult<XmlDocument>& result) : 
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_amount(0),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_breachAction(UsageLimitBreachAction::NOT_SET)
+{
+  *this = result;
+}
+
+CreateUsageLimitResult& CreateUsageLimitResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+{
+  const XmlDocument& xmlDocument = result.GetPayload();
+  XmlNode rootNode = xmlDocument.GetRootElement();
+  XmlNode resultNode = rootNode;
+  if (!rootNode.IsNull() && (rootNode.GetName() != "CreateUsageLimitResult"))
+  {
+    resultNode = rootNode.FirstChild("CreateUsageLimitResult");
+  }
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode usageLimitIdNode = resultNode.FirstChild("UsageLimitId");
+    if(!usageLimitIdNode.IsNull())
+    {
+      m_usageLimitId = Aws::Utils::Xml::DecodeEscapedXmlText(usageLimitIdNode.GetText());
+    }
+    XmlNode clusterIdentifierNode = resultNode.FirstChild("ClusterIdentifier");
+    if(!clusterIdentifierNode.IsNull())
+    {
+      m_clusterIdentifier = Aws::Utils::Xml::DecodeEscapedXmlText(clusterIdentifierNode.GetText());
+    }
+    XmlNode featureTypeNode = resultNode.FirstChild("FeatureType");
+    if(!featureTypeNode.IsNull())
+    {
+      m_featureType = UsageLimitFeatureTypeMapper::GetUsageLimitFeatureTypeForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(featureTypeNode.GetText()).c_str()).c_str());
+    }
+    XmlNode limitTypeNode = resultNode.FirstChild("LimitType");
+    if(!limitTypeNode.IsNull())
+    {
+      m_limitType = UsageLimitLimitTypeMapper::GetUsageLimitLimitTypeForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(limitTypeNode.GetText()).c_str()).c_str());
+    }
+    XmlNode amountNode = resultNode.FirstChild("Amount");
+    if(!amountNode.IsNull())
+    {
+      m_amount = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(amountNode.GetText()).c_str()).c_str());
+    }
+    XmlNode periodNode = resultNode.FirstChild("Period");
+    if(!periodNode.IsNull())
+    {
+      m_period = UsageLimitPeriodMapper::GetUsageLimitPeriodForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(periodNode.GetText()).c_str()).c_str());
+    }
+    XmlNode breachActionNode = resultNode.FirstChild("BreachAction");
+    if(!breachActionNode.IsNull())
+    {
+      m_breachAction = UsageLimitBreachActionMapper::GetUsageLimitBreachActionForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(breachActionNode.GetText()).c_str()).c_str());
+    }
+    XmlNode tagsNode = resultNode.FirstChild("Tags");
+    if(!tagsNode.IsNull())
+    {
+      XmlNode tagsMember = tagsNode.FirstChild("Tag");
+      while(!tagsMember.IsNull())
+      {
+        m_tags.push_back(tagsMember);
+        tagsMember = tagsMember.NextNode("Tag");
+      }
+
+    }
+  }
+
+  if (!rootNode.IsNull()) {
+    XmlNode responseMetadataNode = rootNode.FirstChild("ResponseMetadata");
+    m_responseMetadata = responseMetadataNode;
+    AWS_LOGSTREAM_DEBUG("Aws::Redshift::Model::CreateUsageLimitResult", "x-amzn-request-id: " << m_responseMetadata.GetRequestId() );
+  }
+  return *this;
+}
diff --git a/aws-cpp-sdk-redshift/source/model/DeleteUsageLimitRequest.cpp b/aws-cpp-sdk-redshift/source/model/DeleteUsageLimitRequest.cpp
new file mode 100644
index 00000000000..f3284e2b8fb
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/DeleteUsageLimitRequest.cpp
@@ -0,0 +1,45 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/DeleteUsageLimitRequest.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils;
+
+DeleteUsageLimitRequest::DeleteUsageLimitRequest() : 
+    m_usageLimitIdHasBeenSet(false)
+{
+}
+
+Aws::String DeleteUsageLimitRequest::SerializePayload() const
+{
+  Aws::StringStream ss;
+  ss << "Action=DeleteUsageLimit&";
+  if(m_usageLimitIdHasBeenSet)
+  {
+    ss << "UsageLimitId=" << StringUtils::URLEncode(m_usageLimitId.c_str()) << "&";
+  }
+
+  ss << "Version=2012-12-01";
+  return ss.str();
+}
+
+
+void  DeleteUsageLimitRequest::DumpBodyToUrl(Aws::Http::URI& uri ) const
+{
+  uri.SetQueryString(SerializePayload());
+}
diff --git a/aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsRequest.cpp b/aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsRequest.cpp
new file mode 100644
index 00000000000..0d127e820f5
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsRequest.cpp
@@ -0,0 +1,95 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/DescribeUsageLimitsRequest.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils;
+
+DescribeUsageLimitsRequest::DescribeUsageLimitsRequest() : 
+    m_usageLimitIdHasBeenSet(false),
+    m_clusterIdentifierHasBeenSet(false),
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_featureTypeHasBeenSet(false),
+    m_maxRecords(0),
+    m_maxRecordsHasBeenSet(false),
+    m_markerHasBeenSet(false),
+    m_tagKeysHasBeenSet(false),
+    m_tagValuesHasBeenSet(false)
+{
+}
+
+Aws::String DescribeUsageLimitsRequest::SerializePayload() const
+{
+  Aws::StringStream ss;
+  ss << "Action=DescribeUsageLimits&";
+  if(m_usageLimitIdHasBeenSet)
+  {
+    ss << "UsageLimitId=" << StringUtils::URLEncode(m_usageLimitId.c_str()) << "&";
+  }
+
+  if(m_clusterIdentifierHasBeenSet)
+  {
+    ss << "ClusterIdentifier=" << StringUtils::URLEncode(m_clusterIdentifier.c_str()) << "&";
+  }
+
+  if(m_featureTypeHasBeenSet)
+  {
+    ss << "FeatureType=" << UsageLimitFeatureTypeMapper::GetNameForUsageLimitFeatureType(m_featureType) << "&";
+  }
+
+  if(m_maxRecordsHasBeenSet)
+  {
+    ss << "MaxRecords=" << m_maxRecords << "&";
+  }
+
+  if(m_markerHasBeenSet)
+  {
+    ss << "Marker=" << StringUtils::URLEncode(m_marker.c_str()) << "&";
+  }
+
+  if(m_tagKeysHasBeenSet)
+  {
+    unsigned tagKeysCount = 1;
+    for(auto& item : m_tagKeys)
+    {
+      ss << "TagKeys.member." << tagKeysCount << "="
+          << StringUtils::URLEncode(item.c_str()) << "&";
+      tagKeysCount++;
+    }
+  }
+
+  if(m_tagValuesHasBeenSet)
+  {
+    unsigned tagValuesCount = 1;
+    for(auto& item : m_tagValues)
+    {
+      ss << "TagValues.member." << tagValuesCount << "="
+          << StringUtils::URLEncode(item.c_str()) << "&";
+      tagValuesCount++;
+    }
+  }
+
+  ss << "Version=2012-12-01";
+  return ss.str();
+}
+
+
+void  DescribeUsageLimitsRequest::DumpBodyToUrl(Aws::Http::URI& uri ) const
+{
+  uri.SetQueryString(SerializePayload());
+}
diff --git a/aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsResult.cpp b/aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsResult.cpp
new file mode 100644
index 00000000000..31d1576030e
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/DescribeUsageLimitsResult.cpp
@@ -0,0 +1,75 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/DescribeUsageLimitsResult.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/logging/LogMacros.h>
+
+#include <utility>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils::Logging;
+using namespace Aws::Utils;
+using namespace Aws;
+
+DescribeUsageLimitsResult::DescribeUsageLimitsResult()
+{
+}
+
+DescribeUsageLimitsResult::DescribeUsageLimitsResult(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+{
+  *this = result;
+}
+
+DescribeUsageLimitsResult& DescribeUsageLimitsResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+{
+  const XmlDocument& xmlDocument = result.GetPayload();
+  XmlNode rootNode = xmlDocument.GetRootElement();
+  XmlNode resultNode = rootNode;
+  if (!rootNode.IsNull() && (rootNode.GetName() != "DescribeUsageLimitsResult"))
+  {
+    resultNode = rootNode.FirstChild("DescribeUsageLimitsResult");
+  }
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode usageLimitsNode = resultNode.FirstChild("UsageLimits");
+    if(!usageLimitsNode.IsNull())
+    {
+      XmlNode usageLimitsMember = usageLimitsNode.FirstChild("member");
+      while(!usageLimitsMember.IsNull())
+      {
+        m_usageLimits.push_back(usageLimitsMember);
+        usageLimitsMember = usageLimitsMember.NextNode("member");
+      }
+
+    }
+    XmlNode markerNode = resultNode.FirstChild("Marker");
+    if(!markerNode.IsNull())
+    {
+      m_marker = Aws::Utils::Xml::DecodeEscapedXmlText(markerNode.GetText());
+    }
+  }
+
+  if (!rootNode.IsNull()) {
+    XmlNode responseMetadataNode = rootNode.FirstChild("ResponseMetadata");
+    m_responseMetadata = responseMetadataNode;
+    AWS_LOGSTREAM_DEBUG("Aws::Redshift::Model::DescribeUsageLimitsResult", "x-amzn-request-id: " << m_responseMetadata.GetRequestId() );
+  }
+  return *this;
+}
diff --git a/aws-cpp-sdk-redshift/source/model/ModifyUsageLimitRequest.cpp b/aws-cpp-sdk-redshift/source/model/ModifyUsageLimitRequest.cpp
new file mode 100644
index 00000000000..bef134834f2
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/ModifyUsageLimitRequest.cpp
@@ -0,0 +1,59 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/ModifyUsageLimitRequest.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils;
+
+ModifyUsageLimitRequest::ModifyUsageLimitRequest() : 
+    m_usageLimitIdHasBeenSet(false),
+    m_amount(0),
+    m_amountHasBeenSet(false),
+    m_breachAction(UsageLimitBreachAction::NOT_SET),
+    m_breachActionHasBeenSet(false)
+{
+}
+
+Aws::String ModifyUsageLimitRequest::SerializePayload() const
+{
+  Aws::StringStream ss;
+  ss << "Action=ModifyUsageLimit&";
+  if(m_usageLimitIdHasBeenSet)
+  {
+    ss << "UsageLimitId=" << StringUtils::URLEncode(m_usageLimitId.c_str()) << "&";
+  }
+
+  if(m_amountHasBeenSet)
+  {
+    ss << "Amount=" << m_amount << "&";
+  }
+
+  if(m_breachActionHasBeenSet)
+  {
+    ss << "BreachAction=" << UsageLimitBreachActionMapper::GetNameForUsageLimitBreachAction(m_breachAction) << "&";
+  }
+
+  ss << "Version=2012-12-01";
+  return ss.str();
+}
+
+
+void  ModifyUsageLimitRequest::DumpBodyToUrl(Aws::Http::URI& uri ) const
+{
+  uri.SetQueryString(SerializePayload());
+}
diff --git a/aws-cpp-sdk-redshift/source/model/ModifyUsageLimitResult.cpp b/aws-cpp-sdk-redshift/source/model/ModifyUsageLimitResult.cpp
new file mode 100644
index 00000000000..e3366f68a27
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/ModifyUsageLimitResult.cpp
@@ -0,0 +1,115 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/ModifyUsageLimitResult.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/logging/LogMacros.h>
+
+#include <utility>
+
+using namespace Aws::Redshift::Model;
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils::Logging;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ModifyUsageLimitResult::ModifyUsageLimitResult() : 
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_amount(0),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_breachAction(UsageLimitBreachAction::NOT_SET)
+{
+}
+
+ModifyUsageLimitResult::ModifyUsageLimitResult(const Aws::AmazonWebServiceResult<XmlDocument>& result) : 
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_amount(0),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_breachAction(UsageLimitBreachAction::NOT_SET)
+{
+  *this = result;
+}
+
+ModifyUsageLimitResult& ModifyUsageLimitResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+{
+  const XmlDocument& xmlDocument = result.GetPayload();
+  XmlNode rootNode = xmlDocument.GetRootElement();
+  XmlNode resultNode = rootNode;
+  if (!rootNode.IsNull() && (rootNode.GetName() != "ModifyUsageLimitResult"))
+  {
+    resultNode = rootNode.FirstChild("ModifyUsageLimitResult");
+  }
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode usageLimitIdNode = resultNode.FirstChild("UsageLimitId");
+    if(!usageLimitIdNode.IsNull())
+    {
+      m_usageLimitId = Aws::Utils::Xml::DecodeEscapedXmlText(usageLimitIdNode.GetText());
+    }
+    XmlNode clusterIdentifierNode = resultNode.FirstChild("ClusterIdentifier");
+    if(!clusterIdentifierNode.IsNull())
+    {
+      m_clusterIdentifier = Aws::Utils::Xml::DecodeEscapedXmlText(clusterIdentifierNode.GetText());
+    }
+    XmlNode featureTypeNode = resultNode.FirstChild("FeatureType");
+    if(!featureTypeNode.IsNull())
+    {
+      m_featureType = UsageLimitFeatureTypeMapper::GetUsageLimitFeatureTypeForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(featureTypeNode.GetText()).c_str()).c_str());
+    }
+    XmlNode limitTypeNode = resultNode.FirstChild("LimitType");
+    if(!limitTypeNode.IsNull())
+    {
+      m_limitType = UsageLimitLimitTypeMapper::GetUsageLimitLimitTypeForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(limitTypeNode.GetText()).c_str()).c_str());
+    }
+    XmlNode amountNode = resultNode.FirstChild("Amount");
+    if(!amountNode.IsNull())
+    {
+      m_amount = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(amountNode.GetText()).c_str()).c_str());
+    }
+    XmlNode periodNode = resultNode.FirstChild("Period");
+    if(!periodNode.IsNull())
+    {
+      m_period = UsageLimitPeriodMapper::GetUsageLimitPeriodForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(periodNode.GetText()).c_str()).c_str());
+    }
+    XmlNode breachActionNode = resultNode.FirstChild("BreachAction");
+    if(!breachActionNode.IsNull())
+    {
+      m_breachAction = UsageLimitBreachActionMapper::GetUsageLimitBreachActionForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(breachActionNode.GetText()).c_str()).c_str());
+    }
+    XmlNode tagsNode = resultNode.FirstChild("Tags");
+    if(!tagsNode.IsNull())
+    {
+      XmlNode tagsMember = tagsNode.FirstChild("Tag");
+      while(!tagsMember.IsNull())
+      {
+        m_tags.push_back(tagsMember);
+        tagsMember = tagsMember.NextNode("Tag");
+      }
+
+    }
+  }
+
+  if (!rootNode.IsNull()) {
+    XmlNode responseMetadataNode = rootNode.FirstChild("ResponseMetadata");
+    m_responseMetadata = responseMetadataNode;
+    AWS_LOGSTREAM_DEBUG("Aws::Redshift::Model::ModifyUsageLimitResult", "x-amzn-request-id: " << m_responseMetadata.GetRequestId() );
+  }
+  return *this;
+}
diff --git a/aws-cpp-sdk-redshift/source/model/UsageLimit.cpp b/aws-cpp-sdk-redshift/source/model/UsageLimit.cpp
new file mode 100644
index 00000000000..200afe7a55e
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/UsageLimit.cpp
@@ -0,0 +1,242 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/UsageLimit.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace Redshift
+{
+namespace Model
+{
+
+UsageLimit::UsageLimit() : 
+    m_usageLimitIdHasBeenSet(false),
+    m_clusterIdentifierHasBeenSet(false),
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_featureTypeHasBeenSet(false),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_limitTypeHasBeenSet(false),
+    m_amount(0),
+    m_amountHasBeenSet(false),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_periodHasBeenSet(false),
+    m_breachAction(UsageLimitBreachAction::NOT_SET),
+    m_breachActionHasBeenSet(false),
+    m_tagsHasBeenSet(false),
+    m_responseMetadataHasBeenSet(false)
+{
+}
+
+UsageLimit::UsageLimit(const XmlNode& xmlNode) : 
+    m_usageLimitIdHasBeenSet(false),
+    m_clusterIdentifierHasBeenSet(false),
+    m_featureType(UsageLimitFeatureType::NOT_SET),
+    m_featureTypeHasBeenSet(false),
+    m_limitType(UsageLimitLimitType::NOT_SET),
+    m_limitTypeHasBeenSet(false),
+    m_amount(0),
+    m_amountHasBeenSet(false),
+    m_period(UsageLimitPeriod::NOT_SET),
+    m_periodHasBeenSet(false),
+    m_breachAction(UsageLimitBreachAction::NOT_SET),
+    m_breachActionHasBeenSet(false),
+    m_tagsHasBeenSet(false),
+    m_responseMetadataHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+UsageLimit& UsageLimit::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode usageLimitIdNode = resultNode.FirstChild("UsageLimitId");
+    if(!usageLimitIdNode.IsNull())
+    {
+      m_usageLimitId = Aws::Utils::Xml::DecodeEscapedXmlText(usageLimitIdNode.GetText());
+      m_usageLimitIdHasBeenSet = true;
+    }
+    XmlNode clusterIdentifierNode = resultNode.FirstChild("ClusterIdentifier");
+    if(!clusterIdentifierNode.IsNull())
+    {
+      m_clusterIdentifier = Aws::Utils::Xml::DecodeEscapedXmlText(clusterIdentifierNode.GetText());
+      m_clusterIdentifierHasBeenSet = true;
+    }
+    XmlNode featureTypeNode = resultNode.FirstChild("FeatureType");
+    if(!featureTypeNode.IsNull())
+    {
+      m_featureType = UsageLimitFeatureTypeMapper::GetUsageLimitFeatureTypeForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(featureTypeNode.GetText()).c_str()).c_str());
+      m_featureTypeHasBeenSet = true;
+    }
+    XmlNode limitTypeNode = resultNode.FirstChild("LimitType");
+    if(!limitTypeNode.IsNull())
+    {
+      m_limitType = UsageLimitLimitTypeMapper::GetUsageLimitLimitTypeForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(limitTypeNode.GetText()).c_str()).c_str());
+      m_limitTypeHasBeenSet = true;
+    }
+    XmlNode amountNode = resultNode.FirstChild("Amount");
+    if(!amountNode.IsNull())
+    {
+      m_amount = StringUtils::ConvertToInt64(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(amountNode.GetText()).c_str()).c_str());
+      m_amountHasBeenSet = true;
+    }
+    XmlNode periodNode = resultNode.FirstChild("Period");
+    if(!periodNode.IsNull())
+    {
+      m_period = UsageLimitPeriodMapper::GetUsageLimitPeriodForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(periodNode.GetText()).c_str()).c_str());
+      m_periodHasBeenSet = true;
+    }
+    XmlNode breachActionNode = resultNode.FirstChild("BreachAction");
+    if(!breachActionNode.IsNull())
+    {
+      m_breachAction = UsageLimitBreachActionMapper::GetUsageLimitBreachActionForName(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(breachActionNode.GetText()).c_str()).c_str());
+      m_breachActionHasBeenSet = true;
+    }
+    XmlNode tagsNode = resultNode.FirstChild("Tags");
+    if(!tagsNode.IsNull())
+    {
+      XmlNode tagsMember = tagsNode.FirstChild("Tag");
+      while(!tagsMember.IsNull())
+      {
+        m_tags.push_back(tagsMember);
+        tagsMember = tagsMember.NextNode("Tag");
+      }
+
+      m_tagsHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void UsageLimit::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_usageLimitIdHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".UsageLimitId=" << StringUtils::URLEncode(m_usageLimitId.c_str()) << "&";
+  }
+
+  if(m_clusterIdentifierHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".ClusterIdentifier=" << StringUtils::URLEncode(m_clusterIdentifier.c_str()) << "&";
+  }
+
+  if(m_featureTypeHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".FeatureType=" << UsageLimitFeatureTypeMapper::GetNameForUsageLimitFeatureType(m_featureType) << "&";
+  }
+
+  if(m_limitTypeHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".LimitType=" << UsageLimitLimitTypeMapper::GetNameForUsageLimitLimitType(m_limitType) << "&";
+  }
+
+  if(m_amountHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".Amount=" << m_amount << "&";
+  }
+
+  if(m_periodHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".Period=" << UsageLimitPeriodMapper::GetNameForUsageLimitPeriod(m_period) << "&";
+  }
+
+  if(m_breachActionHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".BreachAction=" << UsageLimitBreachActionMapper::GetNameForUsageLimitBreachAction(m_breachAction) << "&";
+  }
+
+  if(m_tagsHasBeenSet)
+  {
+      unsigned tagsIdx = 1;
+      for(auto& item : m_tags)
+      {
+        Aws::StringStream tagsSs;
+        tagsSs << location << index << locationValue << ".Tag." << tagsIdx++;
+        item.OutputToStream(oStream, tagsSs.str().c_str());
+      }
+  }
+
+  if(m_responseMetadataHasBeenSet)
+  {
+      Aws::StringStream responseMetadataLocationAndMemberSs;
+      responseMetadataLocationAndMemberSs << location << index << locationValue << ".ResponseMetadata";
+      m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMemberSs.str().c_str());
+  }
+
+}
+
+void UsageLimit::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_usageLimitIdHasBeenSet)
+  {
+      oStream << location << ".UsageLimitId=" << StringUtils::URLEncode(m_usageLimitId.c_str()) << "&";
+  }
+  if(m_clusterIdentifierHasBeenSet)
+  {
+      oStream << location << ".ClusterIdentifier=" << StringUtils::URLEncode(m_clusterIdentifier.c_str()) << "&";
+  }
+  if(m_featureTypeHasBeenSet)
+  {
+      oStream << location << ".FeatureType=" << UsageLimitFeatureTypeMapper::GetNameForUsageLimitFeatureType(m_featureType) << "&";
+  }
+  if(m_limitTypeHasBeenSet)
+  {
+      oStream << location << ".LimitType=" << UsageLimitLimitTypeMapper::GetNameForUsageLimitLimitType(m_limitType) << "&";
+  }
+  if(m_amountHasBeenSet)
+  {
+      oStream << location << ".Amount=" << m_amount << "&";
+  }
+  if(m_periodHasBeenSet)
+  {
+      oStream << location << ".Period=" << UsageLimitPeriodMapper::GetNameForUsageLimitPeriod(m_period) << "&";
+  }
+  if(m_breachActionHasBeenSet)
+  {
+      oStream << location << ".BreachAction=" << UsageLimitBreachActionMapper::GetNameForUsageLimitBreachAction(m_breachAction) << "&";
+  }
+  if(m_tagsHasBeenSet)
+  {
+      unsigned tagsIdx = 1;
+      for(auto& item : m_tags)
+      {
+        Aws::StringStream tagsSs;
+        tagsSs << location <<  ".Tag." << tagsIdx++;
+        item.OutputToStream(oStream, tagsSs.str().c_str());
+      }
+  }
+  if(m_responseMetadataHasBeenSet)
+  {
+      Aws::String responseMetadataLocationAndMember(location);
+      responseMetadataLocationAndMember += ".ResponseMetadata";
+      m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str());
+  }
+}
+
+} // namespace Model
+} // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/source/model/UsageLimitBreachAction.cpp b/aws-cpp-sdk-redshift/source/model/UsageLimitBreachAction.cpp
new file mode 100644
index 00000000000..c489da78629
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/UsageLimitBreachAction.cpp
@@ -0,0 +1,87 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/UsageLimitBreachAction.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace Redshift
+  {
+    namespace Model
+    {
+      namespace UsageLimitBreachActionMapper
+      {
+
+        static const int log_HASH = HashingUtils::HashString("log");
+        static const int emit_metric_HASH = HashingUtils::HashString("emit-metric");
+        static const int disable_HASH = HashingUtils::HashString("disable");
+
+
+        UsageLimitBreachAction GetUsageLimitBreachActionForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == log_HASH)
+          {
+            return UsageLimitBreachAction::log;
+          }
+          else if (hashCode == emit_metric_HASH)
+          {
+            return UsageLimitBreachAction::emit_metric;
+          }
+          else if (hashCode == disable_HASH)
+          {
+            return UsageLimitBreachAction::disable;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<UsageLimitBreachAction>(hashCode);
+          }
+
+          return UsageLimitBreachAction::NOT_SET;
+        }
+
+        Aws::String GetNameForUsageLimitBreachAction(UsageLimitBreachAction enumValue)
+        {
+          switch(enumValue)
+          {
+          case UsageLimitBreachAction::log:
+            return "log";
+          case UsageLimitBreachAction::emit_metric:
+            return "emit-metric";
+          case UsageLimitBreachAction::disable:
+            return "disable";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace UsageLimitBreachActionMapper
+    } // namespace Model
+  } // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/source/model/UsageLimitFeatureType.cpp b/aws-cpp-sdk-redshift/source/model/UsageLimitFeatureType.cpp
new file mode 100644
index 00000000000..06843612bd1
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/UsageLimitFeatureType.cpp
@@ -0,0 +1,80 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/UsageLimitFeatureType.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace Redshift
+  {
+    namespace Model
+    {
+      namespace UsageLimitFeatureTypeMapper
+      {
+
+        static const int spectrum_HASH = HashingUtils::HashString("spectrum");
+        static const int concurrency_scaling_HASH = HashingUtils::HashString("concurrency-scaling");
+
+
+        UsageLimitFeatureType GetUsageLimitFeatureTypeForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == spectrum_HASH)
+          {
+            return UsageLimitFeatureType::spectrum;
+          }
+          else if (hashCode == concurrency_scaling_HASH)
+          {
+            return UsageLimitFeatureType::concurrency_scaling;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<UsageLimitFeatureType>(hashCode);
+          }
+
+          return UsageLimitFeatureType::NOT_SET;
+        }
+
+        Aws::String GetNameForUsageLimitFeatureType(UsageLimitFeatureType enumValue)
+        {
+          switch(enumValue)
+          {
+          case UsageLimitFeatureType::spectrum:
+            return "spectrum";
+          case UsageLimitFeatureType::concurrency_scaling:
+            return "concurrency-scaling";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace UsageLimitFeatureTypeMapper
+    } // namespace Model
+  } // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/source/model/UsageLimitLimitType.cpp b/aws-cpp-sdk-redshift/source/model/UsageLimitLimitType.cpp
new file mode 100644
index 00000000000..510afaf5ea1
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/UsageLimitLimitType.cpp
@@ -0,0 +1,80 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/UsageLimitLimitType.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace Redshift
+  {
+    namespace Model
+    {
+      namespace UsageLimitLimitTypeMapper
+      {
+
+        static const int time_HASH = HashingUtils::HashString("time");
+        static const int data_scanned_HASH = HashingUtils::HashString("data-scanned");
+
+
+        UsageLimitLimitType GetUsageLimitLimitTypeForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == time_HASH)
+          {
+            return UsageLimitLimitType::time;
+          }
+          else if (hashCode == data_scanned_HASH)
+          {
+            return UsageLimitLimitType::data_scanned;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<UsageLimitLimitType>(hashCode);
+          }
+
+          return UsageLimitLimitType::NOT_SET;
+        }
+
+        Aws::String GetNameForUsageLimitLimitType(UsageLimitLimitType enumValue)
+        {
+          switch(enumValue)
+          {
+          case UsageLimitLimitType::time:
+            return "time";
+          case UsageLimitLimitType::data_scanned:
+            return "data-scanned";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace UsageLimitLimitTypeMapper
+    } // namespace Model
+  } // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-redshift/source/model/UsageLimitPeriod.cpp b/aws-cpp-sdk-redshift/source/model/UsageLimitPeriod.cpp
new file mode 100644
index 00000000000..8b23dba2fea
--- /dev/null
+++ b/aws-cpp-sdk-redshift/source/model/UsageLimitPeriod.cpp
@@ -0,0 +1,87 @@
+/*
+* Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/redshift/model/UsageLimitPeriod.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace Redshift
+  {
+    namespace Model
+    {
+      namespace UsageLimitPeriodMapper
+      {
+
+        static const int daily_HASH = HashingUtils::HashString("daily");
+        static const int weekly_HASH = HashingUtils::HashString("weekly");
+        static const int monthly_HASH = HashingUtils::HashString("monthly");
+
+
+        UsageLimitPeriod GetUsageLimitPeriodForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == daily_HASH)
+          {
+            return UsageLimitPeriod::daily;
+          }
+          else if (hashCode == weekly_HASH)
+          {
+            return UsageLimitPeriod::weekly;
+          }
+          else if (hashCode == monthly_HASH)
+          {
+            return UsageLimitPeriod::monthly;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<UsageLimitPeriod>(hashCode);
+          }
+
+          return UsageLimitPeriod::NOT_SET;
+        }
+
+        Aws::String GetNameForUsageLimitPeriod(UsageLimitPeriod enumValue)
+        {
+          switch(enumValue)
+          {
+          case UsageLimitPeriod::daily:
+            return "daily";
+          case UsageLimitPeriod::weekly:
+            return "weekly";
+          case UsageLimitPeriod::monthly:
+            return "monthly";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace UsageLimitPeriodMapper
+    } // namespace Model
+  } // namespace Redshift
+} // namespace Aws
diff --git a/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/TranscriptResultStream.h b/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/TranscriptResultStream.h
index b6d7303b616..357b1bdf221 100644
--- a/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/TranscriptResultStream.h
+++ b/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/TranscriptResultStream.h
@@ -20,6 +20,7 @@
 #include <aws/transcribestreaming/model/LimitExceededException.h>
 #include <aws/transcribestreaming/model/InternalFailureException.h>
 #include <aws/transcribestreaming/model/ConflictException.h>
+#include <aws/transcribestreaming/model/ServiceUnavailableException.h>
 #include <utility>
 
 namespace Aws
@@ -254,6 +255,37 @@ namespace Model
      */
     inline TranscriptResultStream& WithConflictException(ConflictException&& value) { SetConflictException(std::move(value)); return *this;}
 
+
+    /**
+     * <p>Service is currently unavailable. Try your request later.</p>
+     */
+    inline const ServiceUnavailableException& GetServiceUnavailableException() const{ return m_serviceUnavailableException; }
+
+    /**
+     * <p>Service is currently unavailable. Try your request later.</p>
+     */
+    inline bool ServiceUnavailableExceptionHasBeenSet() const { return m_serviceUnavailableExceptionHasBeenSet; }
+
+    /**
+     * <p>Service is currently unavailable. Try your request later.</p>
+     */
+    inline void SetServiceUnavailableException(const ServiceUnavailableException& value) { m_serviceUnavailableExceptionHasBeenSet = true; m_serviceUnavailableException = value; }
+
+    /**
+     * <p>Service is currently unavailable. Try your request later.</p>
+     */
+    inline void SetServiceUnavailableException(ServiceUnavailableException&& value) { m_serviceUnavailableExceptionHasBeenSet = true; m_serviceUnavailableException = std::move(value); }
+
+    /**
+     * <p>Service is currently unavailable. Try your request later.</p>
+     */
+    inline TranscriptResultStream& WithServiceUnavailableException(const ServiceUnavailableException& value) { SetServiceUnavailableException(value); return *this;}
+
+    /**
+     * <p>Service is currently unavailable. Try your request later.</p>
+     */
+    inline TranscriptResultStream& WithServiceUnavailableException(ServiceUnavailableException&& value) { SetServiceUnavailableException(std::move(value)); return *this;}
+
   private:
 
     TranscriptEvent m_transcriptEvent;
@@ -270,6 +302,9 @@ namespace Model
 
     ConflictException m_conflictException;
     bool m_conflictExceptionHasBeenSet;
+
+    ServiceUnavailableException m_serviceUnavailableException;
+    bool m_serviceUnavailableExceptionHasBeenSet;
   };
 
 } // namespace Model
diff --git a/aws-cpp-sdk-transcribestreaming/source/model/StartStreamTranscriptionHandler.cpp b/aws-cpp-sdk-transcribestreaming/source/model/StartStreamTranscriptionHandler.cpp
index 38af19500da..50d7d4cb57f 100644
--- a/aws-cpp-sdk-transcribestreaming/source/model/StartStreamTranscriptionHandler.cpp
+++ b/aws-cpp-sdk-transcribestreaming/source/model/StartStreamTranscriptionHandler.cpp
@@ -151,7 +151,7 @@ namespace Model
             JsonValue exceptionPayload(GetEventPayloadAsString());
             if (!exceptionPayload.WasParseSuccessful())
             {
-                AWS_LOGSTREAM_ERROR(STARTSTREAMTRANSCRIPTION_HANDLER_CLASS_TAG, "Unable to generate a proper ConflictException object from the response in JSON format.");
+                AWS_LOGSTREAM_ERROR(STARTSTREAMTRANSCRIPTION_HANDLER_CLASS_TAG, "Unable to generate a proper ServiceUnavailableException object from the response in JSON format.");
                 auto contentTypeIter = headers.find(Aws::Utils::Event::CONTENT_TYPE_HEADER);
                 if (contentTypeIter != headers.end())
                 {
diff --git a/code-generation/api-descriptions/codeguru-reviewer-2019-09-19.normal.json b/code-generation/api-descriptions/codeguru-reviewer-2019-09-19.normal.json
index 8647c39b3f3..d894bb0d574 100644
--- a/code-generation/api-descriptions/codeguru-reviewer-2019-09-19.normal.json
+++ b/code-generation/api-descriptions/codeguru-reviewer-2019-09-19.normal.json
@@ -28,7 +28,41 @@
         {"shape":"ConflictException"},
         {"shape":"ThrottlingException"}
       ],
-      "documentation":"<p>Associates an AWS CodeCommit repository with Amazon CodeGuru Reviewer. When you associate an AWS CodeCommit repository with Amazon CodeGuru Reviewer, Amazon CodeGuru Reviewer will provide recommendations for each pull request. You can view recommendations in the AWS CodeCommit repository.</p> <p>You can associate a GitHub repository using the Amazon CodeGuru Reviewer console.</p>"
+      "documentation":"<p>Associates an AWS CodeCommit repository with Amazon CodeGuru Reviewer. When you associate an AWS CodeCommit repository with Amazon CodeGuru Reviewer, Amazon CodeGuru Reviewer will provide recommendations for each pull request raised within the repository. You can view recommendations in the AWS CodeCommit repository.</p> <p>You can associate a GitHub repository using the Amazon CodeGuru Reviewer console.</p>"
+    },
+    "DescribeCodeReview":{
+      "name":"DescribeCodeReview",
+      "http":{
+        "method":"GET",
+        "requestUri":"/codereviews/{CodeReviewArn}"
+      },
+      "input":{"shape":"DescribeCodeReviewRequest"},
+      "output":{"shape":"DescribeCodeReviewResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p> Returns the metadaata associated with the code review along with its status.</p>"
+    },
+    "DescribeRecommendationFeedback":{
+      "name":"DescribeRecommendationFeedback",
+      "http":{
+        "method":"GET",
+        "requestUri":"/feedback/{CodeReviewArn}"
+      },
+      "input":{"shape":"DescribeRecommendationFeedbackRequest"},
+      "output":{"shape":"DescribeRecommendationFeedbackResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p> Describes the customer feedback for a CodeGuru Reviewer recommendation. </p>"
     },
     "DescribeRepositoryAssociation":{
       "name":"DescribeRepositoryAssociation",
@@ -65,6 +99,56 @@
       ],
       "documentation":"<p>Removes the association between Amazon CodeGuru Reviewer and a repository.</p>"
     },
+    "ListCodeReviews":{
+      "name":"ListCodeReviews",
+      "http":{
+        "method":"GET",
+        "requestUri":"/codereviews"
+      },
+      "input":{"shape":"ListCodeReviewsRequest"},
+      "output":{"shape":"ListCodeReviewsResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p> Lists all the code reviews that the customer has created in the past 90 days. </p>"
+    },
+    "ListRecommendationFeedback":{
+      "name":"ListRecommendationFeedback",
+      "http":{
+        "method":"GET",
+        "requestUri":"/feedback/{CodeReviewArn}/RecommendationFeedback"
+      },
+      "input":{"shape":"ListRecommendationFeedbackRequest"},
+      "output":{"shape":"ListRecommendationFeedbackResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p> Lists the customer feedback for a CodeGuru Reviewer recommendation for all users. This API will be used from the console to extract the previously given feedback by the user to pre-populate the feedback emojis for all recommendations. </p>"
+    },
+    "ListRecommendations":{
+      "name":"ListRecommendations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/codereviews/{CodeReviewArn}/Recommendations"
+      },
+      "input":{"shape":"ListRecommendationsRequest"},
+      "output":{"shape":"ListRecommendationsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p> Returns the list of all recommendations for a completed code review. </p>"
+    },
     "ListRepositoryAssociations":{
       "name":"ListRepositoryAssociations",
       "http":{
@@ -79,6 +163,23 @@
         {"shape":"ThrottlingException"}
       ],
       "documentation":"<p>Lists repository associations. You can optionally filter on one or more of the following recommendation properties: provider types, states, names, and owners.</p>"
+    },
+    "PutRecommendationFeedback":{
+      "name":"PutRecommendationFeedback",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/feedback"
+      },
+      "input":{"shape":"PutRecommendationFeedbackRequest"},
+      "output":{"shape":"PutRecommendationFeedbackResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p> Stores customer feedback for a CodeGuru-Reviewer recommendation. When this API is called again with different reactions the previous feedback is overwritten. </p>"
     }
   },
   "shapes":{
@@ -95,7 +196,7 @@
       "type":"string",
       "max":1600,
       "min":1,
-      "pattern":"^arn:aws[^:\\s]*:codeguru-reviewer:[^:\\s]+:[\\d]{12}:[a-z]+:[\\w-]+$"
+      "pattern":"^arn:aws[^:\\s]*:codeguru-reviewer:[^:\\s]+:[\\d]{12}:[a-z-]+:[\\w-]+$"
     },
     "AssociateRepositoryRequest":{
       "type":"structure",
@@ -107,7 +208,7 @@
         },
         "ClientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p> <p>If you want to add a new repository association, this parameter specifies a unique identifier for the new repository association that helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to call this operation, then you can leave this parameter empty. The CLI or SDK generates a random UUID for you and includes that in the request. If you don't use the SDK and instead generate a raw HTTP request to the Secrets Manager service endpoint, then you must generate a ClientRequestToken yourself for new versions and include that value in the request.</p> <p>You typically only need to interact with this value if you implement your own retry logic and want to ensure that a given repository association is not created twice. We recommend that you generate a UUID-type value to ensure uniqueness within the specified repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation of duplicate repository associations if there are failures and retries. </p>",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p> <p>To add a new repository association, this parameter specifies a unique identifier for the new repository association that helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDKs to call this operation, you can leave this parameter empty. The CLI or SDK generates a random UUID for you and includes that in the request. If you don't use the SDK and instead generate a raw HTTP request to the Secrets Manager service endpoint, you must generate a ClientRequestToken yourself for new versions and include that value in the request.</p> <p>You typically interact with this value if you implement your own retry logic and want to ensure that a given repository association is not created twice. We recommend that you generate a UUID-type value to ensure uniqueness within the specified repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation of duplicate repository associations if there are failures and retries. </p>",
           "idempotencyToken":true
         }
       }
@@ -143,6 +244,137 @@
       },
       "documentation":"<p>Information about an AWS CodeCommit repository.</p>"
     },
+    "CodeReview":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p> The name of the code review. </p>"
+        },
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the code review to describe. </p>"
+        },
+        "RepositoryName":{
+          "shape":"Name",
+          "documentation":"<p> The name of the repository. </p>"
+        },
+        "Owner":{
+          "shape":"Owner",
+          "documentation":"<p> The owner of the repository. </p>"
+        },
+        "ProviderType":{
+          "shape":"ProviderType",
+          "documentation":"<p> The provider type of the repository association. </p>"
+        },
+        "State":{
+          "shape":"JobState",
+          "documentation":"<p> The state of the code review. </p>"
+        },
+        "StateReason":{
+          "shape":"StateReason",
+          "documentation":"<p> The reason for the state of the code review. </p>"
+        },
+        "CreatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p> The time, in milliseconds since the epoch, when the code review was created. </p>"
+        },
+        "LastUpdatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p> The time, in milliseconds since the epoch, when the code review was last updated. </p>"
+        },
+        "Type":{
+          "shape":"Type",
+          "documentation":"<p> The type of code review. </p>"
+        },
+        "PullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p> The pull request ID for the code review. </p>"
+        },
+        "SourceCodeType":{
+          "shape":"SourceCodeType",
+          "documentation":"<p> The type of the source code for the code review. </p>"
+        },
+        "Metrics":{
+          "shape":"Metrics",
+          "documentation":"<p> The statistics from the code review. </p>"
+        }
+      },
+      "documentation":"<p> Information about a code review. </p>"
+    },
+    "CodeReviewSummaries":{
+      "type":"list",
+      "member":{"shape":"CodeReviewSummary"}
+    },
+    "CodeReviewSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p> The name of the code review. </p>"
+        },
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the code review to describe. </p>"
+        },
+        "RepositoryName":{
+          "shape":"Name",
+          "documentation":"<p> The name of the repository. </p>"
+        },
+        "Owner":{
+          "shape":"Owner",
+          "documentation":"<p> The owner of the repository. </p>"
+        },
+        "ProviderType":{
+          "shape":"ProviderType",
+          "documentation":"<p> The provider type of the repository association. </p>"
+        },
+        "State":{
+          "shape":"JobState",
+          "documentation":"<p> The state of the code review. </p>"
+        },
+        "CreatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p> The time, in milliseconds since the epoch, when the code review was created. </p>"
+        },
+        "LastUpdatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p> The time, in milliseconds since the epoch, when the code review was last updated. </p>"
+        },
+        "Type":{
+          "shape":"Type",
+          "documentation":"<p> The type of the code review. </p>"
+        },
+        "PullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p> The pull request ID for the code review. </p>"
+        },
+        "MetricsSummary":{
+          "shape":"MetricsSummary",
+          "documentation":"<p> The statistics from the code review. </p>"
+        }
+      },
+      "documentation":"<p> Information about the summary of the code review. </p>"
+    },
+    "CommitDiffSourceCodeType":{
+      "type":"structure",
+      "members":{
+        "SourceCommit":{
+          "shape":"CommitId",
+          "documentation":"<p> Source Commit SHA. </p>"
+        },
+        "DestinationCommit":{
+          "shape":"CommitId",
+          "documentation":"<p> Destination Commit SHA </p>"
+        }
+      },
+      "documentation":"<p> The commit diff for the pull request. </p>"
+    },
+    "CommitId":{
+      "type":"string",
+      "max":64,
+      "min":6
+    },
     "ConflictException":{
       "type":"structure",
       "members":{
@@ -152,13 +384,70 @@
       "error":{"httpStatusCode":409},
       "exception":true
     },
+    "DescribeCodeReviewRequest":{
+      "type":"structure",
+      "required":["CodeReviewArn"],
+      "members":{
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the code review to describe. </p>",
+          "location":"uri",
+          "locationName":"CodeReviewArn"
+        }
+      }
+    },
+    "DescribeCodeReviewResponse":{
+      "type":"structure",
+      "members":{
+        "CodeReview":{
+          "shape":"CodeReview",
+          "documentation":"<p> Information about the code review. </p>"
+        }
+      }
+    },
+    "DescribeRecommendationFeedbackRequest":{
+      "type":"structure",
+      "required":[
+        "CodeReviewArn",
+        "RecommendationId"
+      ],
+      "members":{
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) that identifies the code review. </p>",
+          "location":"uri",
+          "locationName":"CodeReviewArn"
+        },
+        "RecommendationId":{
+          "shape":"RecommendationId",
+          "documentation":"<p> The recommendation ID that can be used to track the provided recommendations and then to collect the feedback. </p>",
+          "location":"querystring",
+          "locationName":"RecommendationId"
+        },
+        "UserId":{
+          "shape":"UserId",
+          "documentation":"<p> Optional parameter to describe the feedback for a given user. If this is not supplied, it defaults to the user making the request. </p>",
+          "location":"querystring",
+          "locationName":"UserId"
+        }
+      }
+    },
+    "DescribeRecommendationFeedbackResponse":{
+      "type":"structure",
+      "members":{
+        "RecommendationFeedback":{
+          "shape":"RecommendationFeedback",
+          "documentation":"<p> The recommendation feedback given by the user. </p>"
+        }
+      }
+    },
     "DescribeRepositoryAssociationRequest":{
       "type":"structure",
       "required":["AssociationArn"],
       "members":{
         "AssociationArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) identifying the association.</p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) identifying the association. You can retrieve this ARN by calling <code>ListRepositories</code>.</p>",
           "location":"uri",
           "locationName":"AssociationArn"
         }
@@ -195,6 +484,12 @@
       }
     },
     "ErrorMessage":{"type":"string"},
+    "FilePath":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "FindingsCount":{"type":"long"},
     "InternalServerException":{
       "type":"structure",
       "members":{
@@ -205,6 +500,168 @@
       "exception":true,
       "fault":true
     },
+    "JobState":{
+      "type":"string",
+      "enum":[
+        "Completed",
+        "Pending",
+        "Failed",
+        "Deleting"
+      ]
+    },
+    "JobStates":{
+      "type":"list",
+      "member":{"shape":"JobState"},
+      "max":3,
+      "min":1
+    },
+    "LineNumber":{"type":"integer"},
+    "ListCodeReviewsMaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "ListCodeReviewsRequest":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "ProviderTypes":{
+          "shape":"ProviderTypes",
+          "documentation":"<p> List of provider types for filtering that needs to be applied before displaying the result. For example, \"providerTypes=[GitHub]\" will list code reviews from GitHub. </p>",
+          "location":"querystring",
+          "locationName":"ProviderTypes"
+        },
+        "States":{
+          "shape":"JobStates",
+          "documentation":"<p> List of states for filtering that needs to be applied before displaying the result. For example, \"states=[Pending]\" will list code reviews in the Pending state. </p>",
+          "location":"querystring",
+          "locationName":"States"
+        },
+        "RepositoryNames":{
+          "shape":"RepositoryNames",
+          "documentation":"<p> List of repository names for filtering that needs to be applied before displaying the result. </p>",
+          "location":"querystring",
+          "locationName":"RepositoryNames"
+        },
+        "Type":{
+          "shape":"Type",
+          "documentation":"<p> The type of code reviews to list in the response. </p>",
+          "location":"querystring",
+          "locationName":"Type"
+        },
+        "MaxResults":{
+          "shape":"ListCodeReviewsMaxResults",
+          "documentation":"<p> The maximum number of results that are returned per call. The default is 100. </p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> If nextToken is returned, there are more results available. The value of nextToken is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. </p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        }
+      }
+    },
+    "ListCodeReviewsResponse":{
+      "type":"structure",
+      "members":{
+        "CodeReviewSummaries":{
+          "shape":"CodeReviewSummaries",
+          "documentation":"<p> A list of code reviews that meet the criteria of the request. </p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> Pagination token. </p>"
+        }
+      }
+    },
+    "ListRecommendationFeedbackRequest":{
+      "type":"structure",
+      "required":["CodeReviewArn"],
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> If nextToken is returned, there are more results available. The value of nextToken is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. </p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p> The maximum number of results that are returned per call. The default is 100. </p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        },
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) that identifies the code review. </p>",
+          "location":"uri",
+          "locationName":"CodeReviewArn"
+        },
+        "UserIds":{
+          "shape":"UserIds",
+          "documentation":"<p> Filter on userIds that need to be applied before displaying the result. This can be used to query all the recommendation feedback for a code review from a given user. </p>",
+          "location":"querystring",
+          "locationName":"UserIds"
+        },
+        "RecommendationIds":{
+          "shape":"RecommendationIds",
+          "documentation":"<p> Filter on recommendationIds that need to be applied before displaying the result. This can be used to query all the recommendation feedback for a given recommendation. </p>",
+          "location":"querystring",
+          "locationName":"RecommendationIds"
+        }
+      }
+    },
+    "ListRecommendationFeedbackResponse":{
+      "type":"structure",
+      "members":{
+        "RecommendationFeedbackSummaries":{
+          "shape":"RecommendationFeedbackSummaries",
+          "documentation":"<p> Recommendation feedback summaries corresponding to the code reivew ARN. </p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> If nextToken is returned, there are more results available. The value of nextToken is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. </p>"
+        }
+      }
+    },
+    "ListRecommendationsRequest":{
+      "type":"structure",
+      "required":["CodeReviewArn"],
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> Pagination token. </p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p> The maximum number of results that are returned per call. The default is 100. </p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        },
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the code review to describe. </p>",
+          "location":"uri",
+          "locationName":"CodeReviewArn"
+        }
+      }
+    },
+    "ListRecommendationsResponse":{
+      "type":"structure",
+      "members":{
+        "RecommendationSummaries":{
+          "shape":"RecommendationSummaries",
+          "documentation":"<p> List of recommendations for the requested code review. </p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> Pagination token. </p>"
+        }
+      }
+    },
     "ListRepositoryAssociationsRequest":{
       "type":"structure",
       "members":{
@@ -222,25 +679,25 @@
         },
         "Names":{
           "shape":"Names",
-          "documentation":"<p>List of names to use as a filter.</p>",
+          "documentation":"<p>List of repository names to use as a filter.</p>",
           "location":"querystring",
           "locationName":"Name"
         },
         "Owners":{
           "shape":"Owners",
-          "documentation":"<p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS account id. For GitHub, it is the GitHub account name.</p>",
+          "documentation":"<p>List of owners to use as a filter. For GitHub, this is name of the GitHub account that was used to associate the repository. For AWS CodeCommit, it is the name of the CodeCommit account that was used to associate the repository.</p>",
           "location":"querystring",
           "locationName":"Owner"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of repository association results returned by <code>ListRepositoryAssociations</code> in paginated output. When this parameter is used, <code>ListRepositoryAssociations</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRepositoryAssociations</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListRepositoryAssociations</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>",
+          "documentation":"<p>The maximum number of repository association results returned by <code>ListRepositoryAssociations</code> in paginated output. When this parameter is used, <code>ListRepositoryAssociations</code> only returns <code>maxResults</code> results in a single page with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRepositoryAssociations</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 25. If this parameter is not used, <code>ListRepositoryAssociations</code> returns up to 25 results and a <code>nextToken</code> value if applicable. </p>",
           "location":"querystring",
           "locationName":"MaxResults"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRepositoryAssociations</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRepositoryAssociations</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>Treat this token as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>",
           "location":"querystring",
           "locationName":"NextToken"
         }
@@ -264,6 +721,35 @@
       "max":100,
       "min":1
     },
+    "MeteredLinesOfCodeCount":{"type":"long"},
+    "Metrics":{
+      "type":"structure",
+      "members":{
+        "MeteredLinesOfCodeCount":{
+          "shape":"MeteredLinesOfCodeCount",
+          "documentation":"<p> Lines of code metered in the code review. </p>"
+        },
+        "FindingsCount":{
+          "shape":"FindingsCount",
+          "documentation":"<p> Total number of recommendations found in the code review. </p>"
+        }
+      },
+      "documentation":"<p> Information about the statistics from the code review. </p>"
+    },
+    "MetricsSummary":{
+      "type":"structure",
+      "members":{
+        "MeteredLinesOfCodeCount":{
+          "shape":"MeteredLinesOfCodeCount",
+          "documentation":"<p> Lines of code metered in the code review. </p>"
+        },
+        "FindingsCount":{
+          "shape":"FindingsCount",
+          "documentation":"<p> Total number of recommendations found in the code review. </p>"
+        }
+      },
+      "documentation":"<p> Information about metrics summaries. </p>"
+    },
     "Name":{
       "type":"string",
       "max":100,
@@ -315,6 +801,144 @@
       "max":3,
       "min":1
     },
+    "PullRequestId":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "PutRecommendationFeedbackRequest":{
+      "type":"structure",
+      "required":[
+        "CodeReviewArn",
+        "RecommendationId",
+        "Reactions"
+      ],
+      "members":{
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) that identifies the code review. </p>"
+        },
+        "RecommendationId":{
+          "shape":"RecommendationId",
+          "documentation":"<p> The recommendation ID that can be used to track the provided recommendations and then to collect the feedback. </p>"
+        },
+        "Reactions":{
+          "shape":"Reactions",
+          "documentation":"<p> List for storing reactions. Reactions are utf-8 text code for emojis. If you send an empty list it clears all your feedback. </p>"
+        }
+      }
+    },
+    "PutRecommendationFeedbackResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "Reaction":{
+      "type":"string",
+      "enum":[
+        "ThumbsUp",
+        "ThumbsDown"
+      ]
+    },
+    "Reactions":{
+      "type":"list",
+      "member":{"shape":"Reaction"},
+      "max":1,
+      "min":0
+    },
+    "RecommendationFeedback":{
+      "type":"structure",
+      "members":{
+        "CodeReviewArn":{
+          "shape":"Arn",
+          "documentation":"<p> The Amazon Resource Name (ARN) that identifies the code review. </p>"
+        },
+        "RecommendationId":{
+          "shape":"RecommendationId",
+          "documentation":"<p> The recommendation ID that can be used to track the provided recommendations. Later on it can be used to collect the feedback. </p>"
+        },
+        "Reactions":{
+          "shape":"Reactions",
+          "documentation":"<p> List for storing reactions. Reactions are utf-8 text code for emojis. You can send an empty list to clear off all your feedback. </p>"
+        },
+        "UserId":{
+          "shape":"UserId",
+          "documentation":"<p> The user principal that made the API call. </p>"
+        },
+        "CreatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p> The time at which the feedback was created. </p>"
+        },
+        "LastUpdatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p> The time at which the feedback was last updated. </p>"
+        }
+      },
+      "documentation":"<p> Information about the recommendation feedback. </p>"
+    },
+    "RecommendationFeedbackSummaries":{
+      "type":"list",
+      "member":{"shape":"RecommendationFeedbackSummary"}
+    },
+    "RecommendationFeedbackSummary":{
+      "type":"structure",
+      "members":{
+        "RecommendationId":{
+          "shape":"RecommendationId",
+          "documentation":"<p> The recommendation ID that can be used to track the provided recommendations. Later on it can be used to collect the feedback. </p>"
+        },
+        "Reactions":{
+          "shape":"Reactions",
+          "documentation":"<p> List for storing reactions. Reactions are utf-8 text code for emojis. </p>"
+        },
+        "UserId":{
+          "shape":"UserId",
+          "documentation":"<p> The identifier for the user that gave the feedback. </p>"
+        }
+      },
+      "documentation":"<p> Information about recommendation feedback summaries. </p>"
+    },
+    "RecommendationId":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "RecommendationIds":{
+      "type":"list",
+      "member":{"shape":"RecommendationId"},
+      "max":100,
+      "min":1
+    },
+    "RecommendationSummaries":{
+      "type":"list",
+      "member":{"shape":"RecommendationSummary"}
+    },
+    "RecommendationSummary":{
+      "type":"structure",
+      "members":{
+        "FilePath":{
+          "shape":"FilePath",
+          "documentation":"<p>Name of the file on which a recommendation is provided.</p>"
+        },
+        "RecommendationId":{
+          "shape":"RecommendationId",
+          "documentation":"<p> The recommendation ID that can be used to track the provided recommendations. Later on it can be used to collect the feedback. </p>"
+        },
+        "StartLine":{
+          "shape":"LineNumber",
+          "documentation":"<p> Start line from where the recommendation is applicable in the source commit or source branch. </p>"
+        },
+        "EndLine":{
+          "shape":"LineNumber",
+          "documentation":"<p> Last line where the recommendation is applicable in the source commit or source branch. For a single line comment the start line and end line values will be the same. </p>"
+        },
+        "Description":{
+          "shape":"Text",
+          "documentation":"<p> A description of the recommendation generated by CodeGuru Reviewer for the lines of code between the start line and the end line. </p>"
+        }
+      },
+      "documentation":"<p> Information about recommendations. </p>"
+    },
     "Repository":{
       "type":"structure",
       "members":{
@@ -330,7 +954,7 @@
       "members":{
         "AssociationId":{
           "shape":"AssociationId",
-          "documentation":"<p>The id of the repository association.</p>"
+          "documentation":"<p>The ID of the repository association.</p>"
         },
         "AssociationArn":{
           "shape":"Arn",
@@ -415,16 +1039,46 @@
         },
         "State":{
           "shape":"RepositoryAssociationState",
-          "documentation":"<p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd> <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd> <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd> <dt>Failed</dt> <dd> <p>The association failed. For more information about troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd> <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of disassociating with the repository. </p> </dd> </dl>"
+          "documentation":"<p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd> <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd> <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd> <dt>Failed</dt> <dd> <p>The association failed. </p> </dd> <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of disassociating with the repository. </p> </dd> </dl>"
         }
       },
       "documentation":"<p>Information about a repository association.</p>"
     },
+    "RepositoryNames":{
+      "type":"list",
+      "member":{"shape":"Name"},
+      "max":100,
+      "min":1
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p> The resource specified in the request was not found. </p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "SourceCodeType":{
+      "type":"structure",
+      "members":{
+        "CommitDiff":{
+          "shape":"CommitDiffSourceCodeType",
+          "documentation":"<p> The commit diff for the pull request. </p>"
+        }
+      },
+      "documentation":"<p> Information about the source code type. </p>"
+    },
     "StateReason":{
       "type":"string",
       "max":256,
       "min":0
     },
+    "Text":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
     "ThrottlingException":{
       "type":"structure",
       "members":{
@@ -435,6 +1089,21 @@
       "exception":true
     },
     "TimeStamp":{"type":"timestamp"},
+    "Type":{
+      "type":"string",
+      "enum":["PullRequest"]
+    },
+    "UserId":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "UserIds":{
+      "type":"list",
+      "member":{"shape":"UserId"},
+      "max":100,
+      "min":1
+    },
     "ValidationException":{
       "type":"structure",
       "members":{
diff --git a/code-generation/api-descriptions/es-2015-01-01.normal.json b/code-generation/api-descriptions/es-2015-01-01.normal.json
index 5bd871c9a7e..4d8fcd91e64 100644
--- a/code-generation/api-descriptions/es-2015-01-01.normal.json
+++ b/code-generation/api-descriptions/es-2015-01-01.normal.json
@@ -2600,6 +2600,10 @@
         "AutomatedUpdateDate":{
           "shape":"DeploymentCloseDateTimeStamp",
           "documentation":"<p>Timestamp, in Epoch time, until which you can manually request a service software update. After this date, we automatically update your service software.</p>"
+        },
+        "OptionalDeployment":{
+          "shape":"Boolean",
+          "documentation":"<p><code>True</code> if a service software is never automatically updated. <code>False</code> if a service software is automatically updated after <code>AutomatedUpdateDate</code>. </p>"
         }
       },
       "documentation":"<p>The current options of an Elasticsearch domain service software options.</p>"
diff --git a/code-generation/api-descriptions/fms-2018-01-01.normal.json b/code-generation/api-descriptions/fms-2018-01-01.normal.json
index 0d894abebcd..dc81eb32853 100644
--- a/code-generation/api-descriptions/fms-2018-01-01.normal.json
+++ b/code-generation/api-descriptions/fms-2018-01-01.normal.json
@@ -235,7 +235,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"InvalidTypeException"}
       ],
-      "documentation":"<p>Creates an AWS Firewall Manager policy.</p> <p>Firewall Manager provides the following types of policies: </p> <ul> <li> <p>A Shield Advanced policy, which applies Shield Advanced protection to specified accounts and resources</p> </li> <li> <p>An AWS WAF policy, which contains a rule group and defines which resources are to be protected by that rule group</p> </li> <li> <p>A security group policy, which manages VPC security groups across your AWS organization. </p> </li> </ul> <p>Each policy is specific to one of the three types. If you want to enforce more than one policy type across accounts, you can create multiple policies. You can create multiple policies for each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield Advanced policy. For more information about subscribing to Shield Advanced, see <a href=\"https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html\">CreateSubscription</a>.</p>"
+      "documentation":"<p>Creates an AWS Firewall Manager policy.</p> <p>Firewall Manager provides the following types of policies: </p> <ul> <li> <p>A Shield Advanced policy, which applies Shield Advanced protection to specified accounts and resources</p> </li> <li> <p>An AWS WAF policy (type WAFV2), which defines rule groups to run first in the corresponding AWS WAF web ACL and rule groups to run last in the web ACL.</p> </li> <li> <p>An AWS WAF Classic policy (type WAF), which defines a rule group. </p> </li> <li> <p>A security group policy, which manages VPC security groups across your AWS organization. </p> </li> </ul> <p>Each policy is specific to one of the types. If you want to enforce more than one policy type across accounts, create multiple policies. You can create multiple policies for each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield Advanced policy. For more information about subscribing to Shield Advanced, see <a href=\"https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html\">CreateSubscription</a>.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -333,7 +333,10 @@
     },
     "CustomerPolicyScopeIdType":{
       "type":"string",
-      "enum":["ACCOUNT"]
+      "enum":[
+        "ACCOUNT",
+        "ORG_UNIT"
+      ]
     },
     "CustomerPolicyScopeMap":{
       "type":"map",
@@ -754,11 +757,11 @@
         },
         "IncludeMap":{
           "shape":"CustomerPolicyScopeMap",
-          "documentation":"<p>Specifies the AWS account IDs to include in the policy. If <code>IncludeMap</code> is null, all accounts in the organization in AWS Organizations are included in the policy. If <code>IncludeMap</code> is not null, only values listed in <code>IncludeMap</code> are included in the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid <code>IncludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p>"
+          "documentation":"<p>Specifies the AWS account IDs and AWS Organizations organizational units (OUs) to include in the policy. Specifying an OU is the equivalent of specifying all accounts in the OU and in any of its child OUs, including any child OUs and accounts that are added at a later time.</p> <p>You can specify inclusions or exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts specified by the <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code> specifications. If you do not specify an <code>IncludeMap</code>, then Firewall Manager applies the policy to all accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify account IDs by setting the key to <code>ACCOUNT</code>. For example, the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the following is a valid map: <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a single map, separated with a comma. For example, the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>"
         },
         "ExcludeMap":{
           "shape":"CustomerPolicyScopeMap",
-          "documentation":"<p>Specifies the AWS account IDs to exclude from the policy. The <code>IncludeMap</code> values are evaluated first, with all the appropriate account IDs added to the policy. Then the accounts listed in <code>ExcludeMap</code> are removed, resulting in the final list of accounts to add to the policy.</p> <p>The key to the map is <code>ACCOUNT</code>. For example, a valid <code>ExcludeMap</code> would be <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p>"
+          "documentation":"<p>Specifies the AWS account IDs and AWS Organizations organizational units (OUs) to exclude from the policy. Specifying an OU is the equivalent of specifying all accounts in the OU and in any of its child OUs, including any child OUs and accounts that are added at a later time.</p> <p>You can specify inclusions or exclusions, but not both. If you specify an <code>IncludeMap</code>, AWS Firewall Manager applies the policy to all accounts specified by the <code>IncludeMap</code>, and does not evaluate any <code>ExcludeMap</code> specifications. If you do not specify an <code>IncludeMap</code>, then Firewall Manager applies the policy to all accounts except for those specified by the <code>ExcludeMap</code>.</p> <p>You can specify account IDs, OUs, or a combination: </p> <ul> <li> <p>Specify account IDs by setting the key to <code>ACCOUNT</code>. For example, the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”]}</code>.</p> </li> <li> <p>Specify OUs by setting the key to <code>ORG_UNIT</code>. For example, the following is a valid map: <code>{“ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> <li> <p>Specify accounts and OUs together in a single map, separated with a comma. For example, the following is a valid map: <code>{“ACCOUNT” : [“accountID1”, “accountID2”], “ORG_UNIT” : [“ouid111”, “ouid112”]}</code>.</p> </li> </ul>"
         }
       },
       "documentation":"<p>An AWS Firewall Manager policy.</p>"
@@ -1015,7 +1018,7 @@
         },
         "ManagedServiceData":{
           "shape":"ManagedServiceData",
-          "documentation":"<p>Details about the service that are specific to the service type, in JSON format. For service type <code>SHIELD_ADVANCED</code>, this is an empty string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p> <code>\"SecurityServicePolicyData\": \"{ \\\"type\\\": \\\"WAFV2\\\", \\\"postProcessRuleGroups\\\": [ { \\\"managedRuleGroupIdentifier\\\": { \\\"managedRuleGroupName\\\": \\\"AWSManagedRulesAdminProtectionRuleSet\\\", \\\"vendor\\\": \\\"AWS\\\" } \\\"ruleGroupARN\\\": \\\"rule group arn\", \\\"overrideAction\\\": { \\\"type\\\": \\\"COUNT|\\\" }, \\\"excludedRules\\\": [ { \\\"name\\\" : \\\"EntityName\\\" } ], \\\"type\\\": \\\"ManagedRuleGroup|RuleGroup\\\" } ], \\\"preProcessRuleGroups\\\": [ { \\\"managedRuleGroupIdentifier\\\": { \\\"managedRuleGroupName\\\": \\\"AWSManagedRulesAdminProtectionRuleSet\\\", \\\"vendor\\\": \\\"AWS\\\" } \\\"ruleGroupARN\\\": \\\"rule group arn\\\", \\\"overrideAction\\\": { \\\"type\\\": \\\"COUNT\\\" }, \\\"excludedRules\\\": [ { \\\"name\\\" : \\\"EntityName\\\" } ], \\\"type\\\": \\\"ManagedRuleGroup|RuleGroup\\\" } ], \\\"defaultAction\\\": { \\\"type\\\": \\\"BLOCK\\\" }}\" </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p> <code>\"ManagedServiceData\": \"{\\\"type\\\": \\\"WAF\\\", \\\"ruleGroups\\\": [{\\\"id\\\": \\\"12345678-1bcd-9012-efga-0987654321ab\\\", \\\"overrideAction\\\" : {\\\"type\\\": \\\"COUNT\\\"}}], \\\"defaultAction\\\": {\\\"type\\\": \\\"BLOCK\\\"}}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_COMMON\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_CONTENT_AUDIT\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd \\\"}],\\\"securityGroupAction\\\":{\\\"type\\\":\\\"ALLOW\\\"}}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> <p>The security group action for content audit can be <code>ALLOW</code> or <code>DENY</code>. For <code>ALLOW</code>, all in-scope security group rules must be within the allowed range of the policy's security group rules. For <code>DENY</code>, all in-scope security group rules must not contain a value or a range that matches a rule value or range in the policy security group.</p> </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_USAGE_AUDIT\\\",\\\"deleteUnusedSecurityGroups\\\":true,\\\"coalesceRedundantSecurityGroups\\\":true}\"},\"RemediationEnabled\":false,\"Resou rceType\":\"AWS::EC2::SecurityGroup\"}</code> </p> </li> </ul>"
+          "documentation":"<p>Details about the service that are specific to the service type, in JSON format. For service type <code>SHIELD_ADVANCED</code>, this is an empty string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p> <code>\"ManagedServiceData\": \"{\\\"type\\\":\\\"WAFV2\\\",\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"preProcessRuleGroups\\\":[{\\\"managedRuleGroupIdentifier\\\":null,\\\"ruleGroupArn\\\":\\\"rulegrouparn\\\",\\\"overrideAction\\\":{\\\"type\\\":\\\"COUNT\\\"},\\\"excludedRules\\\":[{\\\"name\\\":\\\"EntityName\\\"}],\\\"ruleGroupType\\\":\\\"RuleGroup\\\"}],\\\"postProcessRuleGroups\\\":[{\\\"managedRuleGroupIdentifier\\\":{\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesAdminProtectionRuleSet\\\",\\\"vendor\\\":\\\"AWS\\\"},\\\"ruleGroupArn\\\":\\\"rulegrouparn\\\",\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"excludedRules\\\":[],\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\"}],\\\"overrideCustomerWebACLAssociation\\\":false}\"</code> </p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p> <code>\"ManagedServiceData\": \"{\\\"type\\\": \\\"WAF\\\", \\\"ruleGroups\\\": [{\\\"id\\\": \\\"12345678-1bcd-9012-efga-0987654321ab\\\", \\\"overrideAction\\\" : {\\\"type\\\": \\\"COUNT\\\"}}], \\\"defaultAction\\\": {\\\"type\\\": \\\"BLOCK\\\"}}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_COMMON\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false, \\\"applyToAllEC2InstanceENIs\\\":false,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_CONTENT_AUDIT\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd \\\"}],\\\"securityGroupAction\\\":{\\\"type\\\":\\\"ALLOW\\\"}}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> <p>The security group action for content audit can be <code>ALLOW</code> or <code>DENY</code>. For <code>ALLOW</code>, all in-scope security group rules must be within the allowed range of the policy's security group rules. For <code>DENY</code>, all in-scope security group rules must not contain a value or a range that matches a rule value or range in the policy security group.</p> </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_USAGE_AUDIT\\\",\\\"deleteUnusedSecurityGroups\\\":true,\\\"coalesceRedundantSecurityGroups\\\":true}\"},\"RemediationEnabled\":false,\"Resou rceType\":\"AWS::EC2::SecurityGroup\"}</code> </p> </li> </ul>"
         }
       },
       "documentation":"<p>Details about the security service that is being used to protect the resources.</p>"
diff --git a/code-generation/api-descriptions/redshift-2012-12-01.normal.json b/code-generation/api-descriptions/redshift-2012-12-01.normal.json
index f4bd8e05059..c916838ebf9 100644
--- a/code-generation/api-descriptions/redshift-2012-12-01.normal.json
+++ b/code-generation/api-descriptions/redshift-2012-12-01.normal.json
@@ -405,6 +405,28 @@
       ],
       "documentation":"<p>Adds tags to a cluster.</p> <p>A resource can have up to 50 tags. If you try to create more than 50 tags for a resource, you will receive an error and the attempt will fail.</p> <p>If you specify a key that already exists for the resource, the value for that key will be updated with the new value.</p>"
     },
+    "CreateUsageLimit":{
+      "name":"CreateUsageLimit",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateUsageLimitMessage"},
+      "output":{
+        "shape":"UsageLimit",
+        "resultWrapper":"CreateUsageLimitResult"
+      },
+      "errors":[
+        {"shape":"ClusterNotFoundFault"},
+        {"shape":"InvalidClusterStateFault"},
+        {"shape":"LimitExceededFault"},
+        {"shape":"UsageLimitAlreadyExistsFault"},
+        {"shape":"InvalidUsageLimitFault"},
+        {"shape":"TagLimitExceededFault"},
+        {"shape":"UnsupportedOperationFault"}
+      ],
+      "documentation":"<p>Creates a usage limit for a specified Amazon Redshift feature on a cluster. The usage limit is identified by the returned usage limit identifier.</p>"
+    },
     "DeleteCluster":{
       "name":"DeleteCluster",
       "http":{
@@ -573,6 +595,19 @@
       ],
       "documentation":"<p>Deletes tags from a resource. You must provide the ARN of the resource from which you want to delete the tag or tags.</p>"
     },
+    "DeleteUsageLimit":{
+      "name":"DeleteUsageLimit",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteUsageLimitMessage"},
+      "errors":[
+        {"shape":"UsageLimitNotFoundFault"},
+        {"shape":"UnsupportedOperationFault"}
+      ],
+      "documentation":"<p>Deletes a usage limit from a cluster.</p>"
+    },
     "DescribeAccountAttributes":{
       "name":"DescribeAccountAttributes",
       "http":{
@@ -1018,6 +1053,23 @@
       ],
       "documentation":"<p>Returns a list of tags. You can return tags from a specific resource by specifying an ARN, or you can return all tags for a given type of resource, such as clusters, snapshots, and so on.</p> <p>The following are limitations for <code>DescribeTags</code>: </p> <ul> <li> <p>You cannot specify an ARN and a resource-type value together in the same request.</p> </li> <li> <p>You cannot use the <code>MaxRecords</code> and <code>Marker</code> parameters together with the ARN parameter.</p> </li> <li> <p>The <code>MaxRecords</code> parameter can be a range from 10 to 50 results to return in a request.</p> </li> </ul> <p>If you specify both tag keys and tag values in the same request, Amazon Redshift returns all resources that match any combination of the specified keys and values. For example, if you have <code>owner</code> and <code>environment</code> for tag keys, and <code>admin</code> and <code>test</code> for tag values, all resources that have any combination of those values are returned.</p> <p>If both tag keys and values are omitted from the request, resources are returned regardless of whether they have tag keys or values associated with them.</p>"
     },
+    "DescribeUsageLimits":{
+      "name":"DescribeUsageLimits",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeUsageLimitsMessage"},
+      "output":{
+        "shape":"UsageLimitList",
+        "resultWrapper":"DescribeUsageLimitsResult"
+      },
+      "errors":[
+        {"shape":"ClusterNotFoundFault"},
+        {"shape":"UnsupportedOperationFault"}
+      ],
+      "documentation":"<p>Shows usage limits on a cluster. Results are filtered based on the combination of input usage limit identifier, cluster identifier, and feature type parameters:</p> <ul> <li> <p>If usage limit identifier, cluster identifier, and feature type are not provided, then all usage limit objects for the current account in the current region are returned.</p> </li> <li> <p>If usage limit identifier is provided, then the corresponding usage limit object is returned.</p> </li> <li> <p>If cluster identifier is provided, then all usage limit objects for the specified cluster are returned.</p> </li> <li> <p>If cluster identifier and feature type are provided, then all usage limit objects for the combination of cluster and feature are returned.</p> </li> </ul>"
+    },
     "DisableLogging":{
       "name":"DisableLogging",
       "http":{
@@ -1376,6 +1428,24 @@
       ],
       "documentation":"<p>Modifies a snapshot schedule. Any schedule associated with a cluster is modified asynchronously.</p>"
     },
+    "ModifyUsageLimit":{
+      "name":"ModifyUsageLimit",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyUsageLimitMessage"},
+      "output":{
+        "shape":"UsageLimit",
+        "resultWrapper":"ModifyUsageLimitResult"
+      },
+      "errors":[
+        {"shape":"InvalidUsageLimitFault"},
+        {"shape":"UsageLimitNotFoundFault"},
+        {"shape":"UnsupportedOperationFault"}
+      ],
+      "documentation":"<p>Modifies a usage limit in a cluster. You can't modify the feature type or period of a usage limit.</p>"
+    },
     "PauseCluster":{
       "name":"PauseCluster",
       "http":{
@@ -3338,6 +3408,45 @@
       },
       "documentation":"<p>Contains the output from the <code>CreateTags</code> action. </p>"
     },
+    "CreateUsageLimitMessage":{
+      "type":"structure",
+      "required":[
+        "ClusterIdentifier",
+        "FeatureType",
+        "LimitType",
+        "Amount"
+      ],
+      "members":{
+        "ClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the cluster that you want to limit usage.</p>"
+        },
+        "FeatureType":{
+          "shape":"UsageLimitFeatureType",
+          "documentation":"<p>The Amazon Redshift feature that you want to limit.</p>"
+        },
+        "LimitType":{
+          "shape":"UsageLimitLimitType",
+          "documentation":"<p>The type of limit. Depending on the feature type, this can be based on a time duration or data size. If <code>FeatureType</code> is <code>spectrum</code>, then <code>LimitType</code> must be <code>data-scanned</code>. If <code>FeatureType</code> is <code>concurrency-scaling</code>, then <code>LimitType</code> must be <code>time</code>. </p>"
+        },
+        "Amount":{
+          "shape":"Long",
+          "documentation":"<p>The limit amount. If time-based, this amount is in minutes. If data-based, this amount is in terabytes (TB). The value must be a positive number. </p>"
+        },
+        "Period":{
+          "shape":"UsageLimitPeriod",
+          "documentation":"<p>The time period that the amount applies to. A <code>weekly</code> period begins on Sunday. The default is <code>monthly</code>. </p>"
+        },
+        "BreachAction":{
+          "shape":"UsageLimitBreachAction",
+          "documentation":"<p>The action that Amazon Redshift takes when the limit is reached. The default is log. For more information about this parameter, see <a>UsageLimit</a>.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tag instances.</p>"
+        }
+      }
+    },
     "CustomerStorageMessage":{
       "type":"structure",
       "members":{
@@ -3604,6 +3713,16 @@
       },
       "documentation":"<p>Contains the output from the <code>DeleteTags</code> action. </p>"
     },
+    "DeleteUsageLimitMessage":{
+      "type":"structure",
+      "required":["UsageLimitId"],
+      "members":{
+        "UsageLimitId":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the usage limit to delete.</p>"
+        }
+      }
+    },
     "DependentServiceRequestThrottlingFault":{
       "type":"structure",
       "members":{
@@ -4293,6 +4412,39 @@
       },
       "documentation":"<p/>"
     },
+    "DescribeUsageLimitsMessage":{
+      "type":"structure",
+      "members":{
+        "UsageLimitId":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the usage limit to describe.</p>"
+        },
+        "ClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the cluster for which you want to describe usage limits.</p>"
+        },
+        "FeatureType":{
+          "shape":"UsageLimitFeatureType",
+          "documentation":"<p>The feature type for which you want to describe usage limits.</p>"
+        },
+        "MaxRecords":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified <code>MaxRecords</code> value, a value is returned in a <code>marker</code> field of the response. You can retrieve the next set of records by retrying the command with the returned marker value. </p> <p>Default: <code>100</code> </p> <p>Constraints: minimum 20, maximum 100.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>An optional parameter that specifies the starting point to return a set of response records. When the results of a <a>DescribeUsageLimits</a> request exceed the value specified in <code>MaxRecords</code>, AWS returns a value in the <code>Marker</code> field of the response. You can retrieve the next set of response records by providing the returned marker value in the <code>Marker</code> parameter and retrying the request. </p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A tag key or keys for which you want to return all matching usage limit objects that are associated with the specified key or keys. For example, suppose that you have parameter groups that are tagged with keys called <code>owner</code> and <code>environment</code>. If you specify both of these tag keys in the request, Amazon Redshift returns a response with the usage limit objects have either or both of these tag keys associated with them.</p>"
+        },
+        "TagValues":{
+          "shape":"TagValueList",
+          "documentation":"<p>A tag value or values for which you want to return all matching usage limit objects that are associated with the specified tag value or values. For example, suppose that you have parameter groups that are tagged with values called <code>admin</code> and <code>test</code>. If you specify both of these tag values in the request, Amazon Redshift returns a response with the usage limit objects that have either or both of these tag values associated with them.</p>"
+        }
+      }
+    },
     "DisableLoggingMessage":{
       "type":"structure",
       "required":["ClusterIdentifier"],
@@ -5267,6 +5419,18 @@
       },
       "exception":true
     },
+    "InvalidUsageLimitFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The usage limit is not valid.</p>",
+      "error":{
+        "code":"InvalidUsageLimit",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "InvalidVPCNetworkStateFault":{
       "type":"structure",
       "members":{
@@ -5745,6 +5909,24 @@
         }
       }
     },
+    "ModifyUsageLimitMessage":{
+      "type":"structure",
+      "required":["UsageLimitId"],
+      "members":{
+        "UsageLimitId":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the usage limit to modify.</p>"
+        },
+        "Amount":{
+          "shape":"LongOptional",
+          "documentation":"<p>The new limit amount. For more information about this parameter, see <a>UsageLimit</a>. </p>"
+        },
+        "BreachAction":{
+          "shape":"UsageLimitBreachAction",
+          "documentation":"<p>The new action that Amazon Redshift takes when the limit is reached. For more information about this parameter, see <a>UsageLimit</a>. </p>"
+        }
+      }
+    },
     "NodeConfigurationOption":{
       "type":"structure",
       "members":{
@@ -6557,7 +6739,7 @@
         },
         "NodeType":{
           "shape":"String",
-          "documentation":"<p>The node type that the restored cluster will be provisioned with.</p> <p>Default: The node type of the cluster from which the snapshot was taken. You can modify this if you are using any DS node type. In that case, you can choose to restore into another DS node type of the same size. For example, you can restore ds1.8xlarge into ds2.8xlarge, or ds1.xlarge into ds2.xlarge. If you have a DC instance type, you must restore into that same instance type and size. In other words, you can only restore a dc1.large instance type into another dc1.large instance type or dc2.large instance type. You can't restore dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize to a dc2.8large cluster. For more information about node types, see <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes\"> About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management Guide</i>. </p>"
+          "documentation":"<p>The node type that the restored cluster will be provisioned with.</p> <p>Default: The node type of the cluster from which the snapshot was taken. You can modify this if you are using any DS node type. In that case, you can choose to restore into another DS node type of the same size. For example, you can restore ds1.8xlarge into ds2.8xlarge, or ds1.xlarge into ds2.xlarge. If you have a DC instance type, you must restore into that same instance type and size. In other words, you can only restore a dc1.large instance type into another dc1.large instance type or dc2.large instance type. You can't restore dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlarge cluster, then resize to a dc2.8large cluster. For more information about node types, see <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#rs-about-clusters-and-nodes\"> About Clusters and Nodes</a> in the <i>Amazon Redshift Cluster Management Guide</i>. </p>"
         },
         "EnhancedVpcRouting":{
           "shape":"BooleanOptional",
@@ -7931,6 +8113,115 @@
       },
       "documentation":"<p>A maintenance track that you can switch the current track to.</p>"
     },
+    "UsageLimit":{
+      "type":"structure",
+      "members":{
+        "UsageLimitId":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the usage limit.</p>"
+        },
+        "ClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the cluster with a usage limit.</p>"
+        },
+        "FeatureType":{
+          "shape":"UsageLimitFeatureType",
+          "documentation":"<p>The Amazon Redshift feature to which the limit applies.</p>"
+        },
+        "LimitType":{
+          "shape":"UsageLimitLimitType",
+          "documentation":"<p>The type of limit. Depending on the feature type, this can be based on a time duration or data size.</p>"
+        },
+        "Amount":{
+          "shape":"Long",
+          "documentation":"<p>The limit amount. If time-based, this amount is in minutes. If data-based, this amount is in terabytes (TB).</p>"
+        },
+        "Period":{
+          "shape":"UsageLimitPeriod",
+          "documentation":"<p>The time period that the amount applies to. A <code>weekly</code> period begins on Sunday. The default is <code>monthly</code>. </p>"
+        },
+        "BreachAction":{
+          "shape":"UsageLimitBreachAction",
+          "documentation":"<p>The action that Amazon Redshift takes when the limit is reached. Possible values are: </p> <ul> <li> <p> <b>log</b> - To log an event in a system table. The default is log.</p> </li> <li> <p> <b>emit-metric</b> - To emit CloudWatch metrics.</p> </li> <li> <p> <b>disable</b> - To disable the feature until the next usage period begins.</p> </li> </ul>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tag instances.</p>"
+        }
+      },
+      "documentation":"<p>Describes a usage limit object for a cluster. </p>"
+    },
+    "UsageLimitAlreadyExistsFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The usage limit already exists. </p>",
+      "error":{
+        "code":"UsageLimitAlreadyExists",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "UsageLimitBreachAction":{
+      "type":"string",
+      "enum":[
+        "log",
+        "emit-metric",
+        "disable"
+      ]
+    },
+    "UsageLimitFeatureType":{
+      "type":"string",
+      "enum":[
+        "spectrum",
+        "concurrency-scaling"
+      ]
+    },
+    "UsageLimitLimitType":{
+      "type":"string",
+      "enum":[
+        "time",
+        "data-scanned"
+      ]
+    },
+    "UsageLimitList":{
+      "type":"structure",
+      "members":{
+        "UsageLimits":{
+          "shape":"UsageLimits",
+          "documentation":"<p>Contains the output from the <a>DescribeUsageLimits</a> action. </p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>A value that indicates the starting point for the next set of response records in a subsequent request. If a value is returned in a response, you can retrieve the next set of records by providing this returned marker value in the <code>Marker</code> parameter and retrying the command. If the <code>Marker</code> field is empty, all response records have been retrieved for the request. </p>"
+        }
+      }
+    },
+    "UsageLimitNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The usage limit identifier can't be found.</p>",
+      "error":{
+        "code":"UsageLimitNotFound",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "UsageLimitPeriod":{
+      "type":"string",
+      "enum":[
+        "daily",
+        "weekly",
+        "monthly"
+      ]
+    },
+    "UsageLimits":{
+      "type":"list",
+      "member":{"shape":"UsageLimit"}
+    },
     "ValueStringList":{
       "type":"list",
       "member":{
diff --git a/code-generation/api-descriptions/transcribe-streaming-2017-10-26.normal.json b/code-generation/api-descriptions/transcribe-streaming-2017-10-26.normal.json
index 17c2c1a2d42..de859d91068 100644
--- a/code-generation/api-descriptions/transcribe-streaming-2017-10-26.normal.json
+++ b/code-generation/api-descriptions/transcribe-streaming-2017-10-26.normal.json
@@ -24,7 +24,8 @@
         {"shape":"BadRequestException"},
         {"shape":"LimitExceededException"},
         {"shape":"InternalFailureException"},
-        {"shape":"ConflictException"}
+        {"shape":"ConflictException"},
+        {"shape":"ServiceUnavailableException"}
       ],
       "documentation":"<p>Starts a bidirectional HTTP2 stream where audio is streamed to Amazon Transcribe and the transcription results are streamed to your application.</p> <p>The following are encoded as HTTP2 headers:</p> <ul> <li> <p>x-amzn-transcribe-language-code</p> </li> <li> <p>x-amzn-transcribe-media-encoding</p> </li> <li> <p>x-amzn-transcribe-sample-rate</p> </li> <li> <p>x-amzn-transcribe-session-id</p> </li> </ul>"
     }
@@ -195,6 +196,15 @@
       "type":"list",
       "member":{"shape":"Result"}
     },
+    "ServiceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>Service is currently unavailable. Try your request later.</p>",
+      "error":{"httpStatusCode":503},
+      "exception":true
+    },
     "SessionId":{
       "type":"string",
       "pattern":"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
@@ -335,6 +345,10 @@
         "ConflictException":{
           "shape":"ConflictException",
           "documentation":"<p>A new stream started with the same session ID. The current stream has been terminated.</p>"
+        },
+        "ServiceUnavailableException":{
+          "shape":"ServiceUnavailableException",
+          "documentation":"<p>Service is currently unavailable. Try your request later.</p>"
         }
       },
       "documentation":"<p>Represents the transcription result stream from Amazon Transcribe to your application.</p>",