Fixes for tests

Fix DynamoDB tests to wait for active
Fixed bash scenario.

Author: meyertst-aws

.doc_gen/metadata/dynamodb_metadata.yaml

@@ -81,6 +81,10 @@ dynamodb_CreateTable:
             - description:
               snippet_tags:
                 - dynamodb.cpp.create_table.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
+
     Go:
       versions:
         - sdk_version: 2
@@ -628,6 +632,9 @@ dynamodb_PutItem:
             - description:
               snippet_tags:
                 - dynamodb.cpp.put_item.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
     Go:
       versions:
         - sdk_version: 2
@@ -890,6 +897,9 @@ dynamodb_UpdateItem:
             - description:
               snippet_tags:
                 - dynamodb.cpp.update_item.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
     Go:
       versions:
         - sdk_version: 2
@@ -1774,6 +1784,22 @@ dynamodb_BatchExecuteStatement:
                 - cpp.example_code.dynamodb.BatchExecuteStatement.Delete
   services:
     dynamodb: {BatchExecuteStatement}
+dynamodb_UpdateTable:
+  languages:
+    C++:
+      versions:
+        - sdk_version: 1
+          github: cpp/example_code/dynamodb
+          sdkguide:
+          excerpts:
+            - description:
+              snippet_tags:
+                - dynamodb.cpp.update_table.code
+            - description: Code that waits for the table to become active.
+              snippet_tags:
+                - cpp.example_code.dynamodb.scenario.waitTableActive
+  services:
+    dynamodb: {UpdateTable}
 dynamodb_Usage_DaxDemo:
   title: Accelerate &DDB; reads with &DAX; using an &AWS; SDK
   title_abbrev: Accelerate reads with &DAX;

aws-cli/bash-linux/s3/s3_getting_started.sh

@@ -50,9 +50,12 @@ function s3_getting_started() {
   echo_repeat "*" 88
   echo "Welcome to the Amazon S3 getting started demo."
   echo_repeat "*" 88
-
+    echo "A unique bucket will be created by appending a Universally Unique Identifier to a bucket name prefix."
+    echo -n "Enter a prefix for the S3 bucket that will be used in this deemo: "
+    get_input
+    bucket_name_prefix=$get_input_result
   local bucket_name
-  bucket_name=$(generate_random_name "amzn-s3-demo-bucket")
+  bucket_name=$(generate_random_name $bucket_name_prefix)
 
   local region_code
   region_code=$(aws configure get region)

cpp/example_code/dynamodb/batch_write_item.cpp

@@ -115,9 +115,10 @@ bool AwsDoc::DynamoDB::batchWriteItem(const Aws::String &jsonFilePath,
         std::cerr << "Error with DynamoDB::BatchWriteItem. "
                   << outcome.GetError().GetMessage()
                   << std::endl;
+        return false;
     }
 
-    return true;
+    return outcome.IsSuccess();
 }
 
 //! Convert requests in JSON format to a vector of WriteRequest objects.

cpp/example_code/dynamodb/create_table.cpp

@@ -68,9 +68,10 @@ bool AwsDoc::DynamoDB::createTable(const Aws::String &tableName,
     else {
         std::cerr << "Failed to create table: " << outcome.GetError().GetMessage()
                   << std::endl;
+        return false;
     }
 
-    return outcome.IsSuccess();
+    return waitTableActive(tableName, dynamoClient);
 }
 // snippet-end:[dynamodb.cpp.create_table.code]
 

cpp/example_code/dynamodb/create_table_composite_key.cpp

@@ -79,9 +79,10 @@ bool AwsDoc::DynamoDB::createTableWithCompositeKey(const Aws::String &tableName,
     else {
         std::cerr << "Failed to create table:" << outcome.GetError().GetMessage()
                   << std::endl;
+        return false;
     }
 
-    return outcome.IsSuccess();
+    return waitTableActive(tableName, dynamoClient);
 }
 // snippet-end:[dynamodb.cpp.create_table_composite_key.code]
 

cpp/example_code/dynamodb/dynamodb_samples.h

@@ -6,6 +6,7 @@
 
 #include <aws/core/client/ClientConfiguration.h>
 #include <aws/dynamodb/model/AttributeValue.h>
+#include <aws/dynamodb/DynamoDBClient.h>
 
 namespace AwsDoc {
     namespace DynamoDB {
@@ -262,11 +263,11 @@ namespace AwsDoc {
         /*!
           \sa waitTableActive()
           \param waitTableActive: The DynamoDB table's name.
-          \param clientConfiguration: AWS client configuration.
+          \param dynamoClient: A DynamoDB client.
           \return bool: Function succeeded.
         */
         bool waitTableActive(const Aws::String &tableName,
-                             const Aws::Client::ClientConfiguration &clientConfiguration);
+                             const Aws::DynamoDB::DynamoDBClient &dynamoClient);
         //! Command line prompt/response utility function.
         /*!
          \\sa askQuestion()

cpp/example_code/dynamodb/dynamodb_utils.cpp

@@ -146,12 +146,12 @@ bool AwsDoc::DynamoDB::deleteMoviesDynamoDBTable(
 /*!
   \sa waitTableActive()
   \param waitTableActive: The DynamoDB table's name.
-  \param clientConfiguration: AWS client configuration.
+  \param dynamoClient: A DynamoDB client.
   \return bool: Function succeeded.
 */
 bool AwsDoc::DynamoDB::waitTableActive(const Aws::String &tableName,
-                                       const Aws::Client::ClientConfiguration &clientConfiguration) {
-    Aws::DynamoDB::DynamoDBClient dynamoClient(clientConfiguration);
+                                       const Aws::DynamoDB::DynamoDBClient &dynamoClient) {
+
     // Repeatedly call DescribeTable until table is ACTIVE.
     const int MAX_QUERIES = 20;
     Aws::DynamoDB::Model::DescribeTableRequest request;

cpp/example_code/dynamodb/put_item.cpp

@@ -69,9 +69,10 @@ bool AwsDoc::DynamoDB::putItem(const Aws::String &tableName,
     }
     else {
         std::cerr << outcome.GetError().GetMessage() << std::endl;
+        return false;
     }
 
-    return outcome.IsSuccess();
+    return waitTableActive(tableName, dynamoClient);
 }
 
 // snippet-end:[dynamodb.cpp.put_item.code]

cpp/example_code/dynamodb/update_item.cpp

@@ -80,12 +80,12 @@ bool AwsDoc::DynamoDB::updateItem(const Aws::String &tableName,
             request);
     if (outcome.IsSuccess()) {
         std::cout << "Item was updated" << std::endl;
-    }
-    else {
+    } else {
         std::cerr << outcome.GetError().GetMessage() << std::endl;
+        return false;
     }
 
-    return outcome.IsSuccess();
+    return waitTableActive(tableName, dynamoClient);
 }
 // snippet-end:[dynamodb.cpp.update_item.code]
 

cpp/example_code/dynamodb/update_table.cpp

@@ -60,12 +60,18 @@ bool AwsDoc::DynamoDB::updateTable(const Aws::String &tableName,
             request);
     if (outcome.IsSuccess()) {
         std::cout << "Successfully updated the table." << std::endl;
-    }
-    else {
-        std::cerr << outcome.GetError().GetMessage() << std::endl;
+    } else {
+        const Aws::DynamoDB::DynamoDBError &error = outcome.GetError();
+        if (error.GetErrorType() == Aws::DynamoDB::DynamoDBErrors::VALIDATION &&
+            error.GetMessage().find("The provisioned throughput for the table will not change") != std::string::npos) {
+            std::cout << "The provisioned throughput for the table will not change." << std::endl;
+        } else {
+            std::cerr << outcome.GetError().GetMessage() << std::endl;
+            return false;
+        }
     }
 
-    return outcome.IsSuccess();
+    return waitTableActive(tableName, dynamoClient);
 }
 // snippet-end:[dynamodb.cpp.update_table.code]